Extract assay template container-scoping into a shared helper

Replace the duplicated workbook-resolution snippet in DefaultAssayParser.saveTemplate, DefaultAssayParser.getTemplateRowMap, and AssayHelper.saveTemplate with a single DefaultAssayParser.getTemplateContainerIds(Container) helper, so the container-scoping rule for assay_run_templates lookups lives in one place. Pure refactor; no behavior change.

Author: labkey-martyp

laboratory/api-src/org/labkey/api/laboratory/assay/DefaultAssayParser.java

@@ -463,21 +463,29 @@ protected void validateRows(List<Map<String, Object>> rows, ImportContext contex
         errors.confirmNoErrors();
     }
 
+    /**
+     * Returns the set of container ids in which an assay run template for a request in the given container may
+     * legitimately live: the container itself, plus its parent when the request runs in a workbook (mirroring the
+     * run-template picker, which sources templates from Laboratory.Utils.getQueryContainerPath). Used to scope
+     * assay_run_templates lookups to the request's folder tree without reaching an unrelated container.
+     */
+    public static List<String> getTemplateContainerIds(Container c)
+    {
+        List<String> ids = new ArrayList<>();
+        ids.add(c.getId());
+        if (c.isWorkbook())
+            ids.add(c.getParent().getId());
+        return ids;
+    }
+
     protected void saveTemplate(ViewContext ctx, int templateId, int runId) throws BatchValidationException
     {
         try
         {
-            // The template may live in this container, or its parent when importing from a workbook
-            // (the picker sources templates from getQueryContainerPath). Scope to that set, never beyond it.
-            List<String> templateContainers = new ArrayList<>();
-            templateContainers.add(_container.getId());
-            if (_container.isWorkbook())
-                templateContainers.add(_container.getParent().getId());
-
             //validate the template exists in (or above) this container
             TableInfo ti = DbSchema.get("laboratory").getTable("assay_run_templates");
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString("rowid"), templateId);
-            filter.addCondition(FieldKey.fromString("container"), templateContainers, CompareType.IN);
+            filter.addCondition(FieldKey.fromString("container"), getTemplateContainerIds(_container), CompareType.IN);
             TableSelector ts = new TableSelector(ti, filter, null);
             if (ts.getRowCount() == 0)
             {
@@ -594,15 +602,10 @@ protected Map<String, Map<String, Object>> getTemplateRowMap(ImportContext conte
         if (templateId == null)
             return ret;
 
-        List<String> templateContainers = new ArrayList<>();
-        templateContainers.add(_container.getId());
-        if (_container.isWorkbook())
-            templateContainers.add(_container.getParent().getId());
-
         TableInfo ti = DbSchema.get("laboratory").getTable("assay_run_templates");
 
         SimpleFilter filter = new SimpleFilter(FieldKey.fromString("rowid"), templateId);
-        filter.addCondition(FieldKey.fromString("container"), templateContainers, CompareType.IN);
+        filter.addCondition(FieldKey.fromString("container"), getTemplateContainerIds(_container), CompareType.IN);
         TableSelector ts = new TableSelector(ti, filter, null);
         Map<String, Object>[] maps = ts.getMapArray();
         if (maps.length == 0)

laboratory/src/org/labkey/laboratory/assay/AssayHelper.java

@@ -52,6 +52,7 @@
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.assay.AssayDataProvider;
 import org.labkey.api.laboratory.assay.AssayImportMethod;
+import org.labkey.api.laboratory.assay.DefaultAssayParser;
 import org.labkey.api.query.BatchValidationException;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.ValidationException;
@@ -144,13 +145,8 @@ public Map<String, Object> saveTemplate(User u, Container c, ExpProtocol protoco
             {
                 // Table.update operates by global PK; verify the template is reachable from this container
                 // (here, or the parent when in a workbook) before updating, and leave its container unchanged.
-                List<String> templateContainers = new ArrayList<>();
-                templateContainers.add(c.getId());
-                if (c.isWorkbook())
-                    templateContainers.add(c.getParent().getId());
-
                 SimpleFilter filter = new SimpleFilter(FieldKey.fromString("rowid"), templateId);
-                filter.addCondition(FieldKey.fromString("container"), templateContainers, CompareType.IN);
+                filter.addCondition(FieldKey.fromString("container"), DefaultAssayParser.getTemplateContainerIds(c), CompareType.IN);
                 if (!new TableSelector(ti, filter, null).exists())
                 {
                     errors.addRowError(new ValidationException("Unknown template: " + templateId));