WellTriggerFactory: add ignored

Author: labkey-nicka

api/src/org/labkey/api/data/triggers/Trigger.java

@@ -112,6 +112,11 @@ public static ManagedColumns empty()
             return new ManagedColumns(Collections.emptySet(), Collections.emptySet(), null);
         }
 
+        public static ManagedColumns ignored(@NotNull String... ignored)
+        {
+            return new ManagedColumns(Collections.emptySet(), Collections.emptySet(), Sets.newCaseInsensitiveHashSet(ignored));
+        }
+
         public @Nullable Set<String> getColumns(TableInfo.TriggerType type)
         {
             if (type == TableInfo.TriggerType.INSERT)

assay/src/org/labkey/assay/plate/PlateManager.java

@@ -212,11 +212,11 @@ public class PlateManager implements PlateService, AssayListener, ExperimentList
     private final AtomicBoolean _pausePlateIndex = new AtomicBoolean(false);
     private static final Object PLATE_INDEX_LOCK = new Object();
 
-    // This flag is applied to the extraScriptContext of query mutating calls (e.g. insertRows, updateRows, etc.)
+    // This flag is applied to the extraScriptContext of query mutating calls (e.g., insertRows, updateRows, etc.)
     // when those calls are being made for a plate copy operation.
     public static final String PLATE_COPY_FLAG = ".plateCopy";
 
-    // This flag is applied to the extraScriptContext of query mutating calls (e.g. insertRows, updateRows, etc.)
+    // This flag is applied to the extraScriptContext of query mutating calls (e.g., insertRows, updateRows, etc.)
     // when those calls are being made for a plate save operation.
     public static final String PLATE_SAVE_FLAG = ".plateSave";
 

assay/src/org/labkey/assay/plate/data/WellTriggerFactory.java

@@ -54,13 +54,14 @@ private class ValidateRunImportedPlateTrigger implements Trigger
 
         @Override
         public void beforeUpdate(
-                TableInfo table,
-                Container c,
-                User user,
-                @Nullable QueryUpdateService.InsertOption insertOption, @Nullable Map<String, Object> newRow,
-                @Nullable Map<String, Object> oldRow,
-                ValidationException errors,
-                Map<String, Object> extraContext
+            TableInfo table,
+            Container c,
+            User user,
+            @Nullable QueryUpdateService.InsertOption insertOption,
+            @Nullable Map<String, Object> newRow,
+            @Nullable Map<String, Object> oldRow,
+            ValidationException errors,
+            Map<String, Object> extraContext
         ) throws ValidationException
         {
             if (oldRow == null || errors.hasErrors() || !oldRow.containsKey(WellTable.Column.PlateId.name()))
@@ -92,7 +93,8 @@ private class EnsureSampleWellTypeTrigger implements Trigger
         @Override
         public @Nullable ManagedColumns getManagedColumns()
         {
-            return ManagedColumns.all(WellTable.Column.Type.name());
+            // "Type" is a calculated column, so we do not include it as a managed column
+            return ManagedColumns.ignored(WellTable.Column.Type.name());
         }
 
         private void addTypeSample(
@@ -121,8 +123,8 @@ private void addTypeSample(
             newRow.put(WellTable.Column.Type.name(), WellGroup.Type.SAMPLE.name());
         }
 
-        // Since "Type" is a calculated column (i.e. not in the database) its value is not included in
-        // the original row, thus, we need to query for it dynamically.
+        // Since "Type" is a calculated column (i.e., not in the database), its value is not included in
+        // the original row; thus, we need to query for it dynamically.
         private boolean hasWellType(Container c, User user, @Nullable Map<String, Object> oldRow)
         {
             if (oldRow == null)
@@ -157,7 +159,6 @@ public void beforeInsert(
         )
         {
             addTypeSample(c, user, newRow, null, extraContext);
-            setInsertManagedColumns(newRow, existingRecord, insertOption);
         }
 
         @Override
@@ -173,7 +174,6 @@ public void beforeUpdate(
         )
         {
             addTypeSample(c, user, newRow, oldRow, extraContext);
-            setUpdateManagedColumns(newRow, oldRow, insertOption);
         }
     }