From f8149bbeb2adc46ffad4b84f08934216a36e0e90 Mon Sep 17 00:00:00 2001 From: "aliaksei.bykau" Date: Mon, 9 Oct 2023 16:02:40 +0200 Subject: [PATCH 1/2] [DSC-1282] added addDepositLicense to CreateWorkspaceItemWithExternalSource#fillWorkspaceItems. Added new check for test CreateWorkspaceItemFromExternalServiceIT#creatingWorkspaceItemImportedFromScopusTest --- .../CreateWorkspaceItemWithExternalSource.java | 3 +++ .../app/rest/CreateWorkspaceItemFromExternalServiceIT.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java b/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java index 2872ee19d12..7f8cf9e0772 100644 --- a/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java +++ b/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java @@ -37,6 +37,7 @@ import org.dspace.content.MetadataValue; import org.dspace.content.WorkspaceItem; import org.dspace.content.dto.MetadataValueDTO; +import org.dspace.content.packager.PackageUtils; import org.dspace.core.Context; import org.dspace.discovery.DiscoverQuery; import org.dspace.discovery.DiscoverQuery.SORT_ORDER; @@ -287,6 +288,8 @@ private int fillWorkspaceItems(Context context, int record, LiveImportDataProvid if (!exist(dataObject.getMetadata())) { WorkspaceItem wsItem = externalDataService.createWorkspaceItemFromExternalDataObject(context, dataObject, this.collection); + Item itemFromWs = wsItem.getItem(); + PackageUtils.addDepositLicense(context, null, itemFromWs, wsItem.getCollection()); for (List metadataList : metadataValueToAdd(wsItem.getItem())) { addMetadata(wsItem.getItem(), metadataList); } diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java index 79253dcc6de..2750dc01193 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java @@ -12,6 +12,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; @@ -199,6 +200,8 @@ public void creatingWorkspaceItemImportedFromScopusTest() throws Exception { + ".traditionalpageone['dc.identifier.scopus'][0].value", is(scopus2R.getValue()))) .andExpect(jsonPath("$._embedded.workflowitems[1].sections" + ".traditionalpageone['dc.identifier.doi'][0].value", is(doi2R.getValue()))) + .andExpect(jsonPath("$._embedded.workflowitems[0].sections.license.url", + containsString("/api/core/bitstreams/"))) .andExpect(jsonPath("$.page.totalElements", is(2))); } From 1d485d1bf8025e630003bbc39508cbe379a2072d Mon Sep 17 00:00:00 2001 From: "aliaksei.bykau" Date: Fri, 13 Oct 2023 10:17:30 +0200 Subject: [PATCH 2/2] [DSC-1282] checkstyle fixes --- .../app/rest/CreateWorkspaceItemFromExternalServiceIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java index 2750dc01193..19100f72233 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java @@ -8,11 +8,11 @@ package org.dspace.app.rest; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify;