Merge remote-tracking branch 'origin/main' into P4ADEV-1545-FdRIngest…

…ionActity-implementation-retrieval-via-query-file-validation

# Conflicts:
#	version

force-release

@@ -1 +1 @@
-0008
+0009

src/main/java/it/gov/pagopa/payhub/activities/dto/BrokerDTO.java

@@ -0,0 +1,28 @@
+package it.gov.pagopa.payhub.activities.dto;
+
+import it.gov.pagopa.payhub.activities.enums.PagoPaInteractionModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class BrokerDTO implements Serializable {
+
+    private Long brokerId;
+    private String brokerFiscalCode;
+    private String stationId;
+    private byte[] syncKey;
+    private byte[] gpdKey;
+    private byte[] acaKey;
+    private String brokerName;
+    private String personalisationFe;
+    private String broadcastStationId;
+    private PagoPaInteractionModel pagoPaInteractionModel;
+    private OrganizationDTO masterOrg;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/IngestionFlowFileDTO.java

@@ -0,0 +1,34 @@
+package it.gov.pagopa.payhub.activities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class IngestionFlowFileDTO implements Serializable {
+
+    private Long ingestionFlowFileId;
+    private int version;
+    private OrganizationDTO org;
+    private String status;
+    private String iuf;
+    private Long numTotalRows;
+    private Long numCorrectlyImportedRows;
+    private Date creationDate;
+    private Date lastUpdateDate;
+    private boolean flagActive;
+    private String operatorName;
+    private Boolean flagSpontaneous;
+    private String filePathName;
+    private String fileName;
+    private Long pdfGenerated;
+    private String codRequestToken;
+    private String codError;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/OrganizationDTO.java

@@ -6,8 +6,7 @@
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
+import java.time.Instant;
 import java.time.LocalDate;
 
 @Data
@@ -21,14 +20,11 @@ public class OrganizationDTO implements Serializable {
     private String orgFiscalCode;
     private String orgName;
     private String adminEmail;
-    private Timestamp creationDate;
-    private Timestamp lastChangeDate;
+    private Instant creationDate;
+    private Instant lastUpdateDate;
     private String paymentTypeCode;
-    private BigDecimal numPAChargeCommittee;
-    private String creditIban;
-    private String creditBic;
-    private String backingIban;
-    private String backingBic;
+    private Long fee;
+    private String iban;
     private String myBoxClientKey;
     private String myBoxClientSecret;
     private String urlOrgSendSILPaymentResult;

src/main/java/it/gov/pagopa/payhub/activities/dto/PersonDTO.java

@@ -0,0 +1,26 @@
+package it.gov.pagopa.payhub.activities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class PersonDTO implements Serializable {
+
+    private String uniqueIdentifierType;
+    private String uniqueIdentifierCode;
+    private String fullName;
+    private String address;
+    private String civic;
+    private String postalCode;
+    private String location;
+    private String province;
+    private String nation;
+    private String email;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/ReceiptDTO.java

@@ -0,0 +1,47 @@
+package it.gov.pagopa.payhub.activities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.time.LocalDate;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReceiptDTO implements Serializable {
+
+    private Long receiptId;
+    private Instant creationDate;
+    private String paymentReceiptId;
+    private String noticeNumber;
+    private String fiscalCode;
+    private String outcome;
+    private String creditorReferenceId;
+    private Long paymentAmount;
+    private String description;
+    private String companyName;
+    private String officeName;
+    private PersonDTO debtor;
+    private String idPsp;
+    private String pspFiscalCode;
+    private String pspPartitaIva;
+    private String pspCompanyName;
+    private String idChannel;
+    private String channelDescription;
+    private PersonDTO payer;
+    private String paymentMethod;
+    private Long fee;
+    private LocalDate paymentDateTime;
+    private LocalDate applicationDate;
+    private LocalDate transferDate;
+    private byte[] receiptBytes;
+    private boolean standin;
+    private String status;
+    private Instant dtProcessing;
+    private Integer numTriesProcessing;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/TransferDTO.java

@@ -0,0 +1,30 @@
+package it.gov.pagopa.payhub.activities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.Instant;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransferDTO implements Serializable {
+
+    private Long transferId;
+    private String orgFiscalCode;
+    private String beneficiaryName;
+    private String iban;
+    private Long amount;
+    private Instant creationDate;
+    private Instant lastUpdateDate;
+    private String remittanceInformation;
+    private String stampType;
+    private String documentHash;
+    private String provincialResidence;
+    private String category;
+    private Integer transferIndex;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/debtposition/DebtPositionDTO.java

@@ -0,0 +1,30 @@
+package it.gov.pagopa.payhub.activities.dto.debtposition;
+
+import it.gov.pagopa.payhub.activities.dto.IngestionFlowFileDTO;
+import it.gov.pagopa.payhub.activities.dto.OrganizationDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class DebtPositionDTO implements Serializable {
+
+    private Long debtPositionId;
+    private String iupdOrg;
+    private String iupdPagopa;
+    private String description;
+    private String status;
+    private IngestionFlowFileDTO ingestionFlowFile;
+    private Long ingestionFlowFileLineNumber;
+    private Character gpdStatus;
+    private OrganizationDTO org;
+    private DebtPositionTypeOrgDTO debtPositionTypeOrg;
+    private List<PaymentOptionDTO> paymentOptions;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/debtposition/DebtPositionTypeDTO.java

@@ -0,0 +1,27 @@
+package it.gov.pagopa.payhub.activities.dto.debtposition;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class DebtPositionTypeDTO implements Serializable {
+
+    private Long debtTypePositionId;
+    private Long brokerId;
+    private String code;
+    private String description;
+    private String taxonomyCode;
+    private String macroArea;
+    private String serviceType;
+    private String collectingReason;
+    private boolean flagPrintDueDate;
+    private boolean flagAnonymousFiscalCode;
+    private boolean flagMandatoryDueDate;
+}

src/main/java/it/gov/pagopa/payhub/activities/dto/debtposition/DebtPositionTypeOrgDTO.java

@@ -7,7 +7,6 @@
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 @Data
 @Builder(toBuilder = true)
@@ -16,43 +15,34 @@
 public class DebtPositionTypeOrgDTO implements Serializable {
 
     private Long debtPositionTypeOrgId;
-    private OrganizationDTO orgId;
-    private String typeCode;
-    private String typeDesc;
-    private String creditIbanPi;
-    private String creditBicPi;
-    private String backingIbanPi;
-    private String backingBicPi;
-    private String creditIbanPSP;
-    private String creditBicPSP;
-    private String backingIbanPSP;
-    private String backingBicPSP;
-    private String postalAccountCode;
-    private String xsdReasonCode;
-    private boolean creditBicPiSeller;
-    private boolean creditBicPspSeller;
-    private boolean spontaneous;
-    private BigDecimal amount;
-    private String installmentPaymentUrl;
-    private String balanceDefaultDesc;
-    private boolean flagAnonymousFiscalCode;
+    private OrganizationDTO org;
+    private DebtPositionTypeDTO debtPositionType;
+    private String balance;
+    private String code;
+    private String description;
     private boolean flagMandatoryDueDate;
-    private boolean flagPrintDueDate;
-    private String holderPostalCC;
+    private boolean flagAnonymousFiscalCode;
+    private String postalIban;
+    private String iban;
+    private Long amount;
+    private String externalPaymentUrl;
+    private String balanceDefaultDesc;
     private String orgSector;
+    private String postalAccountCode;
+    private String holderPostalCC;
     private boolean flagNotifyIO;
+    private boolean flagDisablePrintNotice;
     private boolean flagNotifyOutcomePush;
     private Integer maxAttemptForwardingOutcome;
+    private String xsdDefinitionRef;
+    private String taxonomyCode;
     private Long orgSilId;
+    private String amountActualizationUser;
+    private String amountActualizationUrl;
+    private String amountActualizationPwd;
+
+
+    // da controllare cosa tenere o meno
     private boolean flagActive;
-    private String paymentContextCode;
-    private boolean flgDisablePrintNotice;
-    private String macroArea;
-    private String serviceType;
-    private String collectingReason;
-    private String taxonomyCode;
-    private String urlNotifyPnd;
-    private String userPnd;
-    private String pswPnd;
     private String urlNotifyActualizationPnd;
 }