Support for plate metadata in saveBatch and importRun APIs

SVN r65121 |2020-02-18 19:02:26 +0000

Author: labkey-klum

java/src/org/labkey/remoteapi/assay/ImportRunCommand.java

@@ -48,6 +48,7 @@ public class ImportRunCommand extends PostCommand<ImportRunResponse>
     private List<Map<String, Object>> _dataRows;
     private File _file;
     private String _runFilePath;
+    private JSONObject _plateMetadata;
 
     public ImportRunCommand(int assayId)
     {
@@ -113,6 +114,11 @@ public void setBatchProperties(Map<String, Object> batchProperties)
         _batchProperties = batchProperties;
     }
 
+    public void setPlateMetadata(JSONObject plateMetadata)
+    {
+        _plateMetadata = plateMetadata;
+    }
+
     @Override
     public ImportRunCommand copy()
     {
@@ -124,6 +130,7 @@ public ImportRunCommand copy()
         cmd._batchId = _batchId;
         cmd._batchProperties = _batchProperties;
         cmd._runFilePath = _runFilePath;
+        cmd._plateMetadata = _plateMetadata;
 
         return cmd;
     }
@@ -167,6 +174,8 @@ protected HttpUriRequest createRequest(URI uri)
                 json.put("dataRows", _dataRows);
             if (_runFilePath != null)
                 json.put("runFilePath", _runFilePath);
+            if (_plateMetadata != null)
+                json.put("plateMetadata", _plateMetadata);
 
             builder.addTextBody("json", json.toJSONString(), ContentType.APPLICATION_JSON);
         }
@@ -197,6 +206,8 @@ protected HttpUriRequest createRequest(URI uri)
                 builder.addTextBody("dataRows", JSONArray.toJSONString(_dataRows), ContentType.APPLICATION_JSON);
             if (_runFilePath != null)
                 builder.addTextBody("runFilePath", _runFilePath);
+            if (_plateMetadata != null)
+                builder.addTextBody("plateMetadata", _plateMetadata.toJSONString());
         }
 
         // UNDONE: set content type based on extension

java/src/org/labkey/remoteapi/assay/Run.java

@@ -35,6 +35,7 @@ public class Run extends ExpObject
     private List<Material> _materialInputs = new ArrayList<>();
     private List<Material> _materialOutputs = new ArrayList<>();
     private String _lsid;
+    private JSONObject _plateMetadata;
 
     // Used when inserting new data via SaveAssayBatchAction
     private List<Map<String, Object>> _resultData;
@@ -90,6 +91,10 @@ public Run(JSONObject json)
             _lsid = (String) json.get("lsid");
         }
 
+        if (json.containsKey("plateMetadata"))
+        {
+            _plateMetadata = (JSONObject)json.get("plateMetadata");
+        }
     }
 
     @Override
@@ -142,6 +147,9 @@ public JSONObject toJSONObject()
             result.put("dataRows", dataRows);
         }
 
+        if (_plateMetadata != null)
+            result.put("plateMetadata", _plateMetadata);
+
         return result;
     }
 
@@ -216,4 +224,14 @@ public void setLsid(String lsid)
     {
         _lsid = lsid;
     }
+
+    public JSONObject getPlateMetadata()
+    {
+        return _plateMetadata;
+    }
+
+    public void setPlateMetadata(JSONObject plateMetadata)
+    {
+        _plateMetadata = plateMetadata;
+    }
 }