Skip to content

Commit

Permalink
fix: adjusting cache to starter v1.13.1 PAGOPA-1148
Browse files Browse the repository at this point in the history
  • Loading branch information
@FedericoRuzzier
FedericoRuzzier committed Aug 7, 2023
1 parent 23f077b commit bf4d93d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/it/gov/pagopa/apiconfig/cache/service/ConfigService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand All @@ -928,8 +929,9 @@ public List<PspInformation> getInformativePsp(
ctInformativaDetail.setListaConvenzioni(listaConvenzioni);
ctInformativaDetail.setIdentificativoIntermediario(
pspCanaleTipoVersamento
.getCanaleTipoVersamento()
.getCanale()
.getIntermediarioPsp()
.getFkIntermediarioPsp()
.getIdIntermediarioPsp());
ctInformativaDetail.setIdentificazioneServizio(
ctIdentificazioneServizio);
Expand All @@ -951,6 +953,7 @@ public List<PspInformation> getInformativePsp(
ctInformativaDetail.setTipoVersamento(
StTipoVersamento.fromValue(
pspCanaleTipoVersamento
.getCanaleTipoVersamento()
.getTipoVersamento()
.getTipoVersamento()));
return ctInformativaDetail;
Expand Down Expand Up @@ -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())));
Expand Down

0 comments on commit bf4d93d

Please sign in to comment.