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

[CST-5673] request to update group/eperson must be in PUT

Browse Source
This commit is contained in:
Mykhaylo
2022-05-17 09:28:35 +02:00
parent 2813bb1eb1
commit d43d3e2ee7
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
View File

@@ -10,7 +10,7 @@ package org.dspace.app.rest;
import static org.dspace.app.rest.utils.ContextUtil.obtainContext;
import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT;
import static org.dspace.core.Constants.EPERSON;
import static org.springframework.web.bind.annotation.RequestMethod.POST;
import static org.springframework.web.bind.annotation.RequestMethod.PUT;
import java.sql.SQLException;
import java.util.List;
@@ -53,7 +53,7 @@ public class ResourcePolicyEPersonReplaceRestController {
private ResourcePolicyService resourcePolicyService;
@PreAuthorize("hasPermission(#id, 'resourcepolicy', 'ADMIN')")
@RequestMapping(method = POST, consumes = {"text/uri-list"})
@RequestMapping(method = PUT, consumes = {"text/uri-list"})
public ResponseEntity<RepresentationModel<?>> replaceEPersonOfResourcePolicy(@PathVariable Integer id,
HttpServletResponse response, HttpServletRequest request) throws SQLException, AuthorizeException {

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
View File

@@ -10,7 +10,7 @@ package org.dspace.app.rest;
import static org.dspace.app.rest.utils.ContextUtil.obtainContext;
import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT;
import static org.dspace.core.Constants.GROUP;
import static org.springframework.web.bind.annotation.RequestMethod.POST;
import static org.springframework.web.bind.annotation.RequestMethod.PUT;
import java.sql.SQLException;
import java.util.List;
@@ -53,7 +53,7 @@ public class ResourcePolicyGroupReplaceRestController {
private ResourcePolicyService resourcePolicyService;
@PreAuthorize("hasPermission(#id, 'resourcepolicy', 'ADMIN')")
@RequestMapping(method = POST, consumes = {"text/uri-list"})
@RequestMapping(method = PUT, consumes = {"text/uri-list"})
public ResponseEntity<RepresentationModel<?>> replaceGroupOfResourcePolicy(@PathVariable Integer id,
HttpServletResponse response, HttpServletRequest request) throws SQLException, AuthorizeException {

21
dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
View File

@@ -17,6 +17,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
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.request.MockMvcRequestBuilders.put;
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;
@@ -2762,7 +2763,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
.andExpect(jsonPath("$._embedded.group", nullValue()));
// update eperson of the resourcePolicy
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/eperson")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/eperson")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/epersons/" + newEPerson.getID()))
.andExpect(status().isNoContent());
@@ -2812,7 +2813,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
.andExpect(jsonPath("$._embedded.eperson", nullValue()));
// update group of the resourcePolicy
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/group")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicy.getID() + "/group")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/groups/" + newGroup.getID()))
.andExpect(status().isNoContent());
@@ -2852,7 +2853,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
+ resourcePolicyOfEPerson.getID())));
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicyOfEPerson.getID() + "/group")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfEPerson.getID() + "/group")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/groups/" + group.getID()))
.andExpect(status().isUnprocessableEntity());
@@ -2888,7 +2889,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
"api/authz/resourcepolicies/search/group")))
.andExpect(jsonPath("$.page.totalElements", is(1)));
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/eperson")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/eperson")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/epersons/" + eperson.getID()))
.andExpect(status().isUnprocessableEntity());
@@ -2897,7 +2898,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
@Test
public void updateEPersonOfNotExistingResourcePolicyTest() throws Exception {
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/eperson")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/eperson")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/epersons/" + eperson.getID()))
.andExpect(status().isNotFound());
@@ -2914,7 +2915,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
context.restoreAuthSystemState();
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/group")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + Integer.MAX_VALUE + "/group")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/groups/" + group.getID()))
.andExpect(status().isNotFound());
@@ -2940,7 +2941,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
context.restoreAuthSystemState();
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content(StringUtils.EMPTY))
.andExpect(status().isUnprocessableEntity());
@@ -2964,7 +2965,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
context.restoreAuthSystemState();
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + resourcePolicyOfGroup.getID() + "/group")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/groups/" + group1.getID() +
"\n/api/eperson/groups/" + group2.getID()))
@@ -2985,7 +2986,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
context.restoreAuthSystemState();
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content(StringUtils.EMPTY))
.andExpect(status().isUnprocessableEntity());
@@ -3014,7 +3015,7 @@ public class ResourcePolicyRestRepositoryIT extends AbstractControllerIntegratio
context.restoreAuthSystemState();
String tokenAdmin = getAuthToken(admin.getEmail(), password);
getClient(tokenAdmin).perform(post("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
getClient(tokenAdmin).perform(put("/api/authz/resourcepolicies/" + rpOfEPerson.getID() + "/eperson")
.contentType(parseMediaType(TEXT_URI_LIST_VALUE))
.content("/api/eperson/epersons/" + eperson1.getID() +
"\n/api/eperson/epersons/" + eperson2.getID()))