Now a pathology has a version until Exareme is completely replaced by…

… Exareme2 the portalbackend will ignore the version for the algorithms that run on Exareme.
HBPMedical · Jul 22, 2022 · 4c987a1 · 4c987a1
1 parent 0a6f68f
commit 4c987a1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmRequestDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/MIPEngineAlgorithmRequestDTO.java
@@ -41,7 +41,7 @@ public MIPEngineAlgorithmRequestDTO(UUID experimentUUID, List<ExaremeAlgorithmRe
                     inputData.setData_model(parameter.getValue());
                     break;
                 case "filter":
-                    if (!parameter.getValue().equals(""))
+                    if (parameter.getValue() != null && !parameter.getValue().equals(""))
                         inputData.setFilters(JsonConverters.convertJsonStringToObject(parameter.getValue(), MIPEngineAlgorithmRequestDTO.Filter.class));
                     break;
                 default:

diff --git a/src/main/java/eu/hbp/mip/models/DTOs/PathologyDTO.java b/src/main/java/eu/hbp/mip/models/DTOs/PathologyDTO.java
@@ -13,6 +13,10 @@ public class PathologyDTO {
     @SerializedName("code")
     private String code;
 
+    @SerializedName("version")
+    private String version;
+
+
     @SerializedName("label")
     private String label;
 

diff --git a/src/main/java/eu/hbp/mip/services/ExperimentService.java b/src/main/java/eu/hbp/mip/services/ExperimentService.java
@@ -465,7 +465,20 @@ private ExaremeAlgorithmResultDTO runExaremeExperiment(ExperimentDTO experimentD
         String algorithmEndpoint = queryExaremeUrl + "/" + algorithmName;
         List<ExaremeAlgorithmRequestParamDTO> algorithmParameters
                 = experimentDTO.getAlgorithm().getParameters();
-        String algorithmBody = gson.toJson(algorithmParameters);
+        List<ExaremeAlgorithmRequestParamDTO> algorithmParametersWithoutPathologyVersion = new ArrayList<>();
+
+        for (ExaremeAlgorithmRequestParamDTO algorithmParameter : algorithmParameters)
+        {
+            if (algorithmParameter.getName().equals("pathology")) {
+                List<String> pathology_info = Arrays.asList(algorithmParameter.getValue().split(":", 2));
+                String pathology_code = pathology_info.get(0);
+                algorithmParameter.setValue(pathology_code);
+            }
+            algorithmParametersWithoutPathologyVersion.add(algorithmParameter);
+
+        }
+
+        String algorithmBody = gson.toJson(algorithmParametersWithoutPathologyVersion);
         logger.LogUserAction("Exareme algorithm execution. Endpoint: " + algorithmEndpoint);
         logger.LogUserAction("Exareme algorithm execution. Body: " + algorithmBody);