Skip to content

Commit f9feb8d

Browse files
authored
[DUOS-2851][risk=no] Minor safety check for studies with no datasets (#2212)
1 parent 0f5f981 commit f9feb8d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/java/org/broadinstitute/consent/http/models/dataset_registration_v1/DatasetRegistrationSchemaV1UpdateValidator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.List;
66
import java.util.Objects;
77
import java.util.Optional;
8+
import org.apache.commons.collections4.SetUtils;
89
import org.broadinstitute.consent.http.models.Dataset;
910
import org.broadinstitute.consent.http.models.Study;
1011
import org.broadinstitute.consent.http.models.dataset_registration_v1.DatasetRegistrationSchemaV1.NihAnvilUse;
@@ -47,9 +48,9 @@ public boolean validate(Study existingStudy, DatasetRegistrationSchemaV1 registr
4748
.stream()
4849
.filter(cg -> Objects.nonNull(cg.getDatasetId()))
4950
.filter(cg -> existingStudy
50-
.getDatasetIds()
51-
.stream()
52-
.noneMatch(id -> id.equals(cg.getDatasetId())))
51+
.getDatasetIds()
52+
.stream()
53+
.noneMatch(id -> id.equals(cg.getDatasetId())))
5354
.toList();
5455
if (!nonStudyConsentGroups.isEmpty()) {
5556
throw new BadRequestException("Invalid Consent Group changes to study");
@@ -62,8 +63,7 @@ public boolean validate(Study existingStudy, DatasetRegistrationSchemaV1 registr
6263
.filter(cg -> Objects.nonNull(cg.getConsentGroupName()))
6364
// If the dataset already has a name, this consent group is invalid
6465
.filter(cg -> {
65-
Optional<Dataset> dataset = existingStudy
66-
.getDatasets()
66+
Optional<Dataset> dataset = SetUtils.emptyIfNull(existingStudy.getDatasets())
6767
.stream()
6868
.filter(d -> d.getDataSetId().equals(cg.getDatasetId()))
6969
.findFirst();

0 commit comments

Comments
 (0)