Skip to content

Fix potential duplicates in swordv2 deposit with embargo #1302

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
milanmajchrak merged 3 commits into from
Apr 15, 2026
Merged

Fix potential duplicates in swordv2 deposit with embargo #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8209a6d
Added policies only if there are none
Apr 13, 2026
cff45b8
Changed link in failing CurationScriptIT.testURLRedirectCurateTest
Apr 14, 2026
1b5a0a6
Updated creation of item in test based on changed link
Apr 14, 2026
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
11 changes: 9 additions & 2 deletions dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public abstract class AbstractMETSIngester extends AbstractPackageIngester {
= DSpaceServicesFactory.getInstance().getConfigurationService();


protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
protected final AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();


/**
Expand Down Expand Up @@ -774,7 +774,14 @@ protected void addBitstreams(Context context, Item item,
manifest.crosswalkBitstream(context, params, bitstream, mfileID,
mdRefCallback);

authorizeService.addPolicies(context, bitstreamPolicies, bitstream);
// Only add the saved TYPE_SUBMISSION policies if the crosswalk actually removed them to prevent duplicates.
if (!bitstreamPolicies.isEmpty()) {
List<ResourcePolicy> remainingSubmissionPolicies =
authorizeService.findPoliciesByDSOAndType(context, bitstream, ResourcePolicy.TYPE_SUBMISSION);
if (remainingSubmissionPolicies.isEmpty()) {
authorizeService.addPolicies(context, bitstreamPolicies, bitstream);
}
}

// is this the primary bitstream?
if (primaryID != null && mfileID.equals(primaryID)) {
Expand Down
6 changes: 3 additions & 3 deletions dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public void testURLRedirectCurateTest() throws Exception {
// MetadataValueLinkChecker uri field with regular link
.withMetadata("dc", "description", null, "https://google.com")
// MetadataValueLinkChecker uri field with redirect link
.withMetadata("dc", "description", "uri", "https://demo7.dspace.org/handle/123456789/1")
.withMetadata("dc", "description", "uri", "http://google.com")
// MetadataValueLinkChecker uri field with non resolving link
.withMetadata("dc", "description", "uri", "https://www.atmire.com/broken-link")
.withSubject("ExtraEntry")
Expand All @@ -690,8 +690,8 @@ public void testURLRedirectCurateTest() throws Exception {

// field that should be ignored
assertFalse(checkIfInfoTextLoggedByHandler(handler, "demo.dspace.org/home"));
// redirect links in field that should not be ignored (https) => expect OK
assertTrue(checkIfInfoTextLoggedByHandler(handler, "https://demo7.dspace.org/handle/123456789/1 = 200 - OK"));
// redirect links in field that should not be ignored => expect OK (even though curl responds with 301)
assertTrue(checkIfInfoTextLoggedByHandler(handler, "http://google.com = 200 - OK"));
// regular link in field that should not be ignored (http) => expect OK
assertTrue(checkIfInfoTextLoggedByHandler(handler, "https://google.com = 200 - OK"));
// nonexistent link in field that should not be ignored => expect 404
Expand Down
Loading