Skip to content

Commit 06c99e3

Browse files
committed
Adding check for genericAssayProfilesMap before get profiles
1 parent 838cf72 commit 06c99e3

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

src/main/java/org/cbioportal/persistence/helper/StudyViewFilterHelper.java

+25-21
Original file line numberDiff line numberDiff line change
@@ -102,27 +102,31 @@ private CategorizedGenericAssayDataCountFilter extractGenericAssayDataCountFilte
102102
CategorizedGenericAssayDataCountFilter.Builder builder = CategorizedGenericAssayDataCountFilter.getBuilder();
103103

104104
// No BINARY in the database yet
105-
List<String> sampleNumericalProfileTypes = genericAssayProfilesMap.get(DataSource.SAMPLE)
106-
.stream().filter(profile -> profile.getDatatype().equals("LIMIT-VALUE"))
107-
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
108-
.toList();
109-
builder.setSampleNumericalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
110-
.filter(genericAssayDataFilter -> sampleNumericalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
111-
.toList());
112-
List<String> sampleCategoricalProfileTypes = genericAssayProfilesMap.get(DataSource.SAMPLE)
113-
.stream().filter(profile -> profile.getDatatype().equals("CATEGORICAL") || profile.getDatatype().equals("BINARY"))
114-
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
115-
.toList();
116-
builder.setSampleCategoricalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
117-
.filter(genericAssayDataFilter -> sampleCategoricalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
118-
.toList());
119-
List<String> patientCategoricalProfileTypes = genericAssayProfilesMap.get(DataSource.PATIENT)
120-
.stream().filter(profile -> profile.getDatatype().equals("CATEGORICAL") || profile.getDatatype().equals("BINARY"))
121-
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
122-
.toList();
123-
builder.setPatientCategoricalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
124-
.filter(genericAssayDataFilter -> patientCategoricalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
125-
.toList());
105+
if (genericAssayProfilesMap.containsKey(DataSource.SAMPLE)) {
106+
List<String> sampleNumericalProfileTypes = genericAssayProfilesMap.get(DataSource.SAMPLE)
107+
.stream().filter(profile -> profile.getDatatype().equals("LIMIT-VALUE"))
108+
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
109+
.toList();
110+
builder.setSampleNumericalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
111+
.filter(genericAssayDataFilter -> sampleNumericalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
112+
.toList());
113+
List<String> sampleCategoricalProfileTypes = genericAssayProfilesMap.get(DataSource.SAMPLE)
114+
.stream().filter(profile -> profile.getDatatype().equals("CATEGORICAL") || profile.getDatatype().equals("BINARY"))
115+
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
116+
.toList();
117+
builder.setSampleCategoricalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
118+
.filter(genericAssayDataFilter -> sampleCategoricalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
119+
.toList());
120+
}
121+
if (genericAssayProfilesMap.containsKey(DataSource.PATIENT)) {
122+
List<String> patientCategoricalProfileTypes = genericAssayProfilesMap.get(DataSource.PATIENT)
123+
.stream().filter(profile -> profile.getDatatype().equals("CATEGORICAL") || profile.getDatatype().equals("BINARY"))
124+
.map(profile -> profile.getStableId().replace(profile.getCancerStudyIdentifier() + "_", ""))
125+
.toList();
126+
builder.setPatientCategoricalGenericAssayDataFilters(studyViewFilter.getGenericAssayDataFilters().stream()
127+
.filter(genericAssayDataFilter -> patientCategoricalProfileTypes.contains(genericAssayDataFilter.getProfileType()))
128+
.toList());
129+
}
126130
return builder.build();
127131
}
128132

0 commit comments

Comments
 (0)