Skip to content

[DT-3258] Ensure that FSOs are limited to DAAs for this DAO. #2902

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 1 commit into from
May 12, 2026
+50 −4
Merged

[DT-3258] Ensure that FSOs are limited to DAAs for this DAO. #2902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/main/java/org/broadinstitute/consent/http/db/DaaDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public interface DaaDAO extends Transactional<DaaDAO> {
dac.name,
dac.description
FROM data_access_agreement daa
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id AND fso.category = 'dataAccessAgreement'
LEFT JOIN dac_daa dd ON daa.daa_id = dd.daa_id
LEFT JOIN dac ON dd.dac_id = dac.dac_id AND dac.deleted IS NOT TRUE
Comment thread
otchet-broad marked this conversation as resolved.
""")
Expand Down Expand Up @@ -108,7 +108,7 @@ public interface DaaDAO extends Transactional<DaaDAO> {
dac.name,
dac.description
FROM data_access_agreement daa
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id AND fso.category = 'dataAccessAgreement'
LEFT JOIN dac_daa dd ON daa.daa_id = dd.daa_id
LEFT JOIN dac ON dd.dac_id = dac.dac_id AND dac.deleted IS NOT TRUE
Comment thread
otchet-broad marked this conversation as resolved.
WHERE daa.daa_id = :daaId
Expand Down Expand Up @@ -150,7 +150,7 @@ public interface DaaDAO extends Transactional<DaaDAO> {
dac.name,
dac.description
FROM data_access_agreement daa
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id AND fso.category = 'dataAccessAgreement'
Comment thread
otchet-broad marked this conversation as resolved.
LEFT JOIN dac_daa dd ON daa.daa_id = dd.daa_id
LEFT JOIN dac ON dd.dac_id = dac.dac_id
WHERE daa.initial_dac_id = :dacId
Expand Down Expand Up @@ -272,7 +272,7 @@ void deleteDacDaaRelation(
dac.name,
dac.description
FROM data_access_agreement daa
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id
LEFT JOIN file_storage_object fso ON daa.daa_id::text = fso.entity_id AND fso.category = 'dataAccessAgreement'
Comment thread
otchet-broad marked this conversation as resolved.
INNER JOIN dac_daa ON daa.daa_id = dac_daa.daa_id
INNER JOIN dac ON dac.dac_id = dac_daa.dac_id
INNER JOIN dataset ON dataset.dac_id = dac.dac_id
Expand Down
46 changes: 46 additions & 0 deletions src/test/java/org/broadinstitute/consent/http/db/DaaDAOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,44 @@ void testFindAllOneDaa() {
assertEquals(1, daas.size());
}

@Test
void testFindAllDacOnlyProperFileCategory() {
Comment thread
otchet-broad marked this conversation as resolved.
Integer userId = createUserId();
Integer dacId =
dacDAO.createDac(randomAlphabetic(5), randomAlphabetic(5), "", createUser().getUserId());
Integer daaId = daaDAO.createDaa(userId, Instant.now(), userId, Instant.now(), dacId);
fileStorageObjectDAO.insertNewFile(
randomAlphabetic(10),
FileCategory.ALTERNATIVE_DATA_SHARING_PLAN.getValue(),
randomAlphabetic(10),
MediaType.TEXT_PLAIN_TYPE.getType(),
daaId.toString(),
userId,
Instant.now());
Integer fsoId =
fileStorageObjectDAO.insertNewFile(
randomAlphabetic(10),
FileCategory.DATA_ACCESS_AGREEMENT.getValue(),
randomAlphabetic(10),
MediaType.TEXT_PLAIN_TYPE.getType(),
daaId.toString(),
userId,
Instant.now());
fileStorageObjectDAO.insertNewFile(
randomAlphabetic(10),
FileCategory.ALTERNATIVE_DATA_SHARING_PLAN.getValue(),
Copy link
Copy Markdown
Contributor

@rushtong rushtong May 12, 2026

Choose a reason for hiding this comment

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

Nice 👍🏽

randomAlphabetic(10),
MediaType.TEXT_PLAIN_TYPE.getType(),
daaId.toString(),
userId,
Instant.now());
List<DataAccessAgreement> daa = daaDAO.findAll();
assertNotNull(daa);
assertEquals(1, daa.size());
assertNotNull(daa.getFirst().getFile());
assertEquals(fsoId, daa.getFirst().getFile().getFileStorageObjectId());
}

@Test
void testFindAllMultipleDaas() {
Integer userId = createUserId();
Expand Down Expand Up @@ -266,6 +304,14 @@ void testFindWithFileStorageObject() {
daaId.toString(),
userId,
Instant.now());
fileStorageObjectDAO.insertNewFile(
randomAlphabetic(10),
FileCategory.DATA_USE_LETTER.getValue(),
randomAlphabetic(10),
MediaType.TEXT_PLAIN_TYPE.getType(),
daaId.toString(),
userId,
Instant.now());
DataAccessAgreement daa = daaDAO.findById(daaId);
assertNotNull(daa);
assertNotNull(daa.getFile());
Expand Down
Loading