mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 01:54:22 +00:00
68820: Moving relationships in workspace items ITs
This commit is contained in:
Kristof De Langhe
@@ -0,0 +1,292 @@
|
|||||||
|
package org.dspace.app.rest;
|
||||||
|
|
||||||
|
import static org.hamcrest.CoreMatchers.equalTo;
|
||||||
|
import static org.hamcrest.CoreMatchers.not;
|
||||||
|
import static org.hamcrest.CoreMatchers.startsWith;
|
||||||
|
import static org.junit.Assert.assertThat;
|
||||||
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
|
||||||
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.dspace.app.rest.builder.CollectionBuilder;
|
||||||
|
import org.dspace.app.rest.builder.CommunityBuilder;
|
||||||
|
import org.dspace.app.rest.builder.ItemBuilder;
|
||||||
|
import org.dspace.app.rest.builder.WorkspaceItemBuilder;
|
||||||
|
import org.dspace.app.rest.matcher.MetadataMatcher;
|
||||||
|
import org.dspace.app.rest.model.patch.MoveOperation;
|
||||||
|
import org.dspace.app.rest.model.patch.Operation;
|
||||||
|
import org.dspace.app.rest.test.AbstractEntityIntegrationTest;
|
||||||
|
import org.dspace.content.Collection;
|
||||||
|
import org.dspace.content.Community;
|
||||||
|
import org.dspace.content.Item;
|
||||||
|
import org.dspace.content.MetadataValue;
|
||||||
|
import org.dspace.content.RelationshipType;
|
||||||
|
import org.dspace.content.WorkspaceItem;
|
||||||
|
import org.dspace.content.service.EntityTypeService;
|
||||||
|
import org.dspace.content.service.ItemService;
|
||||||
|
import org.dspace.content.service.RelationshipTypeService;
|
||||||
|
import org.dspace.content.service.WorkspaceItemService;
|
||||||
|
import org.hamcrest.Matchers;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.test.web.servlet.MvcResult;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by kristof on 20/02/2020
|
||||||
|
*/
|
||||||
|
public class PatchMetadataIT extends AbstractEntityIntegrationTest {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private RelationshipTypeService relationshipTypeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private EntityTypeService entityTypeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ItemService itemService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private WorkspaceItemService workspaceItemService;
|
||||||
|
|
||||||
|
private Collection collection;
|
||||||
|
private WorkspaceItem publicationItem;
|
||||||
|
private Item personItem1;
|
||||||
|
private Item personItem2;
|
||||||
|
private RelationshipType publicationPersonRelationshipType;
|
||||||
|
|
||||||
|
private List<String> authorsOriginalOrder;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
@Override
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
super.setUp();
|
||||||
|
context.turnOffAuthorisationSystem();
|
||||||
|
|
||||||
|
Community community = CommunityBuilder.createCommunity(context)
|
||||||
|
.withName("Parent community")
|
||||||
|
.build();
|
||||||
|
collection = CollectionBuilder.createCollection(context, community)
|
||||||
|
.withName("Collection")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
context.restoreAuthSystemState();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initPersonPublicationWorkspace() throws Exception {
|
||||||
|
// Setup the original order of authors
|
||||||
|
authorsOriginalOrder = new ArrayList<>();
|
||||||
|
authorsOriginalOrder.add("Whyte, William");
|
||||||
|
// Second one will be virtual metadata
|
||||||
|
authorsOriginalOrder.add("Dahlen, Sarah");
|
||||||
|
authorsOriginalOrder.add("Peterson, Karrie");
|
||||||
|
authorsOriginalOrder.add("Perotti, Enrico");
|
||||||
|
// 5th one will be virtual metadata
|
||||||
|
authorsOriginalOrder.add("Linton, Oliver");
|
||||||
|
|
||||||
|
context.turnOffAuthorisationSystem();
|
||||||
|
|
||||||
|
personItem1 = ItemBuilder.createItem(context, collection)
|
||||||
|
.withTitle("Person 1")
|
||||||
|
.withPersonIdentifierFirstName("Sarah")
|
||||||
|
.withPersonIdentifierLastName("Dahlen")
|
||||||
|
.withRelationshipType("Person")
|
||||||
|
.build();
|
||||||
|
personItem2 = ItemBuilder.createItem(context, collection)
|
||||||
|
.withTitle("Person 2")
|
||||||
|
.withPersonIdentifierFirstName("Oliver")
|
||||||
|
.withPersonIdentifierLastName("Linton")
|
||||||
|
.withRelationshipType("Person")
|
||||||
|
.build();
|
||||||
|
publicationItem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
|
||||||
|
.withTitle("Publication 1")
|
||||||
|
.withRelationshipType("Publication")
|
||||||
|
.build();
|
||||||
|
publicationPersonRelationshipType = relationshipTypeService.findbyTypesAndTypeName(context,
|
||||||
|
entityTypeService.findByEntityType(context, "Publication"),
|
||||||
|
entityTypeService.findByEntityType(context, "Person"),
|
||||||
|
"isAuthorOfPublication",
|
||||||
|
"isPublicationOfAuthor");
|
||||||
|
|
||||||
|
String adminToken = getAuthToken(admin.getEmail(), password);
|
||||||
|
|
||||||
|
// Make sure we grab the latest instance of the Item from the database before adding a regular author
|
||||||
|
WorkspaceItem publication = workspaceItemService.find(context, publicationItem.getID());
|
||||||
|
itemService.addMetadata(context, publication.getItem(),
|
||||||
|
"dc", "contributor", "author", Item.ANY, authorsOriginalOrder.get(0));
|
||||||
|
workspaceItemService.update(context, publication);
|
||||||
|
|
||||||
|
context.restoreAuthSystemState();
|
||||||
|
|
||||||
|
// Create a relationship between publication and person 1
|
||||||
|
MvcResult mvcResult = getClient(adminToken).perform(post("/api/core/relationships")
|
||||||
|
.param("relationshipType", publicationPersonRelationshipType.getID().toString())
|
||||||
|
.contentType(MediaType.parseMediaType
|
||||||
|
(org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE))
|
||||||
|
.content("https://localhost:8080/server/api/core/items/" + publicationItem.getItem().getID() + "\n" +
|
||||||
|
"https://localhost:8080/server/api/core/items/" + personItem1.getID()))
|
||||||
|
.andExpect(status().isCreated())
|
||||||
|
.andReturn();
|
||||||
|
|
||||||
|
context.turnOffAuthorisationSystem();
|
||||||
|
|
||||||
|
// Add two more regular authors
|
||||||
|
List<String> regularMetadata = new ArrayList<>();
|
||||||
|
publication = workspaceItemService.find(context, publicationItem.getID());
|
||||||
|
regularMetadata.add(authorsOriginalOrder.get(2));
|
||||||
|
regularMetadata.add(authorsOriginalOrder.get(3));
|
||||||
|
itemService.addMetadata(context, publication.getItem(),
|
||||||
|
"dc", "contributor", "author", null, regularMetadata);
|
||||||
|
workspaceItemService.update(context, publication);
|
||||||
|
|
||||||
|
context.restoreAuthSystemState();
|
||||||
|
|
||||||
|
// Create a relationship between publication and person 2
|
||||||
|
mvcResult = getClient(adminToken).perform(post("/api/core/relationships")
|
||||||
|
.param("relationshipType", publicationPersonRelationshipType.getID().toString())
|
||||||
|
.contentType(MediaType.parseMediaType
|
||||||
|
(org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE))
|
||||||
|
.content("https://localhost:8080/server/api/core/items/" + publicationItem.getItem().getID() + "\n" +
|
||||||
|
"https://localhost:8080/server/api/core/items/" + personItem2.getID()))
|
||||||
|
.andExpect(status().isCreated())
|
||||||
|
.andReturn();
|
||||||
|
|
||||||
|
publication = workspaceItemService.find(context, publicationItem.getID());
|
||||||
|
List<MetadataValue> publicationAuthorList =
|
||||||
|
itemService.getMetadata(publication.getItem(), "dc", "contributor", "author", Item.ANY);
|
||||||
|
assertThat(publicationAuthorList.size(), equalTo(5));
|
||||||
|
assertThat(publicationAuthorList.get(0).getValue(), equalTo(authorsOriginalOrder.get(0)));
|
||||||
|
assertThat(publicationAuthorList.get(0).getAuthority(), not(startsWith("virtual::")));
|
||||||
|
assertThat(publicationAuthorList.get(1).getValue(), equalTo(authorsOriginalOrder.get(1)));
|
||||||
|
assertThat(publicationAuthorList.get(1).getAuthority(), startsWith("virtual::"));
|
||||||
|
assertThat(publicationAuthorList.get(2).getValue(), equalTo(authorsOriginalOrder.get(2)));
|
||||||
|
assertThat(publicationAuthorList.get(2).getAuthority(), not(startsWith("virtual::")));
|
||||||
|
assertThat(publicationAuthorList.get(3).getValue(), equalTo(authorsOriginalOrder.get(3)));
|
||||||
|
assertThat(publicationAuthorList.get(3).getAuthority(), not(startsWith("virtual::")));
|
||||||
|
assertThat(publicationAuthorList.get(4).getValue(), equalTo(authorsOriginalOrder.get(4)));
|
||||||
|
assertThat(publicationAuthorList.get(4).getAuthority(), startsWith("virtual::"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorOneToZeroTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(1, 0, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorTwoToZeroTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(2, 0, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorThreeToZeroTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(3, 0, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorFourToZeroTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(4, 0, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorOneToThreeTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(1, 3, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void moveTraditionalPageOneAuthorOneToFourTest() throws Exception {
|
||||||
|
initPersonPublicationWorkspace();
|
||||||
|
|
||||||
|
List<String> expectedOrder = new ArrayList<>();
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(0));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(2));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(3));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(4));
|
||||||
|
expectedOrder.add(authorsOriginalOrder.get(1));
|
||||||
|
|
||||||
|
moveTraditionalPageOneAuthorTest(1, 4, expectedOrder);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void moveTraditionalPageOneAuthorTest(int from, int path, List<String> expectedOrder) throws Exception {
|
||||||
|
List<Operation> ops = new ArrayList<Operation>();
|
||||||
|
MoveOperation moveOperation = getTraditionalPageOneMoveAuthorOperation(from, path);
|
||||||
|
ops.add(moveOperation);
|
||||||
|
String patchBody = getPatchContent(ops);
|
||||||
|
|
||||||
|
String token = getAuthToken(admin.getEmail(), password);
|
||||||
|
|
||||||
|
getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationItem.getID())
|
||||||
|
.content(patchBody)
|
||||||
|
.contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
|
||||||
|
.andExpect(status().isOk());
|
||||||
|
|
||||||
|
String authorField = "dc.contributor.author";
|
||||||
|
getClient().perform(get("/api/submission/workspaceitems/" + publicationItem.getID()))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(content().contentType(contentType))
|
||||||
|
.andExpect(jsonPath("$.sections.traditionalpageone", Matchers.allOf(
|
||||||
|
Matchers.is(MetadataMatcher.matchMetadata(authorField, expectedOrder.get(0), 0)),
|
||||||
|
Matchers.is(MetadataMatcher.matchMetadata(authorField, expectedOrder.get(1), 1)),
|
||||||
|
Matchers.is(MetadataMatcher.matchMetadata(authorField, expectedOrder.get(2), 2)),
|
||||||
|
Matchers.is(MetadataMatcher.matchMetadata(authorField, expectedOrder.get(3), 3)),
|
||||||
|
Matchers.is(MetadataMatcher.matchMetadata(authorField, expectedOrder.get(4), 4))
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private MoveOperation getTraditionalPageOneMoveAuthorOperation(int from, int path) {
|
||||||
|
return new MoveOperation("/sections/traditionalpageone/dc.contributor.author/" + path,
|
||||||
|
"/sections/traditionalpageone/dc.contributor.author/" + from);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -144,6 +144,10 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
|
|||||||
return addMetadataValue(MetadataSchemaEnum.DC.getName(), "subject", null, subject);
|
return addMetadataValue(MetadataSchemaEnum.DC.getName(), "subject", null, subject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public WorkspaceItemBuilder withRelationshipType(final String relationshipType) {
|
||||||
|
return addMetadataValue("relationship", "type", null, relationshipType);
|
||||||
|
}
|
||||||
|
|
||||||
public WorkspaceItemBuilder grantLicense() {
|
public WorkspaceItemBuilder grantLicense() {
|
||||||
Item item = workspaceItem.getItem();
|
Item item = workspaceItem.getItem();
|
||||||
String license;
|
String license;
|
||||||
|
|||||||
Reference in New Issue
Block a user