fix molecular profile does not exist issue

cBioPortal · Dec 4, 2024 · 822b89f · 822b89f
1 parent 18599b2
commit 822b89f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/cbioportal/web/GenePanelDataController.java b/src/main/java/org/cbioportal/web/GenePanelDataController.java
@@ -34,6 +34,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.ArrayList;
 
 @PublicApi
 @RestController
@@ -83,9 +84,10 @@ public ResponseEntity<List<GenePanelData>> fetchGenePanelDataInMultipleMolecular
         @Parameter(required = true, description = "Gene panel data filter object")
         @RequestBody(required = false) GenePanelDataMultipleStudyFilter genePanelDataMultipleStudyFilter) {
 
-        List<GenePanelData> genePanelDataList;
-        if(CollectionUtils.isEmpty(interceptedGenePanelDataMultipleStudyFilter.getMolecularProfileIds())) {
-            List<MolecularProfileCaseIdentifier> molecularProfileSampleIdentifiers = interceptedGenePanelDataMultipleStudyFilter.getSampleMolecularIdentifiers()
+        List<GenePanelData> genePanelDataList = new ArrayList<>();
+        if(interceptedGenePanelDataMultipleStudyFilter.getMolecularProfileIds()!= null && CollectionUtils.isEmpty(interceptedGenePanelDataMultipleStudyFilter.getMolecularProfileIds())) {
+            if(interceptedGenePanelDataMultipleStudyFilter.getSampleMolecularIdentifiers()!= null){
+                 List<MolecularProfileCaseIdentifier> molecularProfileSampleIdentifiers = interceptedGenePanelDataMultipleStudyFilter.getSampleMolecularIdentifiers()
                 .stream()
                 .map(sampleMolecularIdentifier -> {
                     MolecularProfileCaseIdentifier profileCaseIdentifier = new MolecularProfileCaseIdentifier();
@@ -94,8 +96,8 @@ public ResponseEntity<List<GenePanelData>> fetchGenePanelDataInMultipleMolecular
                     return profileCaseIdentifier;
                 })
                 .collect(Collectors.toList());
-
             genePanelDataList = genePanelService.fetchGenePanelDataInMultipleMolecularProfiles(molecularProfileSampleIdentifiers);
+            }
         } else {
             genePanelDataList = genePanelService.fetchGenePanelDataByMolecularProfileIds(new HashSet<>(interceptedGenePanelDataMultipleStudyFilter.getMolecularProfileIds()));
         }