diff --git a/openapi/generated.openapi.json b/openapi/generated.openapi.json
index 1510550e..a587c812 100644
--- a/openapi/generated.openapi.json
+++ b/openapi/generated.openapi.json
@@ -3715,7 +3715,7 @@
}
}
},
- "DebtPositionType" : {
+ "Transfer" : {
"type" : "object",
"properties" : {
"creationDate" : {
@@ -3729,47 +3729,43 @@
"updateOperatorExternalId" : {
"type" : "string"
},
- "debtPositionTypeId" : {
+ "transferId" : {
"type" : "integer",
"format" : "int64"
},
- "brokerId" : {
+ "installmentId" : {
"type" : "integer",
"format" : "int64"
},
- "code" : {
+ "orgFiscalCode" : {
"type" : "string"
},
- "description" : {
+ "orgName" : {
"type" : "string"
},
- "orgType" : {
- "type" : "string"
+ "amountCents" : {
+ "type" : "integer",
+ "format" : "int64"
},
- "macroArea" : {
+ "remittanceInformation" : {
"type" : "string"
},
- "serviceType" : {
- "type" : "string"
+ "stamp" : {
+ "$ref" : "#/components/schemas/Stamp"
},
- "collectingReason" : {
+ "iban" : {
"type" : "string"
},
- "taxonomyCode" : {
+ "postalIban" : {
"type" : "string"
},
- "flagAnonymousFiscalCode" : {
- "type" : "boolean"
- },
- "flagMandatoryDueDate" : {
- "type" : "boolean"
- },
- "flagNotifyIo" : {
- "type" : "boolean"
- },
- "ioTemplateMessage" : {
+ "category" : {
"type" : "string"
},
+ "transferIndex" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
"_links" : {
"$ref" : "#/components/schemas/Links"
}
@@ -3796,16 +3792,16 @@
}
}
},
- "PagedModelDebtPositionType" : {
+ "PagedModelTransfer" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "debtPositionTypes" : {
+ "transfers" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/DebtPositionType"
+ "$ref" : "#/components/schemas/Transfer"
}
}
}
@@ -3818,7 +3814,21 @@
}
}
},
- "ReceiptNoPII" : {
+ "Stamp" : {
+ "type" : "object",
+ "properties" : {
+ "stampType" : {
+ "type" : "string"
+ },
+ "stampHashDocument" : {
+ "type" : "string"
+ },
+ "stampProvincialResidence" : {
+ "type" : "string"
+ }
+ }
+ },
+ "InstallmentNoPII" : {
"type" : "object",
"properties" : {
"creationDate" : {
@@ -3832,118 +3842,106 @@
"updateOperatorExternalId" : {
"type" : "string"
},
- "receiptId" : {
- "type" : "integer",
- "format" : "int64"
- },
"installmentId" : {
"type" : "integer",
"format" : "int64"
},
- "ingestionFlowFileId" : {
+ "paymentOptionId" : {
"type" : "integer",
"format" : "int64"
},
- "receiptOrigin" : {
- "type" : "string"
- },
- "paymentReceiptId" : {
- "type" : "string"
- },
- "noticeNumber" : {
- "type" : "string"
+ "status" : {
+ "type" : "string",
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
},
- "paymentNote" : {
+ "iupdPagopa" : {
"type" : "string"
},
- "orgFiscalCode" : {
+ "iud" : {
"type" : "string"
},
- "outcome" : {
+ "iuv" : {
"type" : "string"
},
- "creditorReferenceId" : {
+ "iur" : {
"type" : "string"
},
- "paymentAmountCents" : {
- "type" : "integer",
- "format" : "int64"
- },
- "description" : {
+ "iuf" : {
"type" : "string"
},
- "companyName" : {
+ "nav" : {
"type" : "string"
},
- "officeName" : {
- "type" : "string"
+ "dueDate" : {
+ "type" : "string",
+ "format" : "date-time"
},
- "idPsp" : {
+ "paymentTypeCode" : {
"type" : "string"
},
- "pspFiscalCode" : {
- "type" : "string"
+ "amountCents" : {
+ "type" : "integer",
+ "format" : "int64"
},
- "pspPartitaIva" : {
- "type" : "string"
+ "notificationFeeCents" : {
+ "type" : "integer",
+ "format" : "int64"
},
- "pspCompanyName" : {
+ "remittanceInformation" : {
"type" : "string"
},
- "idChannel" : {
+ "humanFriendlyRemittanceInformation" : {
"type" : "string"
},
- "channelDescription" : {
+ "balance" : {
"type" : "string"
},
- "paymentMethod" : {
+ "legacyPaymentMetadata" : {
"type" : "string"
},
- "feeCents" : {
+ "personalDataId" : {
"type" : "integer",
"format" : "int64"
},
- "paymentDateTime" : {
- "type" : "string",
- "format" : "date-time"
- },
- "applicationDate" : {
- "type" : "string",
- "format" : "date-time"
- },
- "transferDate" : {
- "type" : "string",
- "format" : "date-time"
- },
- "standin" : {
- "type" : "boolean"
- },
"debtorEntityType" : {
"type" : "string"
},
- "personalDataId" : {
- "type" : "integer",
- "format" : "int64"
- },
"debtorFiscalCodeHash" : {
"type" : "string",
"format" : "byte"
},
+ "syncStatus" : {
+ "$ref" : "#/components/schemas/InstallmentSyncStatus"
+ },
"_links" : {
"$ref" : "#/components/schemas/Links"
}
}
},
- "PagedModelReceiptNoPII" : {
+ "InstallmentSyncStatus" : {
+ "required" : [ "syncStatusFrom", "syncStatusTo" ],
+ "type" : "object",
+ "properties" : {
+ "syncStatusFrom" : {
+ "type" : "string",
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ },
+ "syncStatusTo" : {
+ "type" : "string",
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ }
+ }
+ },
+ "PagedModelInstallmentNoPII" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "receiptNoPIIs" : {
+ "installmentNoPIIs" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/ReceiptNoPII"
+ "$ref" : "#/components/schemas/InstallmentNoPII"
}
}
}
@@ -3956,55 +3954,41 @@
}
}
},
- "DebtPositionTypeWithCount" : {
+ "CollectionModelTransfer" : {
"type" : "object",
"properties" : {
- "debtPositionTypeId" : {
- "type" : "integer",
- "format" : "int64"
- },
- "code" : {
- "type" : "string"
- },
- "description" : {
- "type" : "string"
- },
- "updateDate" : {
- "type" : "string",
- "format" : "date-time"
- },
- "activeOrganizations" : {
- "type" : "integer",
- "format" : "int32"
- },
- "brokerId" : {
- "type" : "integer",
- "format" : "int64"
+ "_embedded" : {
+ "type" : "object",
+ "properties" : {
+ "transfers" : {
+ "type" : "array",
+ "items" : {
+ "$ref" : "#/components/schemas/TransferResponse"
+ }
+ }
+ }
},
"_links" : {
"$ref" : "#/components/schemas/Links"
}
}
},
- "PagedModelDebtPositionTypeWithCount" : {
+ "CollectionModelObject" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "debtPositionTypeWithCounts" : {
+ "objects" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/DebtPositionTypeWithCount"
+ "type" : "object"
}
}
}
},
"_links" : {
"$ref" : "#/components/schemas/Links"
- },
- "page" : {
- "$ref" : "#/components/schemas/PageMetadata"
}
}
},
@@ -4060,7 +4044,7 @@
}
}
},
- "Transfer" : {
+ "PaymentOption" : {
"type" : "object",
"properties" : {
"creationDate" : {
@@ -4074,239 +4058,73 @@
"updateOperatorExternalId" : {
"type" : "string"
},
- "transferId" : {
- "type" : "integer",
- "format" : "int64"
- },
- "installmentId" : {
- "type" : "integer",
- "format" : "int64"
- },
- "orgFiscalCode" : {
- "type" : "string"
- },
- "orgName" : {
- "type" : "string"
- },
- "amountCents" : {
- "type" : "integer",
- "format" : "int64"
- },
- "remittanceInformation" : {
- "type" : "string"
- },
- "stamp" : {
- "$ref" : "#/components/schemas/Stamp"
- },
- "iban" : {
- "type" : "string"
- },
- "postalIban" : {
- "type" : "string"
- },
- "category" : {
- "type" : "string"
- },
- "transferIndex" : {
+ "paymentOptionId" : {
"type" : "integer",
"format" : "int64"
},
- "_links" : {
- "$ref" : "#/components/schemas/Links"
- }
- }
- },
- "PagedModelTransfer" : {
- "type" : "object",
- "properties" : {
- "_embedded" : {
- "type" : "object",
- "properties" : {
- "transfers" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/components/schemas/Transfer"
- }
- }
- }
- },
- "_links" : {
- "$ref" : "#/components/schemas/Links"
- },
- "page" : {
- "$ref" : "#/components/schemas/PageMetadata"
- }
- }
- },
- "Stamp" : {
- "type" : "object",
- "properties" : {
- "stampType" : {
- "type" : "string"
- },
- "stampHashDocument" : {
- "type" : "string"
- },
- "stampProvincialResidence" : {
- "type" : "string"
- }
- }
- },
- "InstallmentNoPII" : {
- "type" : "object",
- "properties" : {
- "creationDate" : {
- "type" : "string",
- "format" : "date-time"
- },
- "updateDate" : {
- "type" : "string",
- "format" : "date-time"
- },
- "updateOperatorExternalId" : {
- "type" : "string"
- },
- "installmentId" : {
+ "debtPositionId" : {
"type" : "integer",
"format" : "int64"
},
- "paymentOptionId" : {
+ "totalAmountCents" : {
"type" : "integer",
"format" : "int64"
},
"status" : {
"type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
- },
- "iupdPagopa" : {
- "type" : "string"
- },
- "iud" : {
- "type" : "string"
- },
- "iuv" : {
- "type" : "string"
- },
- "iur" : {
- "type" : "string"
- },
- "iuf" : {
- "type" : "string"
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
},
- "nav" : {
- "type" : "string"
+ "multiDebtor" : {
+ "type" : "boolean"
},
"dueDate" : {
"type" : "string",
"format" : "date-time"
},
- "paymentTypeCode" : {
- "type" : "string"
- },
- "amountCents" : {
- "type" : "integer",
- "format" : "int64"
- },
- "notificationFeeCents" : {
- "type" : "integer",
- "format" : "int64"
- },
- "remittanceInformation" : {
- "type" : "string"
- },
- "humanFriendlyRemittanceInformation" : {
- "type" : "string"
- },
- "balance" : {
- "type" : "string"
- },
- "legacyPaymentMetadata" : {
- "type" : "string"
- },
- "personalDataId" : {
- "type" : "integer",
- "format" : "int64"
- },
- "debtorEntityType" : {
- "type" : "string"
- },
- "debtorFiscalCodeHash" : {
- "type" : "string",
- "format" : "byte"
- },
- "syncStatus" : {
- "$ref" : "#/components/schemas/InstallmentSyncStatus"
- },
- "_links" : {
- "$ref" : "#/components/schemas/Links"
- }
- }
- },
- "InstallmentSyncStatus" : {
- "required" : [ "syncStatusFrom", "syncStatusTo" ],
- "type" : "object",
- "properties" : {
- "syncStatusFrom" : {
- "type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
- },
- "syncStatusTo" : {
- "type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
- }
- }
- },
- "PagedModelInstallmentNoPII" : {
- "type" : "object",
- "properties" : {
- "_embedded" : {
- "type" : "object",
- "properties" : {
- "installmentNoPIIs" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/components/schemas/InstallmentNoPII"
- }
- }
- }
+ "description" : {
+ "type" : "string"
+ },
+ "paymentOptionType" : {
+ "type" : "string",
+ "enum" : [ "SINGLE_INSTALLMENT", "INSTALLMENTS", "DOWN_PAYMENT" ]
},
"_links" : {
"$ref" : "#/components/schemas/Links"
- },
- "page" : {
- "$ref" : "#/components/schemas/PageMetadata"
}
}
},
- "CollectionModelObject" : {
+ "PagedModelPaymentOption" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "objects" : {
+ "paymentOptions" : {
"type" : "array",
"items" : {
- "type" : "object"
+ "$ref" : "#/components/schemas/PaymentOption"
}
}
}
},
"_links" : {
"$ref" : "#/components/schemas/Links"
+ },
+ "page" : {
+ "$ref" : "#/components/schemas/PageMetadata"
}
}
},
- "CollectionModelTransfer" : {
+ "CollectionModelInstallmentNoPII" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "transfers" : {
+ "installmentNoPIIs" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/TransferResponse"
+ "$ref" : "#/components/schemas/InstallmentNoPIIResponse"
}
}
}
@@ -4316,7 +4134,7 @@
}
}
},
- "PaymentOption" : {
+ "DebtPositionType" : {
"type" : "object",
"properties" : {
"creationDate" : {
@@ -4330,51 +4148,62 @@
"updateOperatorExternalId" : {
"type" : "string"
},
- "paymentOptionId" : {
+ "debtPositionTypeId" : {
"type" : "integer",
"format" : "int64"
},
- "debtPositionId" : {
+ "brokerId" : {
"type" : "integer",
"format" : "int64"
},
- "totalAmountCents" : {
- "type" : "integer",
- "format" : "int64"
+ "code" : {
+ "type" : "string"
},
- "status" : {
- "type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ "description" : {
+ "type" : "string"
},
- "multiDebtor" : {
- "type" : "boolean"
+ "orgType" : {
+ "type" : "string"
},
- "dueDate" : {
- "type" : "string",
- "format" : "date-time"
+ "macroArea" : {
+ "type" : "string"
},
- "description" : {
+ "serviceType" : {
"type" : "string"
},
- "paymentOptionType" : {
- "type" : "string",
- "enum" : [ "SINGLE_INSTALLMENT", "INSTALLMENTS", "DOWN_PAYMENT" ]
+ "collectingReason" : {
+ "type" : "string"
+ },
+ "taxonomyCode" : {
+ "type" : "string"
+ },
+ "flagAnonymousFiscalCode" : {
+ "type" : "boolean"
+ },
+ "flagMandatoryDueDate" : {
+ "type" : "boolean"
+ },
+ "flagNotifyIo" : {
+ "type" : "boolean"
+ },
+ "ioTemplateMessage" : {
+ "type" : "string"
},
"_links" : {
"$ref" : "#/components/schemas/Links"
}
}
},
- "PagedModelPaymentOption" : {
+ "PagedModelDebtPositionType" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "paymentOptions" : {
+ "debtPositionTypes" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/PaymentOption"
+ "$ref" : "#/components/schemas/DebtPositionType"
}
}
}
@@ -4387,22 +4216,55 @@
}
}
},
- "CollectionModelInstallmentNoPII" : {
+ "DebtPositionTypeWithCount" : {
+ "type" : "object",
+ "properties" : {
+ "debtPositionTypeId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "code" : {
+ "type" : "string"
+ },
+ "description" : {
+ "type" : "string"
+ },
+ "updateDate" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "activeOrganizations" : {
+ "type" : "integer",
+ "format" : "int32"
+ },
+ "brokerId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "_links" : {
+ "$ref" : "#/components/schemas/Links"
+ }
+ }
+ },
+ "PagedModelDebtPositionTypeWithCount" : {
"type" : "object",
"properties" : {
"_embedded" : {
"type" : "object",
"properties" : {
- "installmentNoPIIs" : {
+ "debtPositionTypeWithCounts" : {
"type" : "array",
"items" : {
- "$ref" : "#/components/schemas/InstallmentNoPIIResponse"
+ "$ref" : "#/components/schemas/DebtPositionTypeWithCount"
}
}
}
},
"_links" : {
"$ref" : "#/components/schemas/Links"
+ },
+ "page" : {
+ "$ref" : "#/components/schemas/PageMetadata"
}
}
},
@@ -4432,7 +4294,7 @@
},
"status" : {
"type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "EXPIRED", "UNPAID", "DRAFT" ]
},
"debtPositionOrigin" : {
"type" : "string",
@@ -4633,6 +4495,144 @@
}
}
},
+ "ReceiptNoPII" : {
+ "type" : "object",
+ "properties" : {
+ "creationDate" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "updateDate" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "updateOperatorExternalId" : {
+ "type" : "string"
+ },
+ "receiptId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "installmentId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "ingestionFlowFileId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "receiptOrigin" : {
+ "type" : "string"
+ },
+ "paymentReceiptId" : {
+ "type" : "string"
+ },
+ "noticeNumber" : {
+ "type" : "string"
+ },
+ "paymentNote" : {
+ "type" : "string"
+ },
+ "orgFiscalCode" : {
+ "type" : "string"
+ },
+ "outcome" : {
+ "type" : "string"
+ },
+ "creditorReferenceId" : {
+ "type" : "string"
+ },
+ "paymentAmountCents" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "description" : {
+ "type" : "string"
+ },
+ "companyName" : {
+ "type" : "string"
+ },
+ "officeName" : {
+ "type" : "string"
+ },
+ "idPsp" : {
+ "type" : "string"
+ },
+ "pspFiscalCode" : {
+ "type" : "string"
+ },
+ "pspPartitaIva" : {
+ "type" : "string"
+ },
+ "pspCompanyName" : {
+ "type" : "string"
+ },
+ "idChannel" : {
+ "type" : "string"
+ },
+ "channelDescription" : {
+ "type" : "string"
+ },
+ "paymentMethod" : {
+ "type" : "string"
+ },
+ "feeCents" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "paymentDateTime" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "applicationDate" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "transferDate" : {
+ "type" : "string",
+ "format" : "date-time"
+ },
+ "standin" : {
+ "type" : "boolean"
+ },
+ "debtorEntityType" : {
+ "type" : "string"
+ },
+ "personalDataId" : {
+ "type" : "integer",
+ "format" : "int64"
+ },
+ "debtorFiscalCodeHash" : {
+ "type" : "string",
+ "format" : "byte"
+ },
+ "_links" : {
+ "$ref" : "#/components/schemas/Links"
+ }
+ }
+ },
+ "PagedModelReceiptNoPII" : {
+ "type" : "object",
+ "properties" : {
+ "_embedded" : {
+ "type" : "object",
+ "properties" : {
+ "receiptNoPIIs" : {
+ "type" : "array",
+ "items" : {
+ "$ref" : "#/components/schemas/ReceiptNoPII"
+ }
+ }
+ }
+ },
+ "_links" : {
+ "$ref" : "#/components/schemas/Links"
+ },
+ "page" : {
+ "$ref" : "#/components/schemas/PageMetadata"
+ }
+ }
+ },
"DebtPositionTypeOrgOperatorsRequestBody" : {
"type" : "object",
"properties" : {
@@ -4867,7 +4867,7 @@
},
"status" : {
"type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "EXPIRED", "UNPAID", "DRAFT" ]
},
"debtPositionOrigin" : {
"type" : "string",
@@ -5421,7 +5421,7 @@
},
"status" : {
"type" : "string",
- "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "INVALID", "EXPIRED", "UNPAID", "DRAFT" ]
+ "enum" : [ "TO_SYNC", "REPORTED", "PAID", "PARTIALLY_PAID", "CANCELLED", "EXPIRED", "UNPAID", "DRAFT" ]
},
"debtPositionOrigin" : {
"type" : "string",
diff --git a/openapi/p4pa-debt-position.openapi.yaml b/openapi/p4pa-debt-position.openapi.yaml
index 3665e5c4..b607896f 100644
--- a/openapi/p4pa-debt-position.openapi.yaml
+++ b/openapi/p4pa-debt-position.openapi.yaml
@@ -512,7 +512,6 @@ components:
- PAID
- PARTIALLY_PAID
- CANCELLED
- - INVALID
- EXPIRED
- UNPAID
- DRAFT
diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/StatusRulesHandler.java b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/StatusRulesHandler.java
index ed6f0cc9..facc8a4b 100644
--- a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/StatusRulesHandler.java
+++ b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/StatusRulesHandler.java
@@ -14,19 +14,17 @@ public abstract class StatusRulesHandler<E extends Enum<E>, T, D> {
private final E expiredStatus;
private final E cancelledStatus;
private final E reportedStatus;
- private final E invalidStatus;
private final Set<E> allowedCancelledStatuses;
private final Set<E> emptyAllowedStatuses;
- protected StatusRulesHandler(E syncStatus, E paidStatus, E unpaidStatus, E expiredStatus, E cancelledStatus, E reportedStatus, E invalidStatus) {
+ protected StatusRulesHandler(E syncStatus, E paidStatus, E unpaidStatus, E expiredStatus, E cancelledStatus, E reportedStatus) {
this.syncStatus = syncStatus;
this.paidStatus = paidStatus;
this.unpaidStatus = unpaidStatus;
this.expiredStatus = expiredStatus;
this.cancelledStatus = cancelledStatus;
this.reportedStatus = reportedStatus;
- this.invalidStatus = invalidStatus;
this.allowedCancelledStatuses = Set.of(cancelledStatus);
this.emptyAllowedStatuses = Set.of();
@@ -67,10 +65,6 @@ public boolean isReported(List<E> childrenStatusList) {
return allMatch(childrenStatusList, reportedStatus, allowedCancelledStatuses);
}
- public boolean isInvalid(List<E> childrenStatusList) {
- return allMatch(childrenStatusList, invalidStatus, allowedCancelledStatuses);
- }
-
public boolean isCancelled(List<E> childrenStatusList) {
return allMatch(childrenStatusList, cancelledStatus, emptyAllowedStatuses);
}
diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusChecker.java b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusChecker.java
index 5e07bf69..ae9d1d74 100644
--- a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusChecker.java
+++ b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusChecker.java
@@ -17,7 +17,7 @@ public class DebtPositionStatusChecker extends StatusRulesHandler<PaymentOptionS
private final DebtPositionRepository debtPositionRepository;
public DebtPositionStatusChecker(DebtPositionRepository debtPositionRepository) {
- super(TO_SYNC, PAID, UNPAID, EXPIRED, CANCELLED, REPORTED, INVALID);
+ super(TO_SYNC, PAID, UNPAID, EXPIRED, CANCELLED, REPORTED);
this.debtPositionRepository = debtPositionRepository;
}
@@ -33,8 +33,6 @@ public DebtPositionStatus calculateNewStatus(List<PaymentOptionStatus> paymentOp
return DebtPositionStatus.PAID;
} else if (isReported(paymentOptionStatusList)){
return DebtPositionStatus.REPORTED;
- } else if (isInvalid(paymentOptionStatusList)){
- return DebtPositionStatus.INVALID;
} else if (isCancelled(paymentOptionStatusList)){
return DebtPositionStatus.CANCELLED;
} else if (isExpired(paymentOptionStatusList)){
diff --git a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusChecker.java b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusChecker.java
index dd005cee..c7b98848 100644
--- a/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusChecker.java
+++ b/src/main/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusChecker.java
@@ -18,7 +18,7 @@ public class PaymentOptionStatusChecker extends StatusRulesHandler<InstallmentSt
public PaymentOptionStatusChecker(PaymentOptionRepository paymentOptionRepository) {
super(InstallmentStatus.TO_SYNC, InstallmentStatus.PAID, InstallmentStatus.UNPAID,
- InstallmentStatus.EXPIRED, InstallmentStatus.CANCELLED, InstallmentStatus.REPORTED, InstallmentStatus.INVALID);
+ InstallmentStatus.EXPIRED, InstallmentStatus.CANCELLED, InstallmentStatus.REPORTED);
this.paymentOptionRepository = paymentOptionRepository;
}
@@ -67,4 +67,9 @@ protected boolean isPartiallyPaid(List<InstallmentStatus> childrenStatusList) {
return childrenStatusList.contains(InstallmentStatus.PAID) &&
(childrenStatusList.contains(InstallmentStatus.UNPAID) || childrenStatusList.contains(InstallmentStatus.EXPIRED));
}
+
+ private boolean isInvalid(List<InstallmentStatus> childrenStatusList) {
+ return childrenStatusList.contains(InstallmentStatus.INVALID) &&
+ childrenStatusList.stream().allMatch(status -> InstallmentStatus.INVALID.equals(status) || InstallmentStatus.CANCELLED.equals(status));
+ }
}
diff --git a/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusCheckerTest.java b/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusCheckerTest.java
index 200de903..31719d22 100644
--- a/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusCheckerTest.java
+++ b/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/debtposition/DebtPositionStatusCheckerTest.java
@@ -113,26 +113,6 @@ void testDeterminePaymentOptionStatus_Reported2() {
assertEquals(DebtPositionStatus.REPORTED, result);
}
- /**
- * Test if the status is INVALID when all paymentOptions are INVALID.
- */
- @Test
- void testCalculateNewStatus_Invalid() {
- List<PaymentOptionStatus> paymentOptionStatusList = List.of(PaymentOptionStatus.INVALID, PaymentOptionStatus.INVALID);
- DebtPositionStatus result = checker.calculateNewStatus(paymentOptionStatusList);
- assertEquals(DebtPositionStatus.INVALID, result);
- }
-
- /**
- * Test if the status is INVALID when all paymentOptions are CANCELLED, with at least one INVALID.
- */
- @Test
- void testDeterminePaymentOptionStatus_Invalid2() {
- List<PaymentOptionStatus> paymentOptionStatusList = List.of(PaymentOptionStatus.INVALID, PaymentOptionStatus.CANCELLED);
- DebtPositionStatus result = checker.calculateNewStatus(paymentOptionStatusList);
- assertEquals(DebtPositionStatus.INVALID, result);
- }
-
/**
* Test if the status is CANCELLED when all paymentOptions are CANCELLED.
*/
diff --git a/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusCheckerTest.java b/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusCheckerTest.java
index 6114b2c3..1a74dcb7 100644
--- a/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusCheckerTest.java
+++ b/src/test/java/it/gov/pagopa/pu/debtpositions/service/statusalign/paymentoption/PaymentOptionStatusCheckerTest.java
@@ -173,6 +173,17 @@ void testCalculateNewStatus_InvalidStatus() {
assertEquals("Unable to determine status for PaymentOption", exception.getMessage());
}
+ /**
+ * Test if an exception is thrown when the list of installments contains an invalid combination of statuses,
+ * including at least one INVALID, an unsupported status (e.g., EXPIRED), and CANCELLED.
+ */
+ @Test
+ void testCalculateNewStatus_InvalidStatus2() {
+ List<InstallmentStatus> installmentStatusList = List.of(InstallmentStatus.INVALID, InstallmentStatus.EXPIRED, InstallmentStatus.CANCELLED);
+ Exception exception = assertThrows(InvalidValueException.class, () -> checker.calculateNewStatus(installmentStatusList));
+ assertEquals("Unable to determine status for PaymentOption", exception.getMessage());
+ }
+
@Test
void testGetChildStatuses() {
PaymentOption paymentOption = new PaymentOption();