Use EHR Study Container Entity Id instead of Study Entity Id to generate cache key (#1029)

* Use EHR Study container to get cache key instead of study (study is not present when trying to populate lookups but goes through this code path when registering and unregistering lookups trigger script causing test failures).

Author: labkey-bpatel

ehr/src/org/labkey/ehr/security/EHRSecurityManager.java

@@ -224,29 +224,25 @@ public Map<String, EHRQCState> getQCStateInfo(Container c)
         if (targetContainer == null)
             return Collections.emptyMap();
 
-        Study study = StudyService.get().getStudy(targetContainer);
-        if (study == null)
-            return Collections.emptyMap();
-
-        String cacheKey = getCacheKey(study, QCSTATE_CACHE_ID);
+        String cacheKey = getCacheKey(targetContainer, QCSTATE_CACHE_ID);
         Map<String, EHRQCState> qcStates = (Map<String, EHRQCState>) DataEntryManager.get().getCache().get(cacheKey);
-        if (qcStates != null)
+        if (qcStates != null && !qcStates.isEmpty())
             return qcStates;
 
         qcStates = new HashMap<>();
-        for (EHRQCState qc : EHRManager.get().getQCStates(study.getContainer()))
+        for (EHRQCState qc : EHRManager.get().getQCStates(targetContainer))
         {
             qcStates.put(qc.getLabel(), qc);
         }
 
         qcStates = Collections.unmodifiableMap(qcStates);
-        DataEntryManager.get().getCache().put(getCacheKey(study, QCSTATE_CACHE_ID), qcStates);
+        DataEntryManager.get().getCache().put(getCacheKey(targetContainer, QCSTATE_CACHE_ID), qcStates);
 
         return qcStates;
     }
 
-    private String getCacheKey(Study s, String suffix)
+    private String getCacheKey(Container c, String suffix)
     {
-        return getClass().getName() + "||" + s.getEntityId() + "||" + suffix;
+        return getClass().getName() + "||" + c.getEntityId() + "||" + suffix;
     }
 }