From bf4d93d82b24fdcb3f5aef7a6db7a23bc89c569d Mon Sep 17 00:00:00 2001
From: FedericoRuzzier <49512050+FedericoRuzzier@users.noreply.github.com>
Date: Mon, 7 Aug 2023 12:47:34 +0200
Subject: [PATCH] fix: adjusting cache to starter v1.13.1 PAGOPA-1148

---
 pom.xml                                         |  2 +-
 .../apiconfig/cache/service/ConfigService.java  | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f77c5d0..8439c6e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <properties>
     <java.version>11</java.version>
     <spring-version>2.7.7</spring-version>
-    <starter.version>1.9.0</starter.version>
+    <starter.version>1.13.1</starter.version>
     <springdoc.version>1.6.11</springdoc.version>
     <postgresql.version>42.5.4</postgresql.version>
     <oracle.version>21.4.0.0</oracle.version>
diff --git a/src/main/java/it/gov/pagopa/apiconfig/cache/service/ConfigService.java b/src/main/java/it/gov/pagopa/apiconfig/cache/service/ConfigService.java
index c4761987..9056b2dd 100644
--- a/src/main/java/it/gov/pagopa/apiconfig/cache/service/ConfigService.java
+++ b/src/main/java/it/gov/pagopa/apiconfig/cache/service/ConfigService.java
@@ -78,7 +78,7 @@
 import it.gov.pagopa.apiconfig.starter.entity.InformativePaMaster;
 import it.gov.pagopa.apiconfig.starter.entity.Pa;
 import it.gov.pagopa.apiconfig.starter.entity.Psp;
-import it.gov.pagopa.apiconfig.starter.entity.PspCanaleTipoVersamentoCanale;
+import it.gov.pagopa.apiconfig.starter.entity.PspCanaleTipoVersamento;
 import it.gov.pagopa.apiconfig.starter.repository.CacheRepository;
 import it.gov.pagopa.apiconfig.starter.repository.CanaliViewRepository;
 import it.gov.pagopa.apiconfig.starter.repository.CdiDetailRepository;
@@ -814,12 +814,13 @@ public List<PspInformation> getInformativePsp(
                           .filter(
                               d ->
                                   !d.getPspCanaleTipoVersamento()
+                                      .getCanaleTipoVersamento()
                                       .getTipoVersamento()
                                       .getTipoVersamento()
                                       .equals("PPAY"))
                           .map(
                               cdiDetail -> {
-                                PspCanaleTipoVersamentoCanale pspCanaleTipoVersamento =
+                                PspCanaleTipoVersamento pspCanaleTipoVersamento =
                                     cdiDetail.getPspCanaleTipoVersamento();
 
                                 CtIdentificazioneServizio ctIdentificazioneServizio =
@@ -906,7 +907,7 @@ public List<PspInformation> getInformativePsp(
                                 ctInformativaDetail.setCanaleApp(
                                     cdiDetail.getCanaleApp().intValue());
                                 ctInformativaDetail.setIdentificativoCanale(
-                                    pspCanaleTipoVersamento.getCanale().getIdCanale());
+                                    pspCanaleTipoVersamento.getCanaleTipoVersamento().getCanale().getIdCanale());
 
                                 List<Double> costiConvenzione =
                                     cdiPreferenceStream
@@ -928,8 +929,9 @@ public List<PspInformation> getInformativePsp(
                                 ctInformativaDetail.setListaConvenzioni(listaConvenzioni);
                                 ctInformativaDetail.setIdentificativoIntermediario(
                                     pspCanaleTipoVersamento
+                                        .getCanaleTipoVersamento()
                                         .getCanale()
-                                        .getIntermediarioPsp()
+                                        .getFkIntermediarioPsp()
                                         .getIdIntermediarioPsp());
                                 ctInformativaDetail.setIdentificazioneServizio(
                                     ctIdentificazioneServizio);
@@ -951,6 +953,7 @@ public List<PspInformation> getInformativePsp(
                                 ctInformativaDetail.setTipoVersamento(
                                     StTipoVersamento.fromValue(
                                         pspCanaleTipoVersamento
+                                            .getCanaleTipoVersamento()
                                             .getTipoVersamento()
                                             .getTipoVersamento()));
                                 return ctInformativaDetail;
@@ -1049,12 +1052,14 @@ public List<PspInformation> getTemplateInformativePsp(List<CdiMasterValid> allMa
                               .getInformativaDetail()
                               .add(
                                   makeTplInformativaDetail(
-                                      d.getPspCanaleTipoVersamento().getCanale().getIdCanale(),
+                                      d.getPspCanaleTipoVersamento().getCanaleTipoVersamento().getCanale().getIdCanale(),
                                       d.getPspCanaleTipoVersamento()
+                                          .getCanaleTipoVersamento()
                                           .getCanale()
-                                          .getIntermediarioPsp()
+                                          .getFkIntermediarioPsp()
                                           .getIdIntermediarioPsp(),
                                       d.getPspCanaleTipoVersamento()
+                                          .getCanaleTipoVersamento()
                                           .getTipoVersamento()
                                           .getTipoVersamento(),
                                       d.getModelloPagamento())));