fix: P4ADEV-2044 add enum entity type person

openapi/p4pa-debt-position.openapi.yaml

@@ -486,6 +486,9 @@ components:
       properties:
         entityType:
           type: string
+          enum:
+            - F
+            - G
         fiscalCode:
           type: string
         fullName:

src/main/java/it/gov/pagopa/pu/debtpositions/dto/Person.java

@@ -1,5 +1,6 @@
 package it.gov.pagopa.pu.debtpositions.dto;
 
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,7 +12,7 @@
 @AllArgsConstructor
 public class Person {
 
-    private String entityType;
+    private PersonEntityType entityType;
     private String fiscalCode;
     private String fullName;
     private String address;

src/main/java/it/gov/pagopa/pu/debtpositions/enums/PersonEntityType.java

@@ -0,0 +1,6 @@
+package it.gov.pagopa.pu.debtpositions.enums;
+
+public enum PersonEntityType {
+  F,
+  G
+}

src/main/java/it/gov/pagopa/pu/debtpositions/mapper/InstallmentPIIMapper.java

@@ -43,7 +43,7 @@ public Pair<InstallmentNoPII, InstallmentPIIDTO> map(Installment installment) {
     installmentNoPII.setHumanFriendlyRemittanceInformation(installment.getHumanFriendlyRemittanceInformation());
     installmentNoPII.setBalance(installment.getBalance());
     installmentNoPII.setLegacyPaymentMetadata(installment.getLegacyPaymentMetadata());
-    installmentNoPII.setDebtorEntityType(installment.getDebtor().getEntityType().charAt(0));
+    installmentNoPII.setDebtorEntityType(installment.getDebtor().getEntityType());
     installmentNoPII.setDebtorFiscalCodeHash(dataCipherService.hash(installment.getDebtor().getFiscalCode()));
     installmentNoPII.setCreationDate(installment.getCreationDate());
     installmentNoPII.setUpdateDate(installment.getUpdateDate());

src/main/java/it/gov/pagopa/pu/debtpositions/mapper/PersonMapper.java

@@ -2,14 +2,15 @@
 
 import it.gov.pagopa.pu.debtpositions.dto.Person;
 import it.gov.pagopa.pu.debtpositions.dto.generated.PersonDTO;
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PersonMapper {
 
   public Person mapToModel(PersonDTO dto) {
     Person person = new Person();
-    person.setEntityType(dto.getEntityType());
+    person.setEntityType(PersonEntityType.valueOf(dto.getEntityType().getValue()));
     person.setFiscalCode(dto.getFiscalCode());
     person.setFullName(dto.getFullName());
     person.setAddress(dto.getAddress());

src/main/java/it/gov/pagopa/pu/debtpositions/model/InstallmentNoPII.java

@@ -1,6 +1,7 @@
 package it.gov.pagopa.pu.debtpositions.model;
 
 import it.gov.pagopa.pu.debtpositions.dto.generated.InstallmentStatus;
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 import jakarta.annotation.Nonnull;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -45,7 +46,8 @@ public class InstallmentNoPII extends BaseEntity implements Serializable, Compar
   private String balance;
   private String legacyPaymentMetadata;
   private Long personalDataId;
-  private Character debtorEntityType;
+  @Enumerated(EnumType.STRING)
+  private PersonEntityType debtorEntityType;
   private byte[] debtorFiscalCodeHash;
   @Embedded
   private InstallmentSyncStatus syncStatus;

src/main/java/it/gov/pagopa/pu/debtpositions/model/ReceiptNoPII.java

@@ -1,5 +1,6 @@
 package it.gov.pagopa.pu.debtpositions.model;
 
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -46,7 +47,8 @@ public class ReceiptNoPII extends BaseEntity implements Serializable {
   private OffsetDateTime applicationDate;
   private OffsetDateTime transferDate;
   private boolean standin;
-  private Character debtorEntityType;
+  @Enumerated(EnumType.STRING)
+  private PersonEntityType debtorEntityType;
   private Long personalDataId;
   private byte[] debtorFiscalCodeHash;
 }

src/test/java/it/gov/pagopa/pu/debtpositions/enums/PaymentOptionTypeEnumTest.java

@@ -11,6 +11,5 @@ void testConversion(){
     for (PaymentOptionType value : PaymentOptionType.values()) {
       Assertions.assertDoesNotThrow(() -> PaymentOptionDTO.PaymentOptionTypeEnum.valueOf(value.name()));
     }
-
   }
 }

src/test/java/it/gov/pagopa/pu/debtpositions/enums/PersonEntityTypeEnumTest.java

@@ -0,0 +1,15 @@
+package it.gov.pagopa.pu.debtpositions.enums;
+
+import it.gov.pagopa.pu.debtpositions.dto.generated.PersonDTO;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class PersonEntityTypeEnumTest {
+
+  @Test
+  void testConversion(){
+    for (PersonEntityType value : PersonEntityType.values()) {
+      Assertions.assertDoesNotThrow(() -> PersonDTO.EntityTypeEnum.valueOf(value.name()));
+    }
+  }
+}

src/test/java/it/gov/pagopa/pu/debtpositions/util/faker/InstallmentFaker.java

@@ -4,6 +4,7 @@
 import it.gov.pagopa.pu.debtpositions.dto.InstallmentPIIDTO;
 import it.gov.pagopa.pu.debtpositions.dto.generated.InstallmentDTO;
 import it.gov.pagopa.pu.debtpositions.dto.generated.InstallmentStatus;
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 import it.gov.pagopa.pu.debtpositions.model.InstallmentNoPII;
 import it.gov.pagopa.pu.debtpositions.model.InstallmentSyncStatus;
 
@@ -73,7 +74,7 @@ public static InstallmentNoPII buildInstallmentNoPII(){
       .remittanceInformation("remittanceInformation")
       .legacyPaymentMetadata("legacyPaymentMetadata")
       .humanFriendlyRemittanceInformation("humanFriendlyRemittanceInformation")
-      .debtorEntityType('F')
+      .debtorEntityType(PersonEntityType.F)
       .debtorFiscalCodeHash(new byte[] {})
       .balance("balance")
       .creationDate(date)

src/test/java/it/gov/pagopa/pu/debtpositions/util/faker/PersonFaker.java

@@ -2,12 +2,13 @@
 
 import it.gov.pagopa.pu.debtpositions.dto.Person;
 import it.gov.pagopa.pu.debtpositions.dto.generated.PersonDTO;
+import it.gov.pagopa.pu.debtpositions.enums.PersonEntityType;
 
 public class PersonFaker {
 
   public static Person buildPerson(){
     return Person.builder()
-      .entityType("F")
+      .entityType(PersonEntityType.F)
       .fiscalCode("uniqueIdentifierCode")
       .fullName("fullName")
       .address("address")
@@ -22,7 +23,7 @@ public static Person buildPerson(){
 
   public static PersonDTO buildPersonDTO(){
     return PersonDTO.builder()
-      .entityType("F")
+      .entityType(PersonDTO.EntityTypeEnum.F)
       .fiscalCode("uniqueIdentifierCode")
       .fullName("fullName")
       .address("address")