Skip to content
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

[SELC-4835] Fix: Added productRole param in suspend, activate and delete user product #433

Merged
merged 1 commit into from
May 10, 2024
Merged

[SELC-4835] Fix: Added productRole param in suspend, activate and delete user product #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/api/UserApiConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public interface UserApiConnector {

User searchByFiscalCode(String fiscalCode, String institutionId);

void suspendUserProduct(String userId, String institutionId, String productId);
void suspendUserProduct(String userId, String institutionId, String productId, String productRole);

void activateUserProduct(String userId, String institutionId, String productId);
void activateUserProduct(String userId, String institutionId, String productId, String productRole);

void deleteUserProduct(String userId, String institutionId, String productId);
void deleteUserProduct(String userId, String institutionId, String productId, String productRole);

UserInstitution getProducts(String institutionId, String userId);

Expand Down
7 changes: 7 additions & 0 deletions connector/rest/docs/openapi/selfcare-user-docs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,13 @@
"schema" : {
"type" : "string"
}
},{
"name" : "productRole",
"in" : "query",
"required" : false,
"schema" : {
"type" : "string"
}
}, {
"name" : "status",
"in" : "query",
Expand Down
12 changes: 6 additions & 6 deletions ...tor/rest/src/main/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,26 +115,26 @@ public User searchByFiscalCode(String fiscalCode, String institutionId) {
}

@Override
public void suspendUserProduct(String userId, String institutionId, String productId) {
public void suspendUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("suspend start");
log.debug("suspend userId = {}, institutionId = {}", userId, institutionId);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.SUSPENDED);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.SUSPENDED, productRole);
log.trace("suspend end");
}

@Override
public void activateUserProduct(String userId, String institutionId, String productId) {
public void activateUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("activate start");
log.debug("activate userId = {}, institutionId = {}", userId, institutionId);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.ACTIVE);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.ACTIVE, productRole);
log.trace("activate end");
}

@Override
public void deleteUserProduct(String userId, String institutionId, String productId) {
public void deleteUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("delete start");
log.debug("delete userId = {}, institutionId = {}", userId, institutionId);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.DELETED);
userApiRestClient._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.DELETED, productRole);
log.trace("delete end");
}

Expand Down
17 changes: 11 additions & 6 deletions ...rest/src/test/java/it/pagopa/selfcare/dashboard/connector/rest/UserConnectorImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ void suspend() {
String userId = "userId";
String institutionId = "id1";
String productId = "prod-pagopa";
String productRole = "admin";
// when
userConnector.suspendUserProduct(userId, institutionId, productId);
userConnector.suspendUserProduct(userId, institutionId, productId, productRole);
// then
verify(userApiRestClient, times(1))
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.SUSPENDED);
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.SUSPENDED, productRole);
verifyNoMoreInteractions(userApiRestClient);
}

Expand All @@ -140,11 +141,13 @@ void activate() {
String userId = "userId";
String institutionId = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
userConnector.activateUserProduct(userId, institutionId, productId);
userConnector.activateUserProduct(userId, institutionId, productId, productRole);
// then
verify(userApiRestClient, times(1))
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.ACTIVE);
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.ACTIVE, productRole);
verifyNoMoreInteractions(userApiRestClient);
}

Expand All @@ -155,11 +158,13 @@ void delete() {
String userId = "userId";
String institutionId = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
userConnector.deleteUserProduct(userId, institutionId, productId);
userConnector.deleteUserProduct(userId, institutionId, productId, productRole);
// then
verify(userApiRestClient, times(1))
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.DELETED);
._usersIdInstitutionInstitutionIdProductProductIdStatusPut(userId, institutionId, productId, OnboardedProductState.DELETED, productRole);
verifyNoMoreInteractions(userApiRestClient);
}

Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/it/pagopa/selfcare/dashboard/core/UserV2Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ public interface UserV2Service {

Collection<InstitutionBase> getInstitutions(String userId);

void deleteUserProduct(String userId, String institutionId, String productId);
void deleteUserProduct(String userId, String institutionId, String productId, String productRole);

void activateUserProduct(String userId, String institutionId, String productId);
void activateUserProduct(String userId, String institutionId, String productId, String productRole);

void suspendUserProduct(String userId, String institutionId, String productId);
void suspendUserProduct(String userId, String institutionId, String productId, String productRole);

User getUserById(String userId, String institutionId, List<String> fields);

Expand Down
16 changes: 8 additions & 8 deletions core/src/main/java/it/pagopa/selfcare/dashboard/core/UserV2ServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,28 @@ public Collection<InstitutionBase> getInstitutions(String userId) {
}

@Override
public void deleteUserProduct(String userId, String institutionId, String productId) {
public void deleteUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("delete start");
log.debug("delete userId = {} for institutionId = {} and product = {}", userId, institutionId, productId);
userApiConnector.deleteUserProduct(userId, institutionId, productId);
log.debug("delete userId = {} for institutionId = {}, productId = {} and productRole = {}", userId, institutionId, productId, productRole);
userApiConnector.deleteUserProduct(userId, institutionId, productId, productRole);
userGroupService.deleteMembersByUserId(userId, institutionId, productId);
log.trace("delete end");
}

@Override
public void activateUserProduct(String userId, String institutionId, String productId) {
public void activateUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("activate start");
log.debug("activate userId = {} for institutionId = {} and product = {}", userId, institutionId, productId);
userApiConnector.activateUserProduct(userId, institutionId, productId);
log.debug("activate userId = {} for institutionId = {}, productId = {} and productRole = {}", userId, institutionId, productId, productRole);
userApiConnector.activateUserProduct(userId, institutionId, productId, productRole);
log.trace("activate end");

}

@Override
public void suspendUserProduct(String userId, String institutionId, String productId) {
public void suspendUserProduct(String userId, String institutionId, String productId, String productRole) {
log.trace("suspend start");
log.debug("suspend userId = {} for institutionId = {} and product = {}", userId, institutionId, productId);
userApiConnector.suspendUserProduct(userId, institutionId, productId);
userApiConnector.suspendUserProduct(userId, institutionId, productId, productRole);
log.trace("suspend end");
}

Expand Down
18 changes: 12 additions & 6 deletions core/src/test/java/it/pagopa/selfcare/dashboard/core/UserV2ServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ void suspend() {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
userService.suspendUserProduct(userId, institutionid, productId);
userService.suspendUserProduct(userId, institutionid, productId, productRole);
Mockito.verify(userApiConnector, Mockito.times(1))
.suspendUserProduct(userId, institutionid, productId);
.suspendUserProduct(userId, institutionid, productId, productRole);
Mockito.verifyNoMoreInteractions(userApiConnector);
}

Expand All @@ -90,11 +92,13 @@ void activate() {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
userService.activateUserProduct(userId, institutionid, productId);
userService.activateUserProduct(userId, institutionid, productId, productRole);
// then
Mockito.verify(userApiConnector, Mockito.times(1))
.activateUserProduct(userId, institutionid, productId);
.activateUserProduct(userId, institutionid, productId, productRole);
Mockito.verifyNoMoreInteractions(userApiConnector);
}

Expand All @@ -104,11 +108,13 @@ void delete() {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

//when
userService.deleteUserProduct(userId, institutionid, productId);
userService.deleteUserProduct(userId, institutionid, productId, productRole);
//then
Mockito.verify(userApiConnector, Mockito.times(1))
.deleteUserProduct(userId, institutionid, productId);
.deleteUserProduct(userId, institutionid, productId, productRole);
Mockito.verify(userGroupService, Mockito.times(1))
.deleteMembersByUserId(userId, institutionid, productId);
Mockito.verifyNoMoreInteractions(userApiConnector, userGroupService);
Expand Down
21 changes: 12 additions & 9 deletions web/src/main/java/it/pagopa/selfcare/dashboard/web/controller/UserV2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ public void suspendRelationship(@ApiParam("${swagger.dashboard.user.model.id}")
@PathVariable("userId") String userId,
@ApiParam("${swagger.dashboard.support.model.institutionId}")
@RequestParam(value = "institutionId") String institutionId,
@RequestParam(value = "productId") String productId) {
@RequestParam(value = "productId") String productId,
@RequestParam(value = "productRole", required = false) String productRole) {

log.trace("suspendUser start");
log.debug("suspendUser {} for institution: {} and product: {}", userId, institutionId, productId);
userService.suspendUserProduct(userId, institutionId, productId);
log.debug("suspendUser {} for institution: {}, productId: {} and productRole: {}", userId, institutionId, productId, productRole);
userService.suspendUserProduct(userId, institutionId, productId, productRole);
log.trace("suspendUser end");

}
Expand All @@ -65,11 +66,12 @@ public void suspendRelationship(@ApiParam("${swagger.dashboard.user.model.id}")
public void activateRelationship(@ApiParam("${swagger.dashboard.user.model.id}")
@PathVariable("userId") String userId,
@RequestParam(value = "institutionId") String institutionId,
@RequestParam(value = "productId") String productId) {
@RequestParam(value = "productId") String productId,
@RequestParam(value = "productRole", required = false) String productRole) {

log.trace("activateUser start");
log.debug("activateUser {} for institution: {} and product: {}", userId, institutionId, productId);
userService.activateUserProduct(userId, institutionId, productId);
log.debug("activateUser {} for institution: {}, productId: {} and productRole: {}", userId, institutionId, productId, productRole);
userService.activateUserProduct(userId, institutionId, productId, productRole);
log.trace("activateUser end");

}
Expand All @@ -81,10 +83,11 @@ public void activateRelationship(@ApiParam("${swagger.dashboard.user.model.id}")
public void deleteRelationshipById(@ApiParam("${swagger.dashboard.user.model.id}")
@PathVariable("userId") String userId,
@RequestParam(value = "institutionId") String institutionId,
@RequestParam(value = "productId") String productId) {
@RequestParam(value = "productId") String productId,
@RequestParam(value = "productRole", required = false) String productRole) {
log.trace("deleteUser start");
log.debug("deleteUser {} for institution: {} and product: {}", userId, institutionId, productId);
userService.deleteUserProduct(userId, institutionId, productId);
log.debug("deleteUser {} for institution: {}, productId: {} and productRole: {}", userId, institutionId, productId, productRole);
userService.deleteUserProduct(userId, institutionId, productId, productRole);
log.trace("deleteUser end");
}

Expand Down
15 changes: 12 additions & 3 deletions web/src/test/java/it/pagopa/selfcare/dashboard/web/controller/UserV2ControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,22 @@ void suspendRelationship() throws Exception {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
MvcResult result = mvc.perform(MockMvcRequestBuilders
.post(BASE_URL + "/{userId}/suspend", userId)
.queryParam("institutionId", institutionid )
.queryParam("productId", productId)
.queryParam("productRole", productRole)
.contentType(MediaType.APPLICATION_JSON_VALUE)
.accept(MediaType.APPLICATION_JSON_VALUE))
.andExpect(MockMvcResultMatchers.status().isNoContent())
.andReturn();
// then
assertEquals(0, result.getResponse().getContentLength());
Mockito.verify(userServiceMock, Mockito.times(1))
.suspendUserProduct(userId, institutionid, productId);
.suspendUserProduct(userId, institutionid, productId, productRole);
Mockito.verifyNoMoreInteractions(userServiceMock);
}

Expand All @@ -106,19 +109,22 @@ void activateRelationship() throws Exception {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
MvcResult result = mvc.perform(MockMvcRequestBuilders
.post(BASE_URL + "/{userId}/activate", userId)
.queryParam("institutionId", institutionid )
.queryParam("productId", productId)
.queryParam("productRole", productRole)
.contentType(MediaType.APPLICATION_JSON_VALUE)
.accept(MediaType.APPLICATION_JSON_VALUE))
.andExpect(MockMvcResultMatchers.status().isNoContent())
.andReturn();
// then
assertEquals(0, result.getResponse().getContentLength());
Mockito.verify(userServiceMock, Mockito.times(1))
.activateUserProduct(userId, institutionid, productId);
.activateUserProduct(userId, institutionid, productId, productRole);
Mockito.verifyNoMoreInteractions(userServiceMock);
}

Expand All @@ -128,19 +134,22 @@ void deleteRelationship() throws Exception {
String userId = "rel1";
String institutionid = "id1";
String productId = "prod-pagopa";
String productRole = "admin";

// when
MvcResult result = mvc.perform(MockMvcRequestBuilders
.delete(BASE_URL + "/{userId}", userId)
.queryParam("institutionId", institutionid )
.queryParam("productId", productId)
.queryParam("productRole", productRole)
.contentType(MediaType.APPLICATION_JSON_VALUE)
.accept(MediaType.APPLICATION_JSON_VALUE))
.andExpect(MockMvcResultMatchers.status().isNoContent())
.andReturn();
// then
assertEquals(0, result.getResponse().getContentLength());
Mockito.verify(userServiceMock, Mockito.times(1))
.deleteUserProduct(userId, institutionid, productId);
.deleteUserProduct(userId, institutionid, productId, productRole);
Mockito.verifyNoMoreInteractions(userServiceMock);
}

Expand Down
Loading