diff --git a/openapi/generated.openapi.json b/openapi/generated.openapi.json index 5f64548..f7f9020 100644 --- a/openapi/generated.openapi.json +++ b/openapi/generated.openapi.json @@ -1518,7 +1518,7 @@ } } }, - "PaymentsReporting" : { + "Classification" : { "type" : "object", "properties" : { "creationDate" : { @@ -1532,10 +1532,7 @@ "updateOperatorExternalId" : { "type" : "string" }, - "paymentsReportingId" : { - "type" : "string" - }, - "ingestionFlowFileId" : { + "classificationId" : { "type" : "integer", "format" : "int64" }, @@ -1543,6 +1540,26 @@ "type" : "integer", "format" : "int64" }, + "transferId" : { + "type" : "integer", + "format" : "int64" + }, + "paymentNotifyId" : { + "type" : "integer", + "format" : "int64" + }, + "paymentsReportingId" : { + "type" : "string" + }, + "treasuryId" : { + "type" : "string" + }, + "iuf" : { + "type" : "string" + }, + "iud" : { + "type" : "string" + }, "iuv" : { "type" : "string" }, @@ -1553,72 +1570,57 @@ "type" : "integer", "format" : "int32" }, - "pspIdentifier" : { + "label" : { "type" : "string" }, - "iuf" : { - "type" : "string" + "lastClassificationDate" : { + "type" : "string", + "format" : "date" }, - "flowDateTime" : { + "payDate" : { "type" : "string", - "format" : "date-time" + "format" : "date" }, - "regulationUniqueIdentifier" : { - "type" : "string" + "paymentDateTime" : { + "type" : "string", + "format" : "date-time" }, "regulationDate" : { "type" : "string", "format" : "date" }, - "senderPspType" : { - "type" : "string" - }, - "senderPspCode" : { - "type" : "string" - }, - "senderPspName" : { - "type" : "string" + "billDate" : { + "type" : "string", + "format" : "date" }, - "receiverOrganizationType" : { - "type" : "string" + "regionValueDate" : { + "type" : "string", + "format" : "date" }, - "receiverOrganizationCode" : { + "regulationUniqueIdentifier" : { "type" : "string" }, - "receiverOrganizationName" : { + "accountRegistryCode" : { "type" : "string" }, - "totalPayments" : { - "type" : "integer", - "format" : "int64" - }, - "totalAmountCents" : { - "type" : "integer", - "format" : "int64" - }, - "amountPaidCents" : { + "billAmountCents" : { "type" : "integer", "format" : "int64" }, - "paymentOutcomeCode" : { + "remittanceInformation" : { "type" : "string" }, - "payDate" : { - "type" : "string", - "format" : "date" - }, - "acquiringDate" : { - "type" : "string", - "format" : "date" + "pspCompanyName" : { + "type" : "string" }, - "bicCodePouringBank" : { + "pspLastName" : { "type" : "string" }, "_links" : { "$ref" : "#/components/schemas/Links" } }, - "required" : [ "acquiringDate", "amountPaidCents", "flowDateTime", "ingestionFlowFileId", "iuf", "iur", "iuv", "organizationId", "payDate", "paymentOutcomeCode", "pspIdentifier", "regulationDate", "regulationUniqueIdentifier", "senderPspCode", "senderPspType", "totalAmountCents", "totalPayments", "transferIndex" ] + "required" : [ "label", "organizationId" ] }, "PageMetadata" : { "type" : "object", @@ -1641,108 +1643,6 @@ } } }, - "PagedModelPaymentsReporting" : { - "type" : "object", - "properties" : { - "_embedded" : { - "type" : "object", - "properties" : { - "paymentsReportings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/PaymentsReporting" - } - } - } - }, - "_links" : { - "$ref" : "#/components/schemas/Links" - }, - "page" : { - "$ref" : "#/components/schemas/PageMetadata" - } - } - }, - "CollectionModelPaymentsReporting" : { - "type" : "object", - "properties" : { - "_embedded" : { - "type" : "object", - "properties" : { - "paymentsReportings" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/PaymentsReporting" - } - } - } - }, - "_links" : { - "$ref" : "#/components/schemas/Links" - } - } - }, - "Classification" : { - "type" : "object", - "properties" : { - "creationDate" : { - "type" : "string", - "format" : "date-time" - }, - "updateDate" : { - "type" : "string", - "format" : "date-time" - }, - "updateOperatorExternalId" : { - "type" : "string" - }, - "classificationId" : { - "type" : "integer", - "format" : "int64" - }, - "organizationId" : { - "type" : "integer", - "format" : "int64" - }, - "transferId" : { - "type" : "integer", - "format" : "int64" - }, - "paymentNotifyId" : { - "type" : "integer", - "format" : "int64" - }, - "paymentsReportingId" : { - "type" : "string" - }, - "treasuryId" : { - "type" : "string" - }, - "iuf" : { - "type" : "string" - }, - "iud" : { - "type" : "string" - }, - "iuv" : { - "type" : "string" - }, - "iur" : { - "type" : "string" - }, - "transferIndex" : { - "type" : "integer", - "format" : "int32" - }, - "label" : { - "type" : "string" - }, - "_links" : { - "$ref" : "#/components/schemas/Links" - } - }, - "required" : [ "label", "organizationId" ] - }, "PagedModelClassification" : { "type" : "object", "properties" : { @@ -1938,6 +1838,149 @@ } } }, + "PaymentsReporting" : { + "type" : "object", + "properties" : { + "creationDate" : { + "type" : "string", + "format" : "date-time" + }, + "updateDate" : { + "type" : "string", + "format" : "date-time" + }, + "updateOperatorExternalId" : { + "type" : "string" + }, + "paymentsReportingId" : { + "type" : "string" + }, + "ingestionFlowFileId" : { + "type" : "integer", + "format" : "int64" + }, + "organizationId" : { + "type" : "integer", + "format" : "int64" + }, + "iuv" : { + "type" : "string" + }, + "iur" : { + "type" : "string" + }, + "transferIndex" : { + "type" : "integer", + "format" : "int32" + }, + "pspIdentifier" : { + "type" : "string" + }, + "iuf" : { + "type" : "string" + }, + "flowDateTime" : { + "type" : "string", + "format" : "date-time" + }, + "regulationUniqueIdentifier" : { + "type" : "string" + }, + "regulationDate" : { + "type" : "string", + "format" : "date" + }, + "senderPspType" : { + "type" : "string" + }, + "senderPspCode" : { + "type" : "string" + }, + "senderPspName" : { + "type" : "string" + }, + "receiverOrganizationType" : { + "type" : "string" + }, + "receiverOrganizationCode" : { + "type" : "string" + }, + "receiverOrganizationName" : { + "type" : "string" + }, + "totalPayments" : { + "type" : "integer", + "format" : "int64" + }, + "totalAmountCents" : { + "type" : "integer", + "format" : "int64" + }, + "amountPaidCents" : { + "type" : "integer", + "format" : "int64" + }, + "paymentOutcomeCode" : { + "type" : "string" + }, + "payDate" : { + "type" : "string", + "format" : "date" + }, + "acquiringDate" : { + "type" : "string", + "format" : "date" + }, + "bicCodePouringBank" : { + "type" : "string" + }, + "_links" : { + "$ref" : "#/components/schemas/Links" + } + }, + "required" : [ "acquiringDate", "amountPaidCents", "flowDateTime", "ingestionFlowFileId", "iuf", "iur", "iuv", "organizationId", "payDate", "paymentOutcomeCode", "pspIdentifier", "regulationDate", "regulationUniqueIdentifier", "senderPspCode", "senderPspType", "totalAmountCents", "totalPayments", "transferIndex" ] + }, + "PagedModelPaymentsReporting" : { + "type" : "object", + "properties" : { + "_embedded" : { + "type" : "object", + "properties" : { + "paymentsReportings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/PaymentsReporting" + } + } + } + }, + "_links" : { + "$ref" : "#/components/schemas/Links" + }, + "page" : { + "$ref" : "#/components/schemas/PageMetadata" + } + } + }, + "CollectionModelPaymentsReporting" : { + "type" : "object", + "properties" : { + "_embedded" : { + "type" : "object", + "properties" : { + "paymentsReportings" : { + "type" : "array", + "items" : { + "$ref" : "#/components/schemas/PaymentsReporting" + } + } + } + }, + "_links" : { + "$ref" : "#/components/schemas/Links" + } + } + }, "PaymentsReportingView" : { "type" : "object", "properties" : { @@ -2052,6 +2095,49 @@ }, "label" : { "type" : "string" + }, + "lastClassificationDate" : { + "type" : "string", + "format" : "date" + }, + "payDate" : { + "type" : "string", + "format" : "date" + }, + "paymentDateTime" : { + "type" : "string", + "format" : "date-time" + }, + "regulationDate" : { + "type" : "string", + "format" : "date" + }, + "billDate" : { + "type" : "string", + "format" : "date" + }, + "regionValueDate" : { + "type" : "string", + "format" : "date" + }, + "regulationUniqueIdentifier" : { + "type" : "string" + }, + "accountRegistryCode" : { + "type" : "string" + }, + "billAmountCents" : { + "type" : "integer", + "format" : "int64" + }, + "remittanceInformation" : { + "type" : "string" + }, + "pspCompanyName" : { + "type" : "string" + }, + "pspLastName" : { + "type" : "string" } }, "required" : [ "label", "organizationId" ] diff --git a/src/main/java/it/gov/pagopa/pu/classification/model/Classification.java b/src/main/java/it/gov/pagopa/pu/classification/model/Classification.java index ef21892..5348522 100644 --- a/src/main/java/it/gov/pagopa/pu/classification/model/Classification.java +++ b/src/main/java/it/gov/pagopa/pu/classification/model/Classification.java @@ -5,6 +5,8 @@ import lombok.*; import java.io.Serializable; +import java.time.LocalDate; +import java.time.OffsetDateTime; @Entity @Table(name = "classification") @@ -31,4 +33,16 @@ public class Classification extends BaseEntity implements Serializable { private int transferIndex; @NotNull private String label; + private LocalDate lastClassificationDate; + private LocalDate payDate; + private OffsetDateTime paymentDateTime; + private LocalDate regulationDate; + private LocalDate billDate; + private LocalDate regionValueDate; + private String regulationUniqueIdentifier; + private String accountRegistryCode; + private Long billAmountCents; + private String remittanceInformation; + private String pspCompanyName; + private String pspLastName; }