From 5e843425e2519d41c5e94594701e469065d9cb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Disar=C3=B2?= Date: Mon, 10 Feb 2025 11:09:17 +0100 Subject: [PATCH] fixed views update after profile update and some minor code clean --- .../it/gov/pagopa/cgn/portal/facade/ProfileFacade.java | 4 ++++ .../it/gov/pagopa/cgn/portal/service/DiscountService.java | 1 + .../it/gov/pagopa/cgn/portal/service/ProfileService.java | 7 ------- .../it/gov/pagopa/cgn/portal/IntegrationAbstractTest.java | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/gov/pagopa/cgn/portal/facade/ProfileFacade.java b/src/main/java/it/gov/pagopa/cgn/portal/facade/ProfileFacade.java index 39d2034f..9229ca90 100644 --- a/src/main/java/it/gov/pagopa/cgn/portal/facade/ProfileFacade.java +++ b/src/main/java/it/gov/pagopa/cgn/portal/facade/ProfileFacade.java @@ -70,6 +70,10 @@ public ResponseEntity updateProfile(String agreementId, UpdateProfile u "Hai cambiato la modalità di riconoscimento delle tue opportunità. Per riattivare l'opportunità, aggiorna i dati richiesti dalla nuova opportunità.")); } profileEntity = profileService.updateProfile(agreementId, profileEntity); + + // refresh views + discountService.refreshMaterializedViews(profileEntity); + return ResponseEntity.ok(profileConverter.toDto(profileEntity)); } } diff --git a/src/main/java/it/gov/pagopa/cgn/portal/service/DiscountService.java b/src/main/java/it/gov/pagopa/cgn/portal/service/DiscountService.java index 98aba299..c0903f9e 100644 --- a/src/main/java/it/gov/pagopa/cgn/portal/service/DiscountService.java +++ b/src/main/java/it/gov/pagopa/cgn/portal/service/DiscountService.java @@ -213,6 +213,7 @@ public CrudDiscountWrapper updateDiscount(String agreementId, Long discountId, D discountEntity.setAgreement(agreementEntity); discountRepository.save(dbEntity); + // refresh materialized views refreshMaterializedViews(profile); diff --git a/src/main/java/it/gov/pagopa/cgn/portal/service/ProfileService.java b/src/main/java/it/gov/pagopa/cgn/portal/service/ProfileService.java index ede04a52..addf197b 100644 --- a/src/main/java/it/gov/pagopa/cgn/portal/service/ProfileService.java +++ b/src/main/java/it/gov/pagopa/cgn/portal/service/ProfileService.java @@ -126,13 +126,6 @@ public ProfileEntity updateProfile(String agreementId, ProfileEntity newUpdatePr agreementServiceLight.setDraftAgreementFromRejected(agreementEntity); documentService.resetAllDocuments(agreementId); } - // fix for misalignments with addresses - if (!profileEntity.getSalesChannel().equals(SalesChannelEnum.ONLINE) && - profileEntity.getAddressList().isEmpty() && Boolean.FALSE.equals(profileEntity.getAllNationalAddresses())) { - profileEntity.setAllNationalAddresses(true); - } - - validateProfile(profileEntity); return profileEntity; } diff --git a/src/test/java/it/gov/pagopa/cgn/portal/IntegrationAbstractTest.java b/src/test/java/it/gov/pagopa/cgn/portal/IntegrationAbstractTest.java index 031052e3..b5c3f6c6 100644 --- a/src/test/java/it/gov/pagopa/cgn/portal/IntegrationAbstractTest.java +++ b/src/test/java/it/gov/pagopa/cgn/portal/IntegrationAbstractTest.java @@ -344,6 +344,7 @@ protected static class Initializer // override timeout to 5 seconds .withEnv("GREENMAIL_OPTS", "-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.startup.timeout=5000"); + static JdbcDatabaseContainer postgres = new PostgisContainerProvider().newInstance("16-master") .withDatabaseName( "integration-tests-db")