hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3191 from 4Science/CST-3961-CannotClaimPoolTasksCreatedBeforeYouWereAddedToAworkflowApprovalGroup

Browse Source 
Cannot claim PoolTasks created before you were added to a workflow approval group
This commit is contained in:
Tim Donohue
2021-03-23 08:59:56 -05:00
committed by GitHub
parent f4b5e9c26b 0c6c1adc99
commit e1478f6fdd
1 changed files with 165 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
View File

@@ -10,6 +10,10 @@ package org.dspace.app.rest;
import static com.jayway.jsonpath.JsonPath.read;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
import static org.springframework.http.MediaType.parseMediaType;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -47,6 +51,9 @@ import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.eperson.service.GroupService;
import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
import org.dspace.xmlworkflow.state.Step;
import org.dspace.xmlworkflow.state.actions.WorkflowActionConfig;
@@ -4165,4 +4172,162 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
Matchers.containsString("/api/workflow/claimedtasks/search/findByUser"))));
}
@Test
public void addReviewerToRunningWorkflowTest() throws Exception {
GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
context.turnOffAuthorisationSystem();
EPerson reviewer1 = EPersonBuilder.createEPerson(context)
.withEmail("reviewer1@example.com")
.withPassword(password).build();
EPerson reviewer2 = EPersonBuilder.createEPerson(context)
.withEmail("reviewer2@example.com")
.withPassword(password).build();
EPerson reviewerOther = EPersonBuilder.createEPerson(context)
.withEmail("reviewerOther@example.com")
.withPassword(password).build();
parentCommunity = CommunityBuilder.createCommunity(context)
.withName("Parent Community").build();
Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
.withName("Sub Community").build();
Collection col1 = CollectionBuilder.createCollection(context, child1)
.withName("Collection 1")
.withWorkflowGroup(1, reviewer1)
.withWorkflowGroup(2, reviewer2)
.build();
Group firstWorkflowGroup = col1.getWorkflowStep1(context);
// create a normal user to use as submitter
EPerson submitter = EPersonBuilder.createEPerson(context)
.withEmail("submitter@example.com")
.withPassword(password)
.build();
context.setCurrentUser(submitter);
// create a workflowitem (so a pool task in step1)
XmlWorkflowItem witem = WorkflowItemBuilder.createWorkflowItem(context, col1)
.withTitle("Test title")
.withIssueDate("2021-02-11")
.withSubject("ExtraEntry").build();
Item item = witem.getItem();
context.restoreAuthSystemState();
String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
String reviewer2Token = getAuthToken(reviewer2.getEmail(), password);
String reviewerOtherToken = getAuthToken(reviewerOther.getEmail(), password);
String adminToken = getAuthToken(admin.getEmail(), password);
AtomicReference<Integer> idRef = new AtomicReference<Integer>();
Step step = xmlWorkflowFactory.getStepByName("reviewstep");
// step 1
getClient(reviewer1Token).perform(get("/api/workflow/pooltasks/search/findByUser")
.param("uuid", reviewer1.getID().toString())
.param("projection", "full"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.pooltasks", Matchers.contains(
Matchers.allOf(
Matchers.is(PoolTaskMatcher.matchPoolTask(null, "reviewstep")),
hasJsonPath("$._embedded.step", WorkflowStepMatcher.matchWorkflowStepEntry(step)),
hasJsonPath("$._embedded.workflowitem",
Matchers.is(WorkflowItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(
witem, "Test title", "2021-02-11", "ExtraEntry")))
))))
.andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/workflow/pooltasks")))
.andExpect(jsonPath("$.page.size", is(20)))
.andExpect(jsonPath("$.page.totalElements", is(1)))
.andDo((result -> idRef
.set(read(result.getResponse().getContentAsString(), "$._embedded.pooltasks[0].id"))));
assertFalse(groupService.isMember(context, reviewerOther, firstWorkflowGroup));
getClient(adminToken).perform(post("/api/eperson/groups/" + firstWorkflowGroup.getID() + "/epersons")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content(REST_SERVER_URL + "eperson/groups/" + reviewerOther.getID()))
.andExpect(status().isNoContent());
assertTrue(groupService.isMember(context, reviewerOther, firstWorkflowGroup));
getClient(reviewerOtherToken).perform(get("/api/workflow/pooltasks/search/findByUser")
.param("uuid", reviewerOther.getID().toString())
.param("projection", "full"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.pooltasks",
Matchers.contains(Matchers.allOf(Matchers.is(PoolTaskMatcher.matchPoolTask(null, "reviewstep")),
hasJsonPath("$._embedded.step", WorkflowStepMatcher.matchWorkflowStepEntry(step)),
hasJsonPath("$._embedded.workflowitem",
Matchers.is(WorkflowItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(witem,
"Test title", "2021-02-11", "ExtraEntry")))))))
.andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/workflow/pooltasks")))
.andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)))
.andDo((result -> idRef
.set(read(result.getResponse().getContentAsString(), "$._embedded.pooltasks[0].id"))));
// claim the task
getClient(reviewerOtherToken).perform(post("/api/workflow/claimedtasks")
.contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
.content("/api/workflow/pooltasks/" + idRef.get()))
.andExpect(status().isCreated())
.andExpect(jsonPath("$", Matchers.allOf(hasJsonPath("$.type", is("claimedtask")))))
.andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
getClient(reviewerOtherToken).perform(get("/api/workflow/claimedtasks/search/findByUser")
.param("uuid", reviewerOther.getID().toString()))
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.claimedtasks[0]._embedded.workflowitem",
Matchers.is(WorkflowItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(
witem, "Test title", "2021-02-11", "ExtraEntry"))))
.andExpect(jsonPath("$.page.totalElements", is(1)));
WorkflowActionConfig workflowAction = xmlWorkflowFactory.getActionByName("reviewaction");
// approve the claimedTask, wf step 1
getClient(reviewerOtherToken).perform(post("/api/workflow/claimedtasks/" + idRef.get())
.param("submit_approve", "true")
.contentType(MediaType.APPLICATION_FORM_URLENCODED))
.andExpect(status().isNoContent());
step = xmlWorkflowFactory.getStepByName("editstep");
// step 2
getClient(reviewer2Token).perform(get("/api/workflow/pooltasks/search/findByUser")
.param("uuid", reviewer2.getID().toString()).param("projection", "full"))
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.pooltasks", Matchers.contains(
Matchers.allOf(
Matchers.is(PoolTaskMatcher.matchPoolTask(null, "editstep")),
hasJsonPath("$._embedded.step", WorkflowStepMatcher.matchWorkflowStepEntry(step)),
hasJsonPath("$._embedded.workflowitem",
Matchers.is(WorkflowItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(
witem, "Test title", "2021-02-11", "ExtraEntry")))
))))
.andExpect(jsonPath("$._links.self.href", Matchers.containsString("/api/workflow/pooltasks")))
.andExpect(jsonPath("$.page.size", is(20)))
.andExpect(jsonPath("$.page.totalElements", is(1)))
.andDo((result -> idRef
.set(read(result.getResponse().getContentAsString(), "$._embedded.pooltasks[0].id"))));
// claim the task
getClient(reviewer2Token).perform(post("/api/workflow/claimedtasks")
.contentType(MediaType.parseMediaType(RestMediaTypes.TEXT_URI_LIST_VALUE))
.content("/api/workflow/pooltasks/" + idRef.get()))
.andExpect(status().isCreated())
.andExpect(jsonPath("$", Matchers.allOf(hasJsonPath("$.type", is("claimedtask")))))
.andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
}
}