Skip to content

Commit

Permalink
code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dippindots committed Aug 29, 2024
1 parent f0f11b7 commit 692f34c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,11 @@ public <T extends DataBinCountFilter, S extends DataBinFilter, U extends DataBin

// we need to fetch data for the partial filter in order to generate the bins for initial state
// we use the filtered data to calculate the counts for each bin, we do not regenerate bins for the filtered data
// TODO: update this before review, should create a function for this
List<ClinicalDataCountItem> unfilteredClinicalDataCounts;
List<ClinicalDataCountItem> filteredClinicalDataCounts;
Map<String, ClinicalDataType> attributeDatatypeMap;
switch (dataBinCountFilter) {
// TODO: this is to support clinical data, but clinical data is not using this now. We should update controller to use this method later
// TODO: first case is to support clinical data, but clinical data is not using this now. We should update controller to use this method later
case ClinicalDataBinCountFilter clinicalDataBinCountFilter -> {
unfilteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(partialFilter, uniqueKeys);
filteredClinicalDataCounts = studyViewColumnarService.getClinicalDataCounts(studyViewFilter, uniqueKeys);
Expand Down Expand Up @@ -112,7 +111,7 @@ public <T extends DataBinCountFilter, S extends DataBinFilter, U extends DataBin
// Define result variables
List<U> resultDataBins = Collections.emptyList();

// TODO: need to update attributeDatatypeMap to ignore patient level data
// TODO: need to update attributeDatatypeMap to include patient level data for Generic Assay Profiles
if (dataBinMethod == DataBinMethod.STATIC) {
if (!unfilteredClinicalData.isEmpty()) {
resultDataBins = calculateStaticDataBins(
Expand All @@ -124,7 +123,7 @@ public <T extends DataBinCountFilter, S extends DataBinFilter, U extends DataBin
);
}
}
// TODO: need to update attributeDatatypeMap to ignore patient level data
// TODO: need to update attributeDatatypeMap to include patient level data for Generic Assay Profiles
else { // dataBinMethod == DataBinMethod.DYNAMIC
// TODO we should consider removing dynamic binning support
// we never use dynamic binning in the frontend because number of bins and the bin ranges can change
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/db-scripts/clickhouse/clickhouse.sql
Original file line number Diff line number Diff line change
Expand Up @@ -435,4 +435,4 @@ OPTIMIZE TABLE clinical_data_derived;
OPTIMIZE TABLE clinical_event_derived;
OPTIMIZE TABLE genetic_alteration_cna_derived;
OPTIMIZE TABLE genetic_alteration_numerical_derived;
OPTIMIZE TABLE generic_assay_data_derived;
OPTIMIZE TABLE generic_assay_data_derived;

0 comments on commit 692f34c

Please sign in to comment.