Skip to content

[DT-2750] Erase old study properties before applying new registration to a study. #2770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
otchet-broad merged 2 commits into from
Dec 15, 2025
Merged

[DT-2750] Erase old study properties before applying new registration to a study. #2770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc8d33
feat: DT-2750 erase old study properties before applying a new regist…
otchet-broad Dec 15, 2025
f10dbca
Update src/main/java/org/broadinstitute/consent/http/db/StudyDAO.java
otchet-broad Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/org/broadinstitute/consent/http/db/StudyDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ DELETE FROM study WHERE study_id in (select study_id from property_deletes)
""")
void deleteStudyByStudyId(@Bind("studyId") Integer studyId);

@SqlUpdate(
"""
DELETE FROM study_property where study_id = :studyId
""")
void deleteStudyPropertiesByStudyId(@Bind("studyId") Integer studyId);

@UseRowReducer(StudyReducer.class)
@SqlQuery(
"""
Expand Down
62 changes: 39 additions & 23 deletions src/main/java/org/broadinstitute/consent/http/service/dao/DatasetServiceDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ public Study updateStudy(
jdbi.useHandle(
handle -> {
handle.getConnection().setAutoCommit(false);
executeUpdateStudy(handle, studyUpdate);
executeUpdateStudyReplaceProps(handle, studyUpdate);
for (DatasetUpdate datasetUpdate : datasetUpdates) {
executeUpdateDatasetWithFiles(
handle,
Expand Down Expand Up @@ -275,7 +275,15 @@ public Study updateStudy(
return studyDAO.findStudyById(studyUpdate.studyId);
}

private void executeUpdateStudy(Handle handle, StudyUpdate update) {
private void executeUpdateStudyReplaceProps(Handle handle, StudyUpdate update) {
executeUpdateStudy(handle, update, true);
}

private void executeUpdateStudyKeepProps(Handle handle, StudyUpdate update) {
executeUpdateStudy(handle, update, false);
}

private void executeUpdateStudy(Handle handle, StudyUpdate update, boolean replaceProps) {
StudyDAO studyDAO = handle.attach(StudyDAO.class);
Study study = studyDAO.findStudyById(update.studyId);
studyDAO.updateStudy(
Expand All @@ -288,26 +296,34 @@ private void executeUpdateStudy(Handle handle, StudyUpdate update) {
update.userId,
Instant.now());

// Handle property inserts and updates
Set<StudyProperty> existingStudyProperties =
studyDAO.findStudyById(update.studyId).getProperties();
update.props.forEach(
p -> {
Optional<StudyProperty> existingProp =
existingStudyProperties.stream()
.filter(ep -> p.getKey().equals(ep.getKey()) && p.getType().equals(ep.getType()))
.findFirst();
if (existingProp.isPresent()) {
// Update existing study prop:
studyDAO.updateStudyProperty(
update.studyId, p.getKey(), p.getType().toString(), p.getValue().toString());
} else {
// Add new study prop:
studyDAO.insertStudyProperty(
update.studyId, p.getKey(), p.getType().toString(), p.getValue().toString());
}
});

if (replaceProps) {
studyDAO.deleteStudyPropertiesByStudyId(update.studyId);
update.props.forEach(
p ->
studyDAO.insertStudyProperty(
update.studyId, p.getKey(), p.getType().toString(), p.getValue().toString()));
} else {
// Handle property inserts and updates
Set<StudyProperty> existingStudyProperties =
studyDAO.findStudyById(update.studyId).getProperties();
update.props.forEach(
p -> {
Optional<StudyProperty> existingProp =
existingStudyProperties.stream()
.filter(
ep -> p.getKey().equals(ep.getKey()) && p.getType().equals(ep.getType()))
.findFirst();
if (existingProp.isPresent()) {
// Update existing study prop:
studyDAO.updateStudyProperty(
update.studyId, p.getKey(), p.getType().toString(), p.getValue().toString());
} else {
// Add new study prop:
studyDAO.insertStudyProperty(
update.studyId, p.getKey(), p.getType().toString(), p.getValue().toString());
}
});
}
executeInsertFiles(handle, update.files, update.userId, study.getUuid().toString());
}

Expand Down Expand Up @@ -423,7 +439,7 @@ public Study patchStudy(Study study, User user, StudyPatch patch) throws SQLExce
// Convert the patch to a StudyUpdate for reuse of existing methods
StudyUpdate studyUpdate = convertToStudyUpdate(study, user, patch);
try {
executeUpdateStudy(handle, studyUpdate);
executeUpdateStudyKeepProps(handle, studyUpdate);
} catch (Exception e) {
handle.rollback();
logException(e);
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/broadinstitute/consent/http/db/StudyDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,19 @@ void testDeleteStudyById() {
assertNull(deletedStudy);
}

@Test
void testDeleteStudyPropertiesById() {
Study study = insertStudyWithProperties();
Integer id = study.getStudyId();
int propertyCount = study.getProperties().size();
assertTrue(propertyCount > 0);

studyDAO.deleteStudyPropertiesByStudyId(id);

Study foundStudy = studyDAO.findStudyById(id);
assertEquals(0, foundStudy.getProperties().size());
}

@Test
void testFindStudyByName() {
Study study = insertStudyWithProperties();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/broadinstitute/consent/http/service/dao/DatasetServiceDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ void testUpdateStudyWithPropUpdates() throws Exception {
// Updated prop
Optional<StudyProperty> updatedProp1 =
updatedStudy.getProperties().stream()
.filter(p -> p.getStudyPropertyId().equals(prop1.getStudyPropertyId()))
.filter(p -> p.getKey().equals(prop1.getKey()))
Copy link
Contributor Author

@otchet-broad otchet-broad Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're deleting and reinserting the property now, the ID can change. Using the property Key ensures that we're finding the property we expect.

.findFirst();
assertTrue(updatedProp1.isPresent());
assertEquals(newPropValue, updatedProp1.get().getValue());
Expand Down
Loading