Skip to content

Commit

Permalink
[SELC-6373] feat: add new PartyRole ADMIN_EA_IO (#689)
Browse files Browse the repository at this point in the history
  • Loading branch information
@giulia-tremolada
giulia-tremolada authored Feb 5, 2025
1 parent c7e568d commit 1f6cf8f
Show file tree
Hide file tree
Showing 21 changed files with 1,451 additions and 506 deletions.
3 changes: 2 additions & 1 deletion apps/onboarding-cdc/src/main/openapi/onboarding_functions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"DELEGATE",
"SUB_DELEGATE",
"OPERATOR",
"ADMIN_EA"
"ADMIN_EA",
"ADMIN_EA_IO"
],
"type": "string"
},
Expand Down
4 changes: 2 additions & 2 deletions ...nctions/src/main/java/it/pagopa/selfcare/onboarding/service/CompletionServiceDefault.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,10 @@ private InstitutionsResponse getInstitutions(Institution institution) {
InstitutionsResponse institutionsResponse;

if(StringUtils.isNotBlank(institution.getTaxCode())) {
institutionsResponse = institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), institution.getSubunitCode(), null, null);
institutionsResponse = institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), institution.getSubunitCode(), null, null, null);
} else {
String origin = Objects.nonNull(institution.getOrigin()) ? institution.getOrigin().getValue() : null;
institutionsResponse = institutionApi.getInstitutionsUsingGET(null, null, origin, institution.getOriginId());
institutionsResponse = institutionApi.getInstitutionsUsingGET(null, null, origin, institution.getOriginId(), null);
}
return institutionsResponse;
}
Expand Down
19 changes: 14 additions & 5 deletions apps/onboarding-functions/src/main/openapi/core.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,15 @@
"schema" : {
"type" : "string"
}
}, {
"name" : "productId",
"in" : "query",
"description" : "productId",
"required" : false,
"style" : "form",
"schema" : {
"type" : "string"
}
} ],
"responses" : {
"200" : {
Expand Down Expand Up @@ -2086,7 +2095,7 @@
"style" : "simple",
"schema" : {
"type" : "string",
"enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
"enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
}
} ],
"responses" : {
Expand Down Expand Up @@ -2964,7 +2973,7 @@
},
"institutionType" : {
"type" : "string",
"enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
"enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
},
"subunitCode" : {
"type" : "string"
Expand Down Expand Up @@ -3226,7 +3235,7 @@
},
"institutionType" : {
"type" : "string",
"enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
"enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
},
"onboarding" : {
"type" : "array",
Expand Down Expand Up @@ -3440,7 +3449,7 @@
},
"institutionType" : {
"type" : "string",
"enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
"enum" : [ "AS", "CON", "GPU", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
},
"ivassCode" : {
"type" : "string"
Expand Down Expand Up @@ -3817,7 +3826,7 @@
},
"role" : {
"type" : "string",
"enum" : [ "DELEGATE", "MANAGER", "OPERATOR", "SUB_DELEGATE" ]
"enum" : [ "ADMIN_EA", "ADMIN_EA_IO", "DELEGATE", "MANAGER", "OPERATOR", "SUB_DELEGATE" ]
},
"roleLabel" : {
"type" : "string"
Expand Down
32 changes: 17 additions & 15 deletions ...ons/src/test/java/it/pagopa/selfcare/onboarding/service/CompletionServiceDefaultTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
import org.openapi.quarkus.party_registry_proxy_json.api.InfocamereApi;
import org.openapi.quarkus.party_registry_proxy_json.api.NationalRegistriesApi;
import org.openapi.quarkus.party_registry_proxy_json.api.UoApi;
import org.openapi.quarkus.party_registry_proxy_json.model.*;
import org.openapi.quarkus.party_registry_proxy_json.model.AOOResource;
import org.openapi.quarkus.party_registry_proxy_json.model.InstitutionResource;
import org.openapi.quarkus.party_registry_proxy_json.model.UOResource;
import org.openapi.quarkus.user_registry_json.api.UserApi;
import org.openapi.quarkus.user_registry_json.model.UserResource;
import org.openapi.quarkus.user_registry_json.model.WorkContactResource;
Expand Down Expand Up @@ -122,7 +124,7 @@ void createInstitutionAndPersistInstitutionId_shouldThrowExceptionIfMoreInstitut
InstitutionsResponse response = new InstitutionsResponse();
response.setInstitutions(List.of(new InstitutionResponse(), new InstitutionResponse()));
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

assertThrows(GenericOnboardingException.class, () -> completionServiceDefault.createInstitutionAndPersistInstitutionId(onboarding));
Expand All @@ -137,7 +139,7 @@ void createInstitutionAndPersistInstitutionId_foundInstitution() {
institutionResponse.setId("actual-id");
response.setInstitutions(List.of(institutionResponse));
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

mockOnboardingUpdateAndExecuteCreateInstitution(onboarding);
Expand All @@ -156,7 +158,7 @@ void createOrRetrieveInstitutionSuccess() {
institutionResponse.setId("actual-id");
response.setInstitutions(List.of(institutionResponse));

when(institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), null, null, null))
when(institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), null, null, null, null))
.thenReturn(response);

InstitutionResponse serviceResponse = completionServiceDefault.createOrRetrieveInstitution(onboarding);
Expand All @@ -177,7 +179,7 @@ void createOrRetrieveInstitutionFailure() {
InstitutionResponse institutionResponse = new InstitutionResponse();
response.setInstitutions(List.of(institutionResponse, institutionResponse));

when(institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), null, null, null))
when(institutionApi.getInstitutionsUsingGET(institution.getTaxCode(), null, null, null, null))
.thenReturn(response);

assertThrows(GenericOnboardingException.class, () -> completionServiceDefault.createOrRetrieveInstitution(onboarding));
Expand Down Expand Up @@ -244,7 +246,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreateSaAnac

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand All @@ -265,7 +267,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreateAsIvas

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand All @@ -285,7 +287,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreateAsIvas
onboarding.setInstitution(institution);

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(null, null, Origin.IVASS.getValue(), "originId"))
when(institutionApi.getInstitutionsUsingGET(null, null, Origin.IVASS.getValue(), "originId", null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand All @@ -306,7 +308,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePgAde(

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand All @@ -332,7 +334,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePaAOO(

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand Down Expand Up @@ -368,7 +370,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePaUO()

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(), null, null))
onboarding.getInstitution().getSubunitCode(), null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand Down Expand Up @@ -402,7 +404,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreatePa() {

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
null, null, null))
null, null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand Down Expand Up @@ -434,7 +436,7 @@ void createInstitutionAndPersistInstitutionId_notFoundInstitutionAndCreate() {

InstitutionsResponse response = new InstitutionsResponse();
when(institutionApi.getInstitutionsUsingGET(onboarding.getInstitution().getTaxCode(),
null, null, null))
null, null, null, null))
.thenReturn(response);

InstitutionResponse institutionResponse = dummyInstitutionResponse();
Expand Down Expand Up @@ -871,7 +873,7 @@ void forceInstitutionCreationFlagTrue(){
InstitutionsResponse institutionsResponse = new InstitutionsResponse();
institutionsResponse.setInstitutions(List.of(dummyInstitutionResponse()));

when(institutionApi.getInstitutionsUsingGET(any(), any(), any(), any()))
when(institutionApi.getInstitutionsUsingGET(any(), any(), any(), any(), any()))
.thenReturn(institutionsResponse);

PanacheUpdate panacheUpdateMock = mock(PanacheUpdate.class);
Expand All @@ -882,7 +884,7 @@ void forceInstitutionCreationFlagTrue(){
completionServiceDefault.createInstitutionAndPersistInstitutionId(onboarding);

// then
verify(institutionApi, times(1)).getInstitutionsUsingGET(any(), any(), any(), any());
verify(institutionApi, times(1)).getInstitutionsUsingGET(any(), any(), any(), any(), any());
}

@Test
Expand Down
Loading

0 comments on commit 1f6cf8f

Please sign in to comment.