Skip to content

Commit

Permalink
Refactor method parent description for AOO/UO
Browse files Browse the repository at this point in the history
  • Loading branch information
pierpaolo.didato@emeal.nttdata.com authored and pierpaolo.didato@emeal.nttdata.com committed Sep 3, 2024
1 parent 7de341e commit 140d2e4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 26 deletions.
49 changes: 23 additions & 26 deletions ...ding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceDefault.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ private Uni<OnboardingResponse> fillUsersAndOnboarding(Onboarding onboarding, Li
.replaceWith(product))
.onItem().transformToUni(product -> getRegistryResource(onboarding)
.onItem().transformToUni(proxyResource -> onboardingUtils.customValidationOnboardingData(onboarding, product, proxyResource)
.onItem().transformToUni(ignored -> setIstatCode(onboarding, proxyResource)))
.onItem().transformToUni(ignored -> setIstatCode(onboarding, proxyResource)
.onItem().transformToUni(innerOnboarding -> addParentDescriptionForAooOrUo(onboarding, proxyResource))))
/* if product has some test environments, request must also onboard them (for ex. prod-interop-coll) */
.onItem().invoke(() -> onboarding.setTestEnvProductIds(product.getTestEnvProductIds())).onItem().invoke(() -> onboarding.setTestEnvProductIds(product.getTestEnvProductIds()))
.onItem().transformToUni(this::addParentDescriptionForAooOrUo)
.onItem().transformToUni(current -> persistOnboarding(onboarding, userRequests, product))
/* Update onboarding data with users and start orchestration */
.onItem().transformToUni(currentOnboarding -> persistAndStartOrchestrationOnboarding(currentOnboarding,
Expand Down Expand Up @@ -249,10 +249,10 @@ private Uni<OnboardingResponse> fillUsersAndOnboarding(Onboarding onboarding, Li
.replaceWith(product))
.onItem().transformToUni(product -> getRegistryResource(onboarding)
.onItem().transformToUni(proxyResource -> onboardingUtils.customValidationOnboardingData(onboarding, product, proxyResource)
.onItem().transformToUni(ignored -> setIstatCode(onboarding, proxyResource)))
.onItem().transformToUni(ignored -> setIstatCode(onboarding, proxyResource)
.onItem().transformToUni(innerOnboarding -> addParentDescriptionForAooOrUo(onboarding, proxyResource))))
/* if product has some test environments, request must also onboard them (for ex. prod-interop-coll) */
.onItem().invoke(() -> onboarding.setTestEnvProductIds(product.getTestEnvProductIds()))
.onItem().transformToUni(this::addParentDescriptionForAooOrUo)
.onItem().transformToUni(this::setInstitutionTypeAndBillingData)
.onItem().transformToUni(current -> persistOnboarding(onboarding, userRequests, product))
.onItem().call(onboardingPersisted -> Panache.withTransaction(() -> Token.persist(getToken(onboardingPersisted, product, contractImported))))
Expand Down Expand Up @@ -301,18 +301,20 @@ private Uni<Onboarding> persistOnboarding(Onboarding onboarding, List<UserReques
.onItem().invoke(onboardingPersisted::setUsers).replaceWith(onboardingPersisted)));
}

private Uni<Onboarding> addParentDescriptionForAooOrUo(Onboarding onboarding) {
private Uni<Onboarding> addParentDescriptionForAooOrUo(Onboarding onboarding, OnboardingUtils.ProxyResource proxyResource) {

Log.infof("Adding parent description AOO/UOO for: taxCode %s, subunitCode %s, type %s",
onboarding.getInstitution().getTaxCode(),
onboarding.getInstitution().getSubunitCode(),
onboarding.getInstitution().getInstitutionType());

if (InstitutionType.PA == onboarding.getInstitution().getInstitutionType()) {
if (InstitutionPaSubunitType.AOO == onboarding.getInstitution().getSubunitType()) {
return addParentDescriptionForAOO(onboarding);
} else if (InstitutionPaSubunitType.UO == onboarding.getInstitution().getSubunitType()) {
return addParentDescriptionForUO(onboarding);
if (AOO == proxyResource.getType()) {
AOOResource resource = (AOOResource) proxyResource.getResource();
return addParentDescriptionForAOO(onboarding, resource);
} else if (UO == onboarding.getInstitution().getSubunitType()) {
UOResource resource = (UOResource) proxyResource.getResource();
return addParentDescriptionForUO(onboarding, resource);
}
}
return Uni.createFrom().item(onboarding);
Expand All @@ -334,25 +336,20 @@ private Uni<Onboarding> setIstatCode(Onboarding onboarding, OnboardingUtils.Prox
};
}

private Uni<Onboarding> addParentDescriptionForUO(Onboarding onboarding) {
return uoApi.findByUnicodeUsingGET1(onboarding.getInstitution().getSubunitCode(), null)
.onItem().invoke(uoResource -> LOG.infof("Founded parent %s for UO institution with subunitCode %s", uoResource.getDenominazioneEnte(), onboarding.getInstitution().getSubunitCode()))
.onItem().invoke(uoResource -> onboarding.getInstitution().setParentDescription(uoResource.getDenominazioneEnte()))
.onFailure(WebApplicationException.class).recoverWithUni(ex -> ((WebApplicationException) ex).getResponse().getStatus() == 404
? Uni.createFrom().failure(new ResourceNotFoundException(String.format(UO_NOT_FOUND.getMessage(), onboarding.getInstitution().getSubunitCode())))
: Uni.createFrom().failure(ex))
.replaceWith(onboarding);

private Uni<Onboarding> addParentDescriptionForUO(Onboarding onboarding, UOResource uoResource) {
LOG.infof("Founded parent %s for UO institution with subunitCode %s", uoResource.getDenominazioneEnte(), onboarding.getInstitution().getSubunitCode());
return Uni.createFrom().item(() -> {
onboarding.getInstitution().setParentDescription(uoResource.getDenominazioneEnte());
return onboarding;
});
}

private Uni<Onboarding> addParentDescriptionForAOO(Onboarding onboarding) {
return aooApi.findByUnicodeUsingGET(onboarding.getInstitution().getSubunitCode(), null)
.onItem().invoke(aooResource -> LOG.infof("Founded parent %s for AOO institution with subunitCode %s", aooResource.getDenominazioneEnte(), onboarding.getInstitution().getSubunitCode()))
.onItem().invoke(aooResource -> onboarding.getInstitution().setParentDescription(aooResource.getDenominazioneEnte()))
.onFailure(WebApplicationException.class).recoverWithUni(ex -> ((WebApplicationException) ex).getResponse().getStatus() == 404
? Uni.createFrom().failure(new ResourceNotFoundException(String.format(AOO_NOT_FOUND.getMessage(), onboarding.getInstitution().getSubunitCode())))
: Uni.createFrom().failure(ex))
.replaceWith(onboarding);
private Uni<Onboarding> addParentDescriptionForAOO(Onboarding onboarding, AOOResource aooResource) {
LOG.infof("Founded parent %s for AOO institution with subunitCode %s", aooResource.getDenominazioneEnte(), onboarding.getInstitution().getSubunitCode());
return Uni.createFrom().item(() -> {
onboarding.getInstitution().setParentDescription(aooResource.getDenominazioneEnte());
return onboarding;
});
}

private Uni<Onboarding> addReferencedOnboardingId(Onboarding onboarding) {
Expand Down
2 changes: 2 additions & 0 deletions ...boarding-ms/src/main/java/it/pagopa/selfcare/onboarding/service/util/OnboardingUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import jakarta.inject.Inject;
import jakarta.ws.rs.WebApplicationException;
import lombok.Builder;
import lombok.Data;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.openapi.quarkus.party_registry_proxy_json.api.AooApi;
import org.openapi.quarkus.party_registry_proxy_json.api.UoApi;
Expand Down Expand Up @@ -169,6 +170,7 @@ private boolean isInvoiceablePA(Onboarding onboarding) {
&& Objects.nonNull(onboarding.getBilling().getRecipientCode());
}

@Data
@Builder
public static class ProxyResource<T> {
private InstitutionPaSubunitType type;
Expand Down

0 comments on commit 140d2e4

Please sign in to comment.