Skip to content

Commit

Permalink
Update to add QValue for Alteration Count Services
Browse files Browse the repository at this point in the history
  • Loading branch information
@haynescd
haynescd committed Sep 30, 2024
1 parent f2bf6e8 commit 28a9958
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 17 deletions.
7 changes: 4 additions & 3 deletions src/main/java/org/cbioportal/service/AlterationCountService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import org.apache.commons.math3.util.Pair;
import org.cbioportal.model.*;
import org.cbioportal.model.util.Select;
import org.cbioportal.service.exception.StudyNotFoundException;
import org.cbioportal.web.parameter.CategorizedClinicalDataCountFilter;
import org.cbioportal.web.parameter.CustomSampleIdentifier;
import org.cbioportal.web.parameter.SampleIdentifier;
Expand Down Expand Up @@ -79,9 +80,9 @@ Pair<List<CopyNumberCountByGene>, Long> getPatientCnaGeneCounts(List<MolecularPr
boolean includeMissingAlterationsFromGenePanel,
AlterationFilter alterationFilter);

List<AlterationCountByGene> getMutatedGenes(StudyViewFilterContext studyViewFilterContext);
List<CopyNumberCountByGene> getCnaGenes(StudyViewFilterContext studyViewFilterContext);
List<AlterationCountByGene> getMutatedGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException;
List<CopyNumberCountByGene> getCnaGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException;

List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilterContext studyViewFilterContext);
List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException;

}
7 changes: 4 additions & 3 deletions src/main/java/org/cbioportal/service/StudyViewColumnarService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.cbioportal.model.PatientTreatmentReport;
import org.cbioportal.model.Sample;
import org.cbioportal.model.SampleTreatmentReport;
import org.cbioportal.service.exception.StudyNotFoundException;
import org.cbioportal.web.parameter.ClinicalDataType;
import org.cbioportal.web.parameter.GenomicDataFilter;
import org.cbioportal.web.parameter.StudyViewFilter;
Expand All @@ -22,9 +23,9 @@ public interface StudyViewColumnarService {

List<Sample> getFilteredSamples(StudyViewFilter studyViewFilter);

List<AlterationCountByGene> getMutatedGenes(StudyViewFilter interceptedStudyViewFilter);
List<CopyNumberCountByGene> getCnaGenes(StudyViewFilter interceptedStudyViewFilter);
List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilter studyViewFilter);
List<AlterationCountByGene> getMutatedGenes(StudyViewFilter interceptedStudyViewFilter) throws StudyNotFoundException;
List<CopyNumberCountByGene> getCnaGenes(StudyViewFilter interceptedStudyViewFilter) throws StudyNotFoundException;
List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilter studyViewFilter) throws StudyNotFoundException;

Map<String, ClinicalDataType> getClinicalAttributeDatatypeMap();

Expand Down
42 changes: 37 additions & 5 deletions src/main/java/org/cbioportal/service/impl/AlterationCountServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@
import org.cbioportal.model.CopyNumberCountByGene;
import org.cbioportal.model.MolecularProfile;
import org.cbioportal.model.MolecularProfileCaseIdentifier;
import org.cbioportal.model.MutSig;
import org.cbioportal.model.StudyViewFilterContext;
import org.cbioportal.model.util.Select;
import org.cbioportal.persistence.AlterationRepository;
import org.cbioportal.persistence.MolecularProfileRepository;
import org.cbioportal.persistence.StudyViewRepository;
import org.cbioportal.service.AlterationCountService;
import org.cbioportal.service.SignificantlyMutatedGeneService;
import org.cbioportal.service.exception.StudyNotFoundException;
import org.cbioportal.service.util.AlterationEnrichmentUtil;
import org.cbioportal.web.parameter.Projection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;
Expand All @@ -41,6 +45,7 @@ public class AlterationCountServiceImpl implements AlterationCountService {
private final AlterationEnrichmentUtil<CopyNumberCountByGene> alterationEnrichmentUtilCna;
private final AlterationEnrichmentUtil<AlterationCountByStructuralVariant> alterationEnrichmentUtilStructVar;
private final MolecularProfileRepository molecularProfileRepository;
private final SignificantlyMutatedGeneService significantlyMutatedGeneService;

private final StudyViewRepository studyViewRepository;

Expand All @@ -52,13 +57,14 @@ public AlterationCountServiceImpl(AlterationRepository alterationRepository, Alt
AlterationEnrichmentUtil<CopyNumberCountByGene> alterationEnrichmentUtilCna,
AlterationEnrichmentUtil<AlterationCountByStructuralVariant> alterationEnrichmentUtilStructVar,
MolecularProfileRepository molecularProfileRepository,
StudyViewRepository studyViewRepository) {
StudyViewRepository studyViewRepository, SignificantlyMutatedGeneService significantlyMutatedGeneService) {
this.alterationRepository = alterationRepository;
this.alterationEnrichmentUtil = alterationEnrichmentUtil;
this.alterationEnrichmentUtilCna = alterationEnrichmentUtilCna;
this.alterationEnrichmentUtilStructVar = alterationEnrichmentUtilStructVar;
this.molecularProfileRepository = molecularProfileRepository;
this.studyViewRepository = studyViewRepository;
this.significantlyMutatedGeneService = significantlyMutatedGeneService;
}
@Override
public Pair<List<AlterationCountByGene>, Long> getSampleAlterationGeneCounts(List<MolecularProfileCaseIdentifier> molecularProfileCaseIdentifiers,
Expand Down Expand Up @@ -253,29 +259,32 @@ public Pair<List<CopyNumberCountByGene>, Long> getPatientCnaGeneCounts(List<Mole
}

@Override
public List<AlterationCountByGene> getMutatedGenes(StudyViewFilterContext studyViewFilterContext) {
public List<AlterationCountByGene> getMutatedGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException {
var alterationCountByGenes = studyViewRepository.getMutatedGenes(studyViewFilterContext);
return populateAlterationCounts(combineAlterationCountsWithConflictingHugoSymbols(alterationCountByGenes), studyViewFilterContext, AlterationType.MUTATION_EXTENDED);
}

public List<CopyNumberCountByGene> getCnaGenes(StudyViewFilterContext studyViewFilterContext) {
public List<CopyNumberCountByGene> getCnaGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException {
var copyNumberCountByGenes = studyViewRepository.getCnaGenes(studyViewFilterContext);
return populateAlterationCounts(combineCopyNumberCountsWithConflictingHugoSymbols(copyNumberCountByGenes), studyViewFilterContext, AlterationType.COPY_NUMBER_ALTERATION);
}

@Override
public List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilterContext studyViewFilterContext) {
public List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException {
var alterationCountByGenes = studyViewRepository.getStructuralVariantGenes(studyViewFilterContext);
return populateAlterationCounts(combineAlterationCountsWithConflictingHugoSymbols(alterationCountByGenes), studyViewFilterContext, AlterationType.STRUCTURAL_VARIANT);
}

private < T extends AlterationCountByGene> List<T> populateAlterationCounts(@NonNull List<T> alterationCounts,
@NonNull StudyViewFilterContext studyViewFilterContext,
@NonNull AlterationType alterationType) {
@NonNull AlterationType alterationType) throws StudyNotFoundException {
final int profiledCountWithoutGenePanelData = studyViewRepository.getTotalProfiledCountsByAlterationType(studyViewFilterContext, alterationType.toString());
var profiledCountsMap = studyViewRepository.getTotalProfiledCounts(studyViewFilterContext, alterationType.toString());
final var matchingGenePanelIdsMap = studyViewRepository.getMatchingGenePanelIds(studyViewFilterContext, alterationType.toString());
final int sampleProfileCountWithoutGenePanelData = studyViewRepository.getSampleProfileCountWithoutPanelData(studyViewFilterContext, alterationType.toString());

// Query MutSig
final var mutSigs = getMutSigs(studyViewFilterContext);

alterationCounts.parallelStream()
.forEach(alterationCountByGene -> {
Expand All @@ -290,6 +299,11 @@ private < T extends AlterationCountByGene> List<T> populateAlterationCounts(@Non
alterationCountByGene.setNumberOfProfiledCases(totalProfiledCount);

alterationCountByGene.setMatchingGenePanelIds(matchingGenePanelIds);

if (mutSigs.containsKey(alterationCountByGene.getHugoGeneSymbol())) {
var mutSig = mutSigs.get(alterationCountByGene.getHugoGeneSymbol());
alterationCountByGene.setqValue(mutSig.getqValue());
}
});
return alterationCounts;
}
Expand Down Expand Up @@ -349,6 +363,24 @@ private boolean hasGenePanelData(@NonNull Set<String> matchingGenePanelIds) {
&& matchingGenePanelIds.size() > 1 || !matchingGenePanelIds.contains(WHOLE_EXOME_SEQUENCING) && !matchingGenePanelIds.isEmpty();
}

private Map<String, MutSig> getMutSigs(StudyViewFilterContext studyViewFilterContext) throws StudyNotFoundException {
var distinctStudyIds = new HashSet<>(studyViewFilterContext.studyViewFilter().getStudyIds());
Map<String, MutSig> mutSigs = new HashMap<>();
if (distinctStudyIds.size() == 1) {
var studyId = distinctStudyIds.stream().findFirst().get();
mutSigs = significantlyMutatedGeneService.getSignificantlyMutatedGenes(
studyId,
Projection.SUMMARY.name(),
null,
null,
null,
null)
.stream()
.collect(Collectors.toMap(MutSig::getHugoGeneSymbol, Function.identity()));
}
return mutSigs;
}

private <S extends AlterationCountBase> Pair<List<S>, Long> getAlterationGeneCounts(
List<MolecularProfileCaseIdentifier> molecularProfileCaseIdentifiers,
boolean includeFrequency,
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/cbioportal/service/impl/StudyViewColumnarServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.cbioportal.persistence.StudyViewRepository;
import org.cbioportal.service.AlterationCountService;
import org.cbioportal.service.StudyViewColumnarService;
import org.cbioportal.service.exception.StudyNotFoundException;
import org.cbioportal.service.treatment.TreatmentCountReportService;
import org.cbioportal.web.parameter.ClinicalDataType;
import org.cbioportal.web.parameter.CustomSampleIdentifier;
Expand Down Expand Up @@ -58,7 +59,7 @@ public List<Sample> getFilteredSamples(StudyViewFilter studyViewFilter) {
}

@Override
public List<AlterationCountByGene> getMutatedGenes(StudyViewFilter studyViewFilter) {
public List<AlterationCountByGene> getMutatedGenes(StudyViewFilter studyViewFilter) throws StudyNotFoundException {
return alterationCountService.getMutatedGenes(createContext(studyViewFilter));
}

Expand Down Expand Up @@ -92,12 +93,12 @@ public List<ClinicalDataCountItem> getGenericAssayDataBinCounts(StudyViewFilter
return generateDataCountItemsFromDataCounts(studyViewRepository.getGenericAssayDataBinCounts(createContext(studyViewFilter), filteredAttributes));
}

public List<CopyNumberCountByGene> getCnaGenes(StudyViewFilter studyViewFilter) {
public List<CopyNumberCountByGene> getCnaGenes(StudyViewFilter studyViewFilter) throws StudyNotFoundException {
return alterationCountService.getCnaGenes(createContext(studyViewFilter));
}

@Override
public List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilter studyViewFilter) {
public List<AlterationCountByGene> getStructuralVariantGenes(StudyViewFilter studyViewFilter) throws StudyNotFoundException {
return alterationCountService.getStructuralVariantGenes(createContext(studyViewFilter));
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/cbioportal/web/columnar/StudyViewColumnStoreController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public ResponseEntity<List<CopyNumberCountByGene>> fetchCnaGenes(
@RequestBody(required = false) StudyViewFilter studyViewFilter,
@RequestAttribute(required = false, value = "involvedCancerStudies") Collection<String> involvedCancerStudies,
@RequestAttribute(required = false, value = "interceptedStudyViewFilter") StudyViewFilter interceptedStudyViewFilter
) {
) throws StudyNotFoundException {
return new ResponseEntity<>(
studyViewColumnarService.getCnaGenes(interceptedStudyViewFilter),
HttpStatus.OK
Expand All @@ -176,7 +176,7 @@ public ResponseEntity<List<AlterationCountByGene>> fetchStructuralVariantGenes(
@RequestAttribute(required = false, value = "involvedCancerStudies") Collection<String> involvedCancerStudies,
@Parameter(hidden = true) // prevent reference to this attribute in the swagger-ui interface.
@Valid @RequestAttribute(required = false, value = "interceptedStudyViewFilter") StudyViewFilter interceptedStudyViewFilter
) {
) throws StudyNotFoundException {
return new ResponseEntity<>(studyViewColumnarService.getStructuralVariantGenes(interceptedStudyViewFilter), HttpStatus.OK);
}

Expand Down
6 changes: 5 additions & 1 deletion src/test/java/org/cbioportal/service/impl/AlterationCountServiceImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.cbioportal.persistence.AlterationRepository;
import org.cbioportal.persistence.MolecularProfileRepository;
import org.cbioportal.persistence.StudyViewRepository;
import org.cbioportal.service.SignificantlyMutatedGeneService;
import org.cbioportal.service.exception.MolecularProfileNotFoundException;
import org.cbioportal.service.util.AlterationEnrichmentUtil;
import org.cbioportal.service.util.MolecularProfileUtil;
Expand Down Expand Up @@ -57,6 +58,8 @@ public class AlterationCountServiceImplTest extends BaseServiceImplTest {
private MolecularProfileRepository molecularProfileRepository;
@Mock
private StudyViewRepository studyViewRepository;
@Mock
private SignificantlyMutatedGeneService significantlyMutatedGeneService;

List<MolecularProfileCaseIdentifier> caseIdentifiers = Arrays.asList(new MolecularProfileCaseIdentifier("A", MOLECULAR_PROFILE_ID));
Select<MutationEventType> mutationEventTypes = Select.byValues(Arrays.asList(MutationEventType.missense_mutation));
Expand Down Expand Up @@ -85,7 +88,8 @@ public void setup() {
MockitoAnnotations.openMocks(this);

alterationCountService = new AlterationCountServiceImpl(alterationRepository, alterationEnrichmentUtil,
alterationEnrichmentUtilCna, alterationEnrichmentUtilStructVar, molecularProfileRepository, studyViewRepository);
alterationEnrichmentUtilCna, alterationEnrichmentUtilStructVar, molecularProfileRepository,
studyViewRepository, significantlyMutatedGeneService);

MolecularProfile molecularProfile = new MolecularProfile();
molecularProfile.setStableId(MOLECULAR_PROFILE_ID);
Expand Down

0 comments on commit 28a9958

Please sign in to comment.