fix naming payeeInstitution

pagopa · Apr 16, 2024 · 8ef4ddf · 8ef4ddf
1 parent 344d875
commit 8ef4ddf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptService.java b/src/main/java/it/gov/pagopa/wispconverter/service/ReceiptService.java
@@ -90,7 +90,7 @@ public void paaInviaRTKo(String payload) {
 
                     generatePaaInviaRTAndTrace(intestazionePPT, rt, objectFactory, stationDto, now);
 
-                    PaymentServiceProviderDto psp = psps.get(rpt.getRpt().getPayerInstitution().getSubjectUniqueIdentifier().getCode());
+                    PaymentServiceProviderDto psp = psps.get(rpt.getRpt().getPayeeInstitution().getSubjectUniqueIdentifier().getCode());
 
                     //generate and save re event internal for change status
                     ReEventDto reEventDto = generateReInternal(rptRequestEntity, rpt, receipt.getIdentificativoUnivocoVersamento(), receipt.getPaymentToken(), stationDto, psp);
@@ -139,7 +139,7 @@ public void paaInviaRTOk(String payload) {
 
                 generatePaaInviaRTAndTrace(intestazionePPT, rt, objectFactory, stationDto, now);
 
-                PaymentServiceProviderDto psp = psps.get(rpt.getRpt().getPayerInstitution().getSubjectUniqueIdentifier().getCode());
+                PaymentServiceProviderDto psp = psps.get(rpt.getRpt().getPayeeInstitution().getSubjectUniqueIdentifier().getCode());
 
                 //generate and save re event internal for change status
                 ReEventDto reEventDto = generateReInternal(rptRequestEntity,
@@ -170,7 +170,7 @@ private CtRicevutaTelematica generateCtRicevutaTelematica(RPTContentDTO rpt, Map
         rtMapper.toCtDominio(ctDominio, rpt.getRpt().getDomain());
 
         CtEnteBeneficiario ctEnteBeneficiario = objectFactory.createCtEnteBeneficiario();
-        rtMapper.toCtEnteBeneficiario(ctEnteBeneficiario, rpt.getRpt().getPayerInstitution());
+        rtMapper.toCtEnteBeneficiario(ctEnteBeneficiario, rpt.getRpt().getPayeeInstitution());
 
         CtSoggettoPagatore ctSoggettoPagatore = objectFactory.createCtSoggettoPagatore();
         rtMapper.toCtSoggettoPagatore(ctSoggettoPagatore, rpt.getRpt().getPayer());
@@ -200,7 +200,7 @@ private CtRicevutaTelematica generateCtRicevutaTelematica(RPTContentDTO rpt, PaS
         rtMapper.toCtDominio(ctDominio, rpt.getRpt().getDomain());
 
         CtEnteBeneficiario ctEnteBeneficiario = objectFactory.createCtEnteBeneficiario();
-        rtMapper.toCtEnteBeneficiario(ctEnteBeneficiario, rpt.getRpt().getPayerInstitution());
+        rtMapper.toCtEnteBeneficiario(ctEnteBeneficiario, rpt.getRpt().getPayeeInstitution());
 
         CtSoggettoPagatore ctSoggettoPagatore = objectFactory.createCtSoggettoPagatore();
         rtMapper.toCtSoggettoPagatore(ctSoggettoPagatore, paSendRTV2Request.getReceipt().getDebtor());

diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/mapper/RPTMapper.java b/src/main/java/it/gov/pagopa/wispconverter/service/mapper/RPTMapper.java
@@ -17,7 +17,7 @@ public interface RPTMapper {
     @Mapping(source = "autenticazioneSoggetto", target = "subjectAuthentication")
     @Mapping(source = "soggettoVersante", target = "debtor")
     @Mapping(source = "soggettoPagatore", target = "payer")
-    @Mapping(source = "enteBeneficiario", target = "payerInstitution")
+    @Mapping(source = "enteBeneficiario", target = "payeeInstitution")
     @Mapping(source = "datiVersamento", target = "transferData")
     PaymentRequestDTO toPaymentRequestDTO(CtRichiestaPagamentoTelematico rpt);
 
@@ -57,7 +57,7 @@ public interface RPTMapper {
     @Mapping(source = "localitaBeneficiario", target = "city")
     @Mapping(source = "provinciaBeneficiario", target = "province")
     @Mapping(source = "nazioneBeneficiario", target = "nation")
-    PaymentSubjectDTO toPaymentPayerInstitutionDTO(CtEnteBeneficiario enteBeneficiario);
+    PaymentSubjectDTO toPaymentPayeeInstitutionDTO(CtEnteBeneficiario enteBeneficiario);
 
     @Mapping(source = "tipoIdentificativoUnivoco", target = "type")
     @Mapping(source = "codiceIdentificativoUnivoco", target = "code")

diff --git a/src/main/java/it/gov/pagopa/wispconverter/service/mapper/RTMapper.java b/src/main/java/it/gov/pagopa/wispconverter/service/mapper/RTMapper.java
@@ -85,7 +85,7 @@ public void toCtIstitutoAttestante(@MappingTarget CtIstitutoAttestante ctIstitut
     @Mapping(source = "city", target = "localitaBeneficiario")
     @Mapping(source = "province", target = "provinciaBeneficiario")
     @Mapping(source = "nation", target = "nazioneBeneficiario")
-    public abstract void toCtEnteBeneficiario(@MappingTarget CtEnteBeneficiario ctEnteBeneficiario, PaymentSubjectDTO payerInstitution);
+    public abstract void toCtEnteBeneficiario(@MappingTarget CtEnteBeneficiario ctEnteBeneficiario, PaymentSubjectDTO payeeInstitution);
 
     @Mapping(source = "subjectUniqueIdentifier", target = "identificativoUnivocoPagatore")
     @Mapping(source = "name", target = "anagraficaPagatore")

diff --git a/...main/java/it/gov/pagopa/wispconverter/service/model/paymentrequest/PaymentRequestDTO.java b/...main/java/it/gov/pagopa/wispconverter/service/model/paymentrequest/PaymentRequestDTO.java
@@ -23,6 +23,6 @@ public class PaymentRequestDTO {
     private SubjectAuthentication subjectAuthentication;
     private PaymentSubjectDTO debtor; // versante
     private PaymentSubjectDTO payer; // pagatore
-    private PaymentSubjectDTO payerInstitution;
+    private PaymentSubjectDTO payeeInstitution;
     private TransferDataDTO transferData;
 }