Skip to content

Commit 063a62b

Browse files
committed
Update swagger methods for clickhouse
1 parent 66bd4b0 commit 063a62b

File tree

2 files changed

+57
-40
lines changed

2 files changed

+57
-40
lines changed

src/main/java/org/cbioportal/application/rest/vcolumnstore/ColumnarStoreStudyViewController.java

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ public ResponseEntity<List<SampleDTO>> fetchFilteredSamples(
116116
SampleMapper.INSTANCE.toDtos(studyViewService.getFilteredSamples(studyViewFilter)));
117117
}
118118

119-
@Hidden // should unhide when we remove legacy controller
120119
@PostMapping(
121120
value = "/mutated-genes/fetch",
122121
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -129,7 +128,6 @@ public ResponseEntity<List<AlterationCountByGene>> fetchMutatedGenes(
129128
return ResponseEntity.ok(studyViewService.getMutatedGenes(studyViewFilter));
130129
}
131130

132-
@Hidden // should unhide when we remove legacy controller
133131
@PostMapping(
134132
value = "/molecular-profile-sample-counts/fetch",
135133
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -151,7 +149,6 @@ public ResponseEntity<List<GenomicDataCount>> fetchMolecularProfileSampleCounts(
151149
return ResponseEntity.ok(studyViewService.getMolecularProfileSampleCounts(studyViewFilter));
152150
}
153151

154-
@Hidden // should unhide when we remove legacy controller
155152
@PostMapping(
156153
value = "/cna-genes/fetch",
157154
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -164,7 +161,6 @@ public ResponseEntity<List<CopyNumberCountByGene>> fetchCnaGenes(
164161
return ResponseEntity.ok(studyViewService.getCnaGenes(studyViewFilter));
165162
}
166163

167-
@Hidden // should unhide when we remove legacy controller
168164
@PostMapping(
169165
value = "/structuralvariant-genes/fetch",
170166
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -187,7 +183,6 @@ public ResponseEntity<List<AlterationCountByGene>> fetchStructuralVariantGenes(
187183
return ResponseEntity.ok(studyViewService.getStructuralVariantGenes(studyViewFilter));
188184
}
189185

190-
@Hidden // should unhide when we remove legacy controller
191186
@PostMapping(
192187
value = "/clinical-data-counts/fetch",
193188
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -210,7 +205,6 @@ public ResponseEntity<List<ClinicalDataCountItem>> fetchClinicalDataCounts(
210205
return ResponseEntity.ok(result);
211206
}
212207

213-
@Hidden // should unhide when we remove legacy controller
214208
@PostMapping(
215209
value = "/sample-lists-counts/fetch",
216210
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -227,7 +221,6 @@ public List<CaseListDataCount> fetchCaseListCounts(
227221
return studyViewService.getCaseListDataCounts(studyViewFilter);
228222
}
229223

230-
@Hidden // should unhide when we remove legacy controller
231224
@PostMapping(
232225
value = "/clinical-data-bin-counts/fetch",
233226
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -243,7 +236,6 @@ public ResponseEntity<List<ClinicalDataBin>> fetchClinicalDataBinCounts(
243236
return new ResponseEntity<>(clinicalDataBins, HttpStatus.OK);
244237
}
245238

246-
@Hidden // should unhide when we remove legacy controller
247239
@PostMapping(
248240
value = "/clinical-data-density-plot/fetch",
249241
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -312,7 +304,6 @@ public ResponseEntity<DensityPlotData> fetchClinicalDataDensityPlot(
312304
return new ResponseEntity<>(result, HttpStatus.OK);
313305
}
314306

315-
@Hidden // should unhide when we remove legacy controller
316307
@PreAuthorize(
317308
"hasPermission(#studyViewFilter, 'StudyViewFilter', T(org.cbioportal.legacy.utils.security.AccessLevel).READ)")
318309
@PostMapping(
@@ -365,7 +356,8 @@ public ResponseEntity<ClinicalViolinPlotData> fetchClinicalDataViolinPlots(
365356
// this new modified filter is used to fetch sample and patient clinical data.
366357
// this is required to get the complete violin plot data.
367358
// filteredSamples reflects only the original unmodified study view filter.
368-
// we will need to fetch samples again to get the samples corresponding to this modified filter,
359+
// we will need to fetch samples again to get the samples corresponding to this
360+
// modified filter,
369361
// otherwise patient to sample mapping may be incomplete.
370362
if (studyViewFilter.getClinicalDataFilters() != null) {
371363
studyViewFilter.getClinicalDataFilters().stream()
@@ -402,7 +394,6 @@ public ResponseEntity<ClinicalViolinPlotData> fetchClinicalDataViolinPlots(
402394
return new ResponseEntity<>(result, HttpStatus.OK);
403395
}
404396

405-
@Hidden // should unhide when we remove legacy controller
406397
@PostMapping(
407398
value = "/genomic-data-counts/fetch",
408399
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -424,9 +415,11 @@ public ResponseEntity<List<GenomicDataCountItem>> fetchGenomicDataCounts(
424415
throws StudyNotFoundException {
425416
List<GenomicDataFilter> genomicDataFilters = genomicDataCountFilter.getGenomicDataFilters();
426417
StudyViewFilter studyViewFilter = genomicDataCountFilter.getStudyViewFilter();
427-
// when there is only one filter, it means study view is doing a single chart filter operation
418+
// when there is only one filter, it means study view is doing a single chart
419+
// filter operation
428420
// remove filter from studyViewFilter to return all data counts
429-
// the reason we do this is to make sure after chart get filtered, user can still see unselected
421+
// the reason we do this is to make sure after chart get filtered, user can
422+
// still see unselected
430423
// portion of the chart
431424
if (genomicDataFilters.size() == 1) {
432425
NewStudyViewFilterUtil.removeSelfFromGenomicDataFilter(
@@ -435,15 +428,15 @@ public ResponseEntity<List<GenomicDataCountItem>> fetchGenomicDataCounts(
435428
studyViewFilter);
436429
}
437430

438-
// This endpoint is CNA specific. The name choice of "genomic data" does not imply it support
431+
// This endpoint is CNA specific. The name choice of "genomic data" does not
432+
// imply it support
439433
// other genomic data types
440434
List<GenomicDataCountItem> result =
441435
studyViewService.getCNACountsByGeneSpecific(studyViewFilter, genomicDataFilters);
442436

443437
return new ResponseEntity<>(result, HttpStatus.OK);
444438
}
445439

446-
@Hidden // should unhide when we remove legacy controller
447440
@PostMapping(
448441
value = "/generic-assay-data-counts/fetch",
449442
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -467,9 +460,11 @@ public ResponseEntity<List<GenericAssayDataCountItem>> fetchGenericAssayDataCoun
467460
List<GenericAssayDataFilter> gaFilters =
468461
genericAssayDataCountFilter.getGenericAssayDataFilters();
469462
StudyViewFilter studyViewFilter = genericAssayDataCountFilter.getStudyViewFilter();
470-
// when there is only one filter, it means study view is doing a single chart filter operation
463+
// when there is only one filter, it means study view is doing a single chart
464+
// filter operation
471465
// remove filter from studyViewFilter to return all data counts
472-
// the reason we do this is to make sure after chart get filtered, user can still see unselected
466+
// the reason we do this is to make sure after chart get filtered, user can
467+
// still see unselected
473468
// portion of the chart
474469

475470
if (gaFilters.size() == 1) {
@@ -481,7 +476,6 @@ public ResponseEntity<List<GenericAssayDataCountItem>> fetchGenericAssayDataCoun
481476
studyViewService.getGenericAssayDataCounts(studyViewFilter, gaFilters));
482477
}
483478

484-
@Hidden // should unhide when we remove legacy controller
485479
@PostMapping(
486480
value = "/mutation-data-counts/fetch",
487481
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -499,9 +493,11 @@ public ResponseEntity<List<GenomicDataCountItem>> fetchMutationDataCounts(
499493
GenomicDataCountFilter genomicDataCountFilter) {
500494
List<GenomicDataFilter> genomicDataFilters = genomicDataCountFilter.getGenomicDataFilters();
501495
StudyViewFilter studyViewFilter = genomicDataCountFilter.getStudyViewFilter();
502-
// when there is only one filter, it means study view is doing a single chart filter operation
496+
// when there is only one filter, it means study view is doing a single chart
497+
// filter operation
503498
// remove filter from studyViewFilter to return all data counts
504-
// the reason we do this is to make sure after chart get filtered, user can still see unselected
499+
// the reason we do this is to make sure after chart get filtered, user can
500+
// still see unselected
505501
// portion of the chart
506502
if (genomicDataFilters.size() == 1 && projection == Projection.SUMMARY) {
507503
NewStudyViewFilterUtil.removeSelfFromMutationDataFilter(
@@ -520,7 +516,6 @@ public ResponseEntity<List<GenomicDataCountItem>> fetchMutationDataCounts(
520516
return ResponseEntity.ok(result);
521517
}
522518

523-
@Hidden // should unhide when we remove legacy controller
524519
@PostMapping(
525520
value = "/clinical-event-type-counts/fetch",
526521
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -588,7 +583,6 @@ public ResponseEntity<SampleTreatmentReport> fetchSampleTreatmentCounts(
588583
studyViewService.getSampleTreatmentReport(studyViewFilter, projection));
589584
}
590585

591-
@Hidden // should unhide when we remove legacy controller
592586
@PostMapping(
593587
value = "/custom-data-counts/fetch",
594588
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -638,7 +632,6 @@ public ResponseEntity<List<ClinicalDataCountItem>> fetchCustomDataCounts(
638632
return new ResponseEntity<>(result, HttpStatus.OK);
639633
}
640634

641-
@Hidden // should unhide when we remove legacy controller
642635
@PostMapping(
643636
value = "/custom-data-bin-counts/fetch",
644637
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -663,7 +656,6 @@ public ResponseEntity<List<ClinicalDataBin>> fetchCustomDataBinCounts(
663656
return ResponseEntity.ok(customDataBins);
664657
}
665658

666-
@Hidden // should unhide when we remove legacy controller
667659
@PostMapping(
668660
value = "/genomic-data-bin-counts/fetch",
669661
consumes = MediaType.APPLICATION_JSON_VALUE,
@@ -683,7 +675,6 @@ public ResponseEntity<List<GenomicDataBin>> fetchGenomicDataBinCounts(
683675
return ResponseEntity.ok(genomicDataBins);
684676
}
685677

686-
@Hidden // should unhide when we remove legacy controller
687678
@PostMapping(
688679
value = "/generic-assay-data-bin-counts/fetch",
689680
consumes = MediaType.APPLICATION_JSON_VALUE,

0 commit comments

Comments
 (0)