BroadleafCommerce#1102 - Make query honor archiveStatus and deactivated flags

Author: jefffischer

common/src/main/java/org/broadleafcommerce/common/site/dao/SiteDaoImpl.java

@@ -84,7 +84,15 @@ public Site retrieveSiteByDomainOrDomainPrefix(String domain, String domainPrefi
         Root<SiteImpl> site = criteria.from(SiteImpl.class);
         criteria.select(site);
 
-        criteria.where(site.get("siteIdentifierValue").as(String.class).in(siteIdentifiers));
+        criteria.where(builder.and(site.get("siteIdentifierValue").as(String.class).in(siteIdentifiers),
+                builder.and(
+                    builder.or(builder.isNull(site.get("archiveStatus").get("archived").as(String.class)),
+                        builder.notEqual(site.get("archiveStatus").get("archived").as(Character.class), 'Y')),
+                    builder.or(builder.isNull(site.get("deactivated").as(Boolean.class)),
+                        builder.notEqual(site.get("deactivated").as(Boolean.class), true))
+                )
+            )
+        );
         TypedQuery<Site> query = em.createQuery(criteria);
         query.setHint(QueryHints.HINT_CACHEABLE, true);