BroadleafCommerce/QA#935 - Only show APPROVAL sandboxes in the "Include my changes" list if there is no USER sandbox

Author: Chad Harchar

common/src/main/java/org/broadleafcommerce/common/sandbox/dao/SandBoxDao.java

@@ -44,6 +44,8 @@ public interface SandBoxDao {
 
     public Map<Long, String> retrieveAuthorNamesForSandBoxes(Set<Long> sandBoxIds);
 
+    List<SandBox> retrieveSandBoxesForAuthor(Long authorId, SandBoxType sandBoxType);
+
     public SandBox persist(SandBox entity);
 
     public SandBox createSandBox(String sandBoxName, SandBoxType sandBoxType);

common/src/main/java/org/broadleafcommerce/common/sandbox/dao/SandBoxDaoImpl.java

@@ -231,15 +231,25 @@ public Map<Long, String> retrieveAuthorNamesForSandBoxes(Set<Long> sandBoxIds) {
 
     @Override
     public List<SandBox> retrieveSandBoxesForAuthor(Long authorId) {
+        return retrieveSandBoxesForAuthor(authorId, null);
+    }
+
+    @Override
+    public List<SandBox> retrieveSandBoxesForAuthor(Long authorId, SandBoxType sandBoxType) {
         CriteriaBuilder builder = sandBoxEntityManager.getCriteriaBuilder();
         CriteriaQuery<SandBox> criteria = builder.createQuery(SandBox.class);
         Root<SandBoxManagementImpl> sandbox = criteria.from(SandBoxManagementImpl.class);
         criteria.select(sandbox.get("sandBox").as(SandBox.class));
-        criteria.where(
-                builder.and(builder.equal(sandbox.get("sandBox").get("author"), authorId),
-                        builder.or(builder.isNull(sandbox.get("sandBox").get("archiveStatus").get("archived").as(String.class)),
-                                builder.notEqual(sandbox.get("sandBox").get("archiveStatus").get("archived").as(Character.class), 'Y')))
+        List<Predicate> restrictions = new ArrayList<Predicate>();
+        restrictions.add(builder.equal(sandbox.get("sandBox").get("author"), authorId));
+        if (sandBoxType != null) {
+            restrictions.add(builder.equal(sandbox.get("sandBox").get("sandboxType"), sandBoxType.getType()));
+        }
+        restrictions.add(
+                builder.or(builder.isNull(sandbox.get("sandBox").get("archiveStatus").get("archived").as(String.class)),
+                        builder.notEqual(sandbox.get("sandBox").get("archiveStatus").get("archived").as(Character.class), 'Y'))
         );
+        criteria.where(restrictions.toArray(new Predicate[restrictions.size()]));
         TypedQuery<SandBox> query = sandBoxEntityManager.createQuery(criteria);
         return query.getResultList();
     }

common/src/main/java/org/broadleafcommerce/common/sandbox/service/SandBoxServiceImpl.java

@@ -71,7 +71,7 @@ public SandBox retrieveSandBoxManagementById(Long sandBoxId) {
     @Override
     public List<SandBox> retrievePreviewSandBoxes(Long authorId) {
         List<SandBox> returnList = new ArrayList<SandBox>();
-        List<SandBox> authorBoxes = sandBoxDao.retrieveSandBoxesForAuthor(authorId);
+        List<SandBox> authorBoxes = sandBoxDao.retrieveSandBoxesForAuthor(authorId, SandBoxType.USER);
         List<SandBox> approvalBoxes = sandBoxDao.retrieveSandBoxesByType(SandBoxType.APPROVAL);
         List<SandBox> defaultBoxes = sandBoxDao.retrieveSandBoxesByType(SandBoxType.DEFAULT);