[P4ADEV-2179] added payer mapping

pagopa · Feb 14, 2025 · b353ae0 · b353ae0
1 parent 46ae306
commit b353ae0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/ReceiptDetailPIIViewMapper.java b/src/main/java/it/gov/pagopa/pu/debtpositions/mapper/ReceiptDetailPIIViewMapper.java
@@ -31,7 +31,8 @@ public ReceiptDetailDTO mapToReceiptDetailDTO(ReceiptDetailNoPIIView receiptDeta
       .pspCompanyName(receiptDetailNoPIIView.getPspCompanyName())
       .iud(receiptDetailNoPIIView.getIud())
       .iur(receiptDetailNoPIIView.getIur())
-      .debtor(personMapper.mapToDto(pii.getDebtor()))
+      .debtor(pii.getDebtor()!=null?personMapper.mapToDto(pii.getDebtor()):null)
+      .payer(pii.getPayer()!=null?personMapper.mapToDto(pii.getPayer()):null)
       .build();
   }
 }
diff --git a/src/test/java/it/gov/pagopa/pu/debtpositions/mapper/ReceiptDetailPIIViewMapperTest.java b/src/test/java/it/gov/pagopa/pu/debtpositions/mapper/ReceiptDetailPIIViewMapperTest.java
@@ -42,9 +42,27 @@ void givenValidReceiptNoPIIWhenMapToReceiptDTOThenReturnReceiptDTO() {
     Assertions.assertNotNull(response);
     TestUtils.reflectionEqualsByName(receiptDetailNoPIIView, response, "debtor", "payer");
     TestUtils.reflectionEqualsByName(receiptPIIDTO.getDebtor(), response.getDebtor());
-    TestUtils.checkNotNullFields(response,"payer");
+    TestUtils.reflectionEqualsByName(receiptPIIDTO.getPayer(), response.getPayer());
+    TestUtils.checkNotNullFields(response);
     Mockito.verify(personalDataServiceMock).get(receiptDetailNoPIIView.getDebtorPersonalDataId(),ReceiptPIIDTO.class);
     Mockito.verify(personMapperSpy).mapToDto(receiptPIIDTO.getDebtor());
+    Mockito.verify(personMapperSpy).mapToDto(receiptPIIDTO.getPayer());
   }
 
+  @Test
+  void givenNoPayerAndDebtorWhenMapToReceiptDTOThenReturnReceiptDTOWithNoPayerAndDebtor() {
+    //given
+    ReceiptDetailNoPIIView receiptDetailNoPIIView = podamFactory.manufacturePojo(ReceiptDetailNoPIIView.class);
+    ReceiptPIIDTO receiptPIIDTO = new ReceiptPIIDTO();
+    Mockito.when(personalDataServiceMock.get(receiptDetailNoPIIView.getDebtorPersonalDataId(),ReceiptPIIDTO.class)).thenReturn(receiptPIIDTO);
+    //when
+    ReceiptDetailDTO response = receiptDetailPIIViewMapper.mapToReceiptDetailDTO(receiptDetailNoPIIView);
+
+    //verify
+    Assertions.assertNotNull(response);
+    TestUtils.reflectionEqualsByName(receiptDetailNoPIIView, response, "debtor", "payer");
+    TestUtils.checkNotNullFields(response, "payer", "debtor");
+    Mockito.verify(personalDataServiceMock).get(receiptDetailNoPIIView.getDebtorPersonalDataId(),ReceiptPIIDTO.class);
+    Mockito.verifyNoInteractions(personMapperSpy);
+  }
 }