Respond to comments

alisman · Nov 12, 2024 · bd7320f · bd7320f
1 parent 43297f8
commit bd7320f
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/src/main/java/org/cbioportal/service/impl/StudyViewColumnarServiceImpl.java b/src/main/java/org/cbioportal/service/impl/StudyViewColumnarServiceImpl.java
@@ -158,25 +158,26 @@ public List<ClinicalDataCountItem> getClinicalDataCounts(StudyViewFilter studyVi
         var result = studyViewRepository.getClinicalDataCounts(createContext(studyViewFilter), filteredAttributes);
 
         // fetch the samples by using the provided study view filter
-        List<Sample> filteredSamples = getFilteredSamples(studyViewFilter);
+        List<Sample> filteredSamples = studyViewRepository.getFilteredSamples(createContext(studyViewFilter));
 
         var resultWithAllAttributes = StudyViewColumnarServiceUtil.addClinicalDataCountsForMissingAttributes(result, filteredAttributes, filteredSamples);
 
-        resultWithAllAttributes.stream().forEach(attr -> {
-            Map<String, List<ClinicalDataCount>> countsPerType = attr.getCounts().stream()
-                .collect(Collectors.groupingBy(ClinicalDataCount::getValue));
-            List<ClinicalDataCount> res = countsPerType.entrySet().stream().map((entry)->{
-                ClinicalDataCount mergedCount = new ClinicalDataCount();
-                mergedCount.setAttributeId(attr.getAttributeId());
-                mergedCount.setValue(entry.getKey());
-                mergedCount.setCount(entry.getValue().stream().mapToInt(ClinicalDataCount::getCount).sum());
-                return mergedCount;
-            }).collect(Collectors.toList());
-            attr.setCounts(res);
-        });
+        var mergedResult = StudyViewColumnarServiceUtil.mergeClinicalDataCounts(resultWithAllAttributes);
 
+//        resultWithAllAttributes.stream().forEach(attr -> {
+//            Map<String, List<ClinicalDataCount>> countsPerType = attr.getCounts().stream()
+//                .collect(Collectors.groupingBy(ClinicalDataCount::getValue));
+//            List<ClinicalDataCount> res = countsPerType.entrySet().stream().map((entry)->{
+//                ClinicalDataCount mergedCount = new ClinicalDataCount();
+//                mergedCount.setAttributeId(attr.getAttributeId());
+//                mergedCount.setValue(entry.getKey());
+//                mergedCount.setCount(entry.getValue().stream().mapToInt(ClinicalDataCount::getCount).sum());
+//                return mergedCount;
+//            }).collect(Collectors.toList());
+//            attr.setCounts(res);
+//        });
 
-        return resultWithAllAttributes;
+        return mergedResult;
     }