Always re-cache lookups after clear

Author: bbimber

Studies/src/org/labkey/studies/query/LookupSetsTable.java

@@ -38,22 +38,22 @@ public UpdateService(SimpleUserSchema.SimpleTable<SchemaType> ti)
         @Override
         protected void afterInsertUpdate(int count, BatchValidationException errors)
         {
-            LookupSetsManager.get().getCache().clear();
+            StudiesUserSchema.repopulateCaches(getUserSchema().getUser(), getUserSchema().getContainer());
         }
 
         @Override
         protected Map<String, Object> deleteRow(User user, Container container, Map<String, Object> oldRowMap) throws QueryUpdateServiceException, SQLException, InvalidKeyException
         {
             Map<String, Object> row = super.deleteRow(user, container, oldRowMap);
-            LookupSetsManager.get().getCache().clear();
+            StudiesUserSchema.repopulateCaches(getUserSchema().getUser(), getUserSchema().getContainer());
             return row;
         }
 
         @Override
         protected int truncateRows(User user, Container container) throws QueryUpdateServiceException, SQLException
         {
             int i = super.truncateRows(user, container);
-            LookupSetsManager.get().getCache().clear();
+            StudiesUserSchema.repopulateCaches(getUserSchema().getUser(), getUserSchema().getContainer());
             return i;
         }
     }

Studies/src/org/labkey/studies/query/StudiesUserSchema.java

@@ -73,6 +73,15 @@ private Container getTargetContainer()
         return getContainer().isWorkbookOrTab() ? getContainer().getParent() : getContainer();
     }
 
+    public static void repopulateCaches(User u, Container c)
+    {
+        DbSchema schema = StudiesSchema.getInstance().getSchema();
+        StudiesUserSchema us = new StudiesUserSchema(u, c, schema);
+
+        LookupSetsManager.get().getCache().clear();
+        us.getPropertySetNames();
+    }
+
     private Map<String, Map<String, Object>> getPropertySetNames()
     {
         Map<String, Map<String, Object>> nameMap = (Map<String, Map<String, Object>>) LookupSetsManager.get().getCache().get(LookupSetTable.getCacheKey(getTargetContainer()));
@@ -81,6 +90,7 @@ private Map<String, Map<String, Object>> getPropertySetNames()
             return nameMap;
         }
 
+        _log.debug("Populating lookup tables in StudiesUserSchema.getPropertySetNames() for container: " + getTargetContainer().getName());
         nameMap = new CaseInsensitiveHashMap<>();
 
         TableSelector ts = new TableSelector(_dbSchema.getTable(TABLE_LOOKUP_SETS), new SimpleFilter(FieldKey.fromString("container"), getTargetContainer().getId()), null);