diff --git a/docker/run_docker.sh b/docker/run_docker.sh index 91ebfc8e..aa50bd4e 100644 --- a/docker/run_docker.sh +++ b/docker/run_docker.sh @@ -47,8 +47,8 @@ done stack_name=$(cd .. && basename "$PWD") docker compose -p "${stack_name}" up -d --remove-orphans --force-recreate --build -#docker build -t receipt-pdf-datastore ../ -# docker run -d -p 60486:80 --name="${stack_name}" receipt-pdf-datastore +#docker build -t receipt-pdf-generator ../ +# docker run -d -p 60486:80 --name="${stack_name}" receipt-pdf-generator # waiting the containers printf 'Waiting for the service' diff --git a/integration-test/src/config/.env.dev b/integration-test/src/config/.env.dev index 2f87b0d8..d5d10269 100644 --- a/integration-test/src/config/.env.dev +++ b/integration-test/src/config/.env.dev @@ -1,7 +1,3 @@ -BIZEVENTS_COSMOS_CONN_STRING= -BIZ_EVENT_COSMOS_DB_NAME=db -BIZ_EVENT_COSMOS_DB_CONTAINER_NAME=biz-events - RECEIPTS_COSMOS_CONN_STRING= RECEIPT_COSMOS_DB_NAME=db RECEIPT_COSMOS_DB_CONTAINER_NAME=receipts diff --git a/integration-test/src/config/.env.local b/integration-test/src/config/.env.local index 2f87b0d8..d5d10269 100644 --- a/integration-test/src/config/.env.local +++ b/integration-test/src/config/.env.local @@ -1,7 +1,3 @@ -BIZEVENTS_COSMOS_CONN_STRING= -BIZ_EVENT_COSMOS_DB_NAME=db -BIZ_EVENT_COSMOS_DB_CONTAINER_NAME=biz-events - RECEIPTS_COSMOS_CONN_STRING= RECEIPT_COSMOS_DB_NAME=db RECEIPT_COSMOS_DB_CONTAINER_NAME=receipts diff --git a/integration-test/src/config/.env.uat b/integration-test/src/config/.env.uat index 53478d25..601e4925 100644 --- a/integration-test/src/config/.env.uat +++ b/integration-test/src/config/.env.uat @@ -1,7 +1,3 @@ -BIZEVENTS_COSMOS_CONN_STRING= -BIZ_EVENT_COSMOS_DB_NAME=db -BIZ_EVENT_COSMOS_DB_CONTAINER_NAME=biz-events - RECEIPTS_COSMOS_CONN_STRING= RECEIPT_COSMOS_DB_NAME=db RECEIPT_COSMOS_DB_CONTAINER_NAME=receipts diff --git a/integration-test/src/features/receipt_pdf_datastore.feature b/integration-test/src/features/receipt_pdf_datastore.feature index 5a4096a3..24beadeb 100644 --- a/integration-test/src/features/receipt_pdf_datastore.feature +++ b/integration-test/src/features/receipt_pdf_datastore.feature @@ -1,44 +1,44 @@ -Feature: All about payment events consumed by Azure functions receipt-pdf-datastore +Feature: All about payment events consumed by Azure functions receipt-pdf-generator - Scenario: a biz event stored on biz-events datastore is stored into receipts datastore - Given a random biz event with id "receipt-datastore-int-test-id-1" stored on biz-events datastore with status DONE - When biz event has been properly stored into receipt datastore after 10000 ms with eventId "receipt-datastore-int-test-id-1" - Then the receipts datastore returns the receipt - And the receipt has eventId "receipt-datastore-int-test-id-1" + Scenario: a biz event stored on biz-events generator is stored into receipts generator + Given a random biz event with id "receipt-generator-int-test-id-1" stored on biz-events generator with status DONE + When biz event has been properly stored into receipt generator after 10000 ms with eventId "receipt-generator-int-test-id-1" + Then the receipts generator returns the receipt + And the receipt has eventId "receipt-generator-int-test-id-1" And the receipt has not the status "NOT_QUEUE_SENT" - Scenario: a biz event enqueued on receipts queue trigger the PDF receipt generation that is stored on receipts datastore and blob storage - Given a receipt with id "receipt-datastore-int-test-id-2" stored into receipt datastore - And a random biz event with id "receipt-datastore-int-test-id-2" enqueued on receipts queue + Scenario: a biz event enqueued on receipts queue trigger the PDF receipt generation that is stored on receipts generator and blob storage + Given a receipt with id "receipt-generator-int-test-id-2" stored into receipt generator + And a random biz event with id "receipt-generator-int-test-id-2" enqueued on receipts queue When the PDF receipt has been properly generate from biz event after 20000 ms - Then the receipts datastore returns the receipt - And the receipt has eventId "receipt-datastore-int-test-id-2" + Then the receipts generator returns the receipt + And the receipt has eventId "receipt-generator-int-test-id-2" And the receipt has not the status "NOT_QUEUE_SENT" And the receipt has not the status "INSERTED" And the blob storage has the PDF document Scenario: a biz event enqueued on receipts poison queue is enqueued on receipt queue that trigger the PDF receipt generation - Given a receipt with id "receipt-datastore-int-test-id-3" stored into receipt datastore - And a random biz event with id "receipt-datastore-int-test-id-3" enqueued on receipts poison queue with poison retry "false" + Given a receipt with id "receipt-generator-int-test-id-3" stored into receipt generator + And a random biz event with id "receipt-generator-int-test-id-3" enqueued on receipts poison queue with poison retry "false" When the PDF receipt has been properly generate from biz event after 20000 ms - Then the receipts datastore returns the receipt - And the receipt has eventId "receipt-datastore-int-test-id-3" + Then the receipts generator returns the receipt + And the receipt has eventId "receipt-generator-int-test-id-3" And the receipt has not the status "NOT_QUEUE_SENT" And the receipt has not the status "INSERTED" And the blob storage has the PDF document - Scenario: a biz event enqueued on receipts poison queue is stored on receipt-message-error datastore - Given a random biz event with id "receipt-datastore-int-test-id-4" enqueued on receipts poison queue with poison retry "true" - When the biz event has been properly stored on receipt-message-error datastore after 20000 ms - Then the receipt-message-error datastore returns the error receipt + Scenario: a biz event enqueued on receipts poison queue is stored on receipt-message-error generator + Given a random biz event with id "receipt-generator-int-test-id-4" enqueued on receipts poison queue with poison retry "true" + When the biz event has been properly stored on receipt-message-error generator after 20000 ms + Then the receipt-message-error generator returns the error receipt And the error receipt has the status "TO_REVIEW" - Scenario: a biz event stored on receipt-message-error datastore is enqueued on receipt queue that trigger the PDF receipt generation - Given a receipt with id "receipt-datastore-int-test-id-5" stored into receipt datastore - And a error receipt with id "receipt-datastore-int-test-id-5" stored into receipt-message-error datastore with status REVIEWED + Scenario: a biz event stored on receipt-message-error generator is enqueued on receipt queue that trigger the PDF receipt generation + Given a receipt with id "receipt-generator-int-test-id-5" stored into receipt generator + And a error receipt with id "receipt-generator-int-test-id-5" stored into receipt-message-error generator with status REVIEWED When the PDF receipt has been properly generate from biz event after 20000 ms - Then the receipts datastore returns the receipt - And the receipt has eventId "receipt-datastore-int-test-id-5" + Then the receipts generator returns the receipt + And the receipt has eventId "receipt-generator-int-test-id-5" And the receipt has not the status "NOT_QUEUE_SENT" And the receipt has not the status "INSERTED" And the blob storage has the PDF document diff --git a/integration-test/src/step_definitions/biz_events_datastore_client.js b/integration-test/src/step_definitions/biz_events_datastore_client.js deleted file mode 100644 index b719488a..00000000 --- a/integration-test/src/step_definitions/biz_events_datastore_client.js +++ /dev/null @@ -1,41 +0,0 @@ -const { CosmosClient } = require("@azure/cosmos"); -const { createEvent } = require("./common"); - -const cosmos_db_conn_string = process.env.BIZEVENTS_COSMOS_CONN_STRING; -const databaseId = process.env.BIZ_EVENT_COSMOS_DB_NAME; // es. db -const containerId = process.env.BIZ_EVENT_COSMOS_DB_CONTAINER_NAME; // es. biz-events - -const client = new CosmosClient(cosmos_db_conn_string); -const container = client.database(databaseId).container(containerId); - -async function getDocumentByIdFromBizEventsDatastore(id) { - return await container.items - .query({ - query: "SELECT * from c WHERE c.id=@id", - parameters: [{ name: "@id", value: id }] - }) - .fetchAll(); -} - -async function createDocumentInBizEventsDatastore(id) { - let event = createEvent(id); - try { - return await container.items.create(event); - } catch (err) { - console.log(err); - } -} - -async function deleteDocumentFromBizEventsDatastore(id) { - try { - return await container.item(id, id).delete(); - } catch (error) { - if (error.code !== 404) { - console.log(error) - } - } -} - -module.exports = { - getDocumentByIdFromBizEventsDatastore, createDocumentInBizEventsDatastore, deleteDocumentFromBizEventsDatastore -} \ No newline at end of file diff --git a/integration-test/src/step_definitions/receipt_pdf_datastore_step.js b/integration-test/src/step_definitions/receipt_pdf_datastore_step.js index 764de26f..6c848062 100644 --- a/integration-test/src/step_definitions/receipt_pdf_datastore_step.js +++ b/integration-test/src/step_definitions/receipt_pdf_datastore_step.js @@ -1,7 +1,6 @@ const assert = require('assert'); const { After, Given, When, Then, setDefaultTimeout } = require('@cucumber/cucumber'); const { sleep, createEventForQueue, createEventForPoisonQueue } = require("./common"); -const { createDocumentInBizEventsDatastore, deleteDocumentFromBizEventsDatastore } = require("./biz_events_datastore_client"); const { getDocumentByIdFromReceiptsDatastore, deleteDocumentFromErrorReceiptsDatastoreByMessagePayload, deleteDocumentFromReceiptsDatastoreByEventId, deleteDocumentFromReceiptsDatastore, createDocumentInReceiptsDatastore, createDocumentInErrorReceiptsDatastore, deleteDocumentFromErrorReceiptsDatastore, getDocumentByMessagePayloadFromErrorReceiptsDatastore } = require("./receipts_datastore_client"); const { putMessageOnPoisonQueue, putMessageOnReceiptQueue } = require("./reqeipt_queue_client"); const { receiptPDFExist } = require("./receipts_blob_storage_client"); @@ -18,10 +17,7 @@ this.event = null; // After each Scenario After(async function () { - // remove event - if (this.eventId != null) { - await deleteDocumentFromBizEventsDatastore(this.eventId); - } + // remove documents if (this.eventId != null && this.receiptId != null) { await deleteDocumentFromReceiptsDatastore(this.receiptId, this.eventId); } @@ -35,39 +31,8 @@ After(async function () { this.event = null; }); -Given('a random biz event with id {string} stored on biz-events datastore with status DONE', async function (id) { - this.eventId = id; - // prior cancellation to avoid dirty cases - await deleteDocumentFromBizEventsDatastore(this.eventId); - await deleteDocumentFromReceiptsDatastoreByEventId(this.eventId); - - let bizEventStoreResponse = await createDocumentInBizEventsDatastore(this.eventId); - assert.strictEqual(bizEventStoreResponse.statusCode, 201); -}); - -When('biz event has been properly stored into receipt datastore after {int} ms with eventId {string}', async function (time, eventId) { - // boundary time spent by azure function to process event - await sleep(time); - this.responseToCheck = await getDocumentByIdFromReceiptsDatastore(eventId); -}); - -Then('the receipts datastore returns the receipt', async function () { - assert.notStrictEqual(this.responseToCheck.resources.length, 0); - this.receiptId = this.responseToCheck.resources[0].id; - assert.strictEqual(this.responseToCheck.resources.length, 1); -}); - -Then('the receipt has eventId {string}', function (targetId) { - assert.strictEqual(this.responseToCheck.resources[0].eventId, targetId); -}); - -Then('the receipt has not the status {string}', function (targetStatus) { - assert.notStrictEqual(this.responseToCheck.resources[0].status, targetStatus); -}); - - -Given('a receipt with id {string} stored into receipt datastore', async function (id) { +Given('a receipt with id {string} stored into receipt generator', async function (id) { this.eventId = id; // prior cancellation to avoid dirty cases await deleteDocumentFromReceiptsDatastore(this.eventId, this.eventId); @@ -104,13 +69,13 @@ Given('a random biz event with id {string} enqueued on receipts poison queue wit await putMessageOnPoisonQueue(this.event); }); -When('the biz event has been properly stored on receipt-message-error datastore after {int} ms', async function (time) { +When('the biz event has been properly stored on receipt-message-error generator after {int} ms', async function (time) { // boundary time spent by azure function to process event await sleep(time); this.responseToCheck = await getDocumentByMessagePayloadFromErrorReceiptsDatastore(this.event); }); -Then('the receipt-message-error datastore returns the error receipt', async function () { +Then('the receipt-message-error generator returns the error receipt', async function () { assert.notStrictEqual(this.responseToCheck.resources.length, 0); this.errorReceiptId = this.responseToCheck.resources[0].id; assert.strictEqual(this.responseToCheck.resources.length, 1); @@ -123,7 +88,7 @@ Then('the error receipt has the status {string}', function (targetStatus) { -Given('a error receipt with id {string} stored into receipt-message-error datastore with status REVIEWED', async function (id) { +Given('a error receipt with id {string} stored into receipt-message-error generator with status REVIEWED', async function (id) { assert.strictEqual(this.eventId, id); let response = await createDocumentInErrorReceiptsDatastore(id); assert.strictEqual(response.statusCode, 201); diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClient.java deleted file mode 100644 index 2c9cd567..00000000 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; - -import it.gov.pagopa.receipt.pdf.datastore.model.request.PdfEngineRequest; -import it.gov.pagopa.receipt.pdf.datastore.model.response.PdfEngineResponse; - -public interface PdfEngineClient { - - PdfEngineResponse generatePDF(PdfEngineRequest pdfEngineRequest); -} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClient.java deleted file mode 100644 index 12f6d8d1..00000000 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; - -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.exception.ReceiptNotFoundException; - -public interface ReceiptCosmosClient { - - Receipt getReceiptDocument(String receiptId) throws ReceiptNotFoundException; -} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/WalletType.java b/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/WalletType.java deleted file mode 100644 index b054d1a7..00000000 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/WalletType.java +++ /dev/null @@ -1,5 +0,0 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration; - -public enum WalletType { - CARD, PAYPAL, BANCOMATPAY -} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdf.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdf.java similarity index 92% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdf.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdf.java index 5b5f6673..8023b0c8 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdf.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdf.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.fasterxml.jackson.core.JsonProcessingException; import com.microsoft.azure.functions.ExecutionContext; @@ -7,15 +7,15 @@ import com.microsoft.azure.functions.annotation.FunctionName; import com.microsoft.azure.functions.annotation.QueueOutput; import com.microsoft.azure.functions.annotation.QueueTrigger; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptCosmosClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.BizEvent; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptStatusType; -import it.gov.pagopa.receipt.pdf.datastore.exception.BizEventNotValidException; -import it.gov.pagopa.receipt.pdf.datastore.exception.ReceiptNotFoundException; -import it.gov.pagopa.receipt.pdf.datastore.model.PdfGeneration; -import it.gov.pagopa.receipt.pdf.datastore.service.GenerateReceiptPdfService; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptCosmosClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.event.BizEvent; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptStatusType; +import it.gov.pagopa.receipt.pdf.generator.exception.BizEventNotValidException; +import it.gov.pagopa.receipt.pdf.generator.exception.ReceiptNotFoundException; +import it.gov.pagopa.receipt.pdf.generator.model.PdfGeneration; +import it.gov.pagopa.receipt.pdf.generator.service.GenerateReceiptPdfService; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; import org.apache.http.HttpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/Info.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/Info.java similarity index 94% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/Info.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/Info.java index 43320413..0aaed16f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/Info.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/Info.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.microsoft.azure.functions.ExecutionContext; import com.microsoft.azure.functions.HttpMethod; @@ -8,14 +8,13 @@ import com.microsoft.azure.functions.annotation.AuthorizationLevel; import com.microsoft.azure.functions.annotation.FunctionName; import com.microsoft.azure.functions.annotation.HttpTrigger; -import it.gov.pagopa.receipt.pdf.datastore.model.AppInfo; +import it.gov.pagopa.receipt.pdf.generator.model.AppInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.InputStream; import java.util.Optional; import java.util.Properties; -import java.util.logging.Level; /** diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueue.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueue.java similarity index 92% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueue.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueue.java index 91fedee7..e9d76c61 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueue.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueue.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.azure.core.http.rest.Response; import com.azure.storage.queue.models.SendMessageResult; @@ -9,12 +9,12 @@ import com.microsoft.azure.functions.annotation.CosmosDBOutput; import com.microsoft.azure.functions.annotation.FunctionName; import com.microsoft.azure.functions.annotation.QueueTrigger; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptQueueClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.BizEvent; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.ReceiptError; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptErrorStatusType; -import it.gov.pagopa.receipt.pdf.datastore.exception.UnableToQueueException; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptQueueClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.event.BizEvent; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.ReceiptError; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptErrorStatusType; +import it.gov.pagopa.receipt.pdf.generator.exception.UnableToQueueException; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClient.java new file mode 100644 index 00000000..f3db0e75 --- /dev/null +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClient.java @@ -0,0 +1,9 @@ +package it.gov.pagopa.receipt.pdf.generator.client; + +import it.gov.pagopa.receipt.pdf.generator.model.request.PdfEngineRequest; +import it.gov.pagopa.receipt.pdf.generator.model.response.PdfEngineResponse; + +public interface PdfEngineClient { + + PdfEngineResponse generatePDF(PdfEngineRequest pdfEngineRequest); +} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClient.java similarity index 58% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClient.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClient.java index 5e10c61e..eadd3dd2 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClient.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClient.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; -import it.gov.pagopa.receipt.pdf.datastore.model.response.BlobStorageResponse; +import it.gov.pagopa.receipt.pdf.generator.model.response.BlobStorageResponse; import java.io.InputStream; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClient.java new file mode 100644 index 00000000..7f8b624b --- /dev/null +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClient.java @@ -0,0 +1,9 @@ +package it.gov.pagopa.receipt.pdf.generator.client; + +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.exception.ReceiptNotFoundException; + +public interface ReceiptCosmosClient { + + Receipt getReceiptDocument(String receiptId) throws ReceiptNotFoundException; +} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClient.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClient.java similarity index 80% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClient.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClient.java index e7b3af92..d4b52e86 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClient.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClient.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; import com.azure.core.http.rest.Response; import com.azure.storage.queue.models.SendMessageResult; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/PdfEngineClientImpl.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/PdfEngineClientImpl.java similarity index 95% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/PdfEngineClientImpl.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/PdfEngineClientImpl.java index 9b8d1949..430d5cf4 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/PdfEngineClientImpl.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/PdfEngineClientImpl.java @@ -1,10 +1,10 @@ -package it.gov.pagopa.receipt.pdf.datastore.client.impl; +package it.gov.pagopa.receipt.pdf.generator.client.impl; -import it.gov.pagopa.receipt.pdf.datastore.client.PdfEngineClient; -import it.gov.pagopa.receipt.pdf.datastore.model.PdfEngineErrorResponse; -import it.gov.pagopa.receipt.pdf.datastore.model.request.PdfEngineRequest; -import it.gov.pagopa.receipt.pdf.datastore.model.response.PdfEngineResponse; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.client.PdfEngineClient; +import it.gov.pagopa.receipt.pdf.generator.model.PdfEngineErrorResponse; +import it.gov.pagopa.receipt.pdf.generator.model.request.PdfEngineRequest; +import it.gov.pagopa.receipt.pdf.generator.model.response.PdfEngineResponse; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; import org.apache.commons.io.FileUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptBlobClientImpl.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptBlobClientImpl.java similarity index 94% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptBlobClientImpl.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptBlobClientImpl.java index 87e4f138..5137c74f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptBlobClientImpl.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptBlobClientImpl.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.client.impl; +package it.gov.pagopa.receipt.pdf.generator.client.impl; import com.azure.core.http.rest.Response; import com.azure.storage.blob.BlobClient; @@ -8,8 +8,8 @@ import com.azure.storage.blob.models.BlockBlobItem; import com.azure.storage.blob.options.BlobParallelUploadOptions; import com.microsoft.azure.functions.HttpStatus; -import it.gov.pagopa.receipt.pdf.datastore.client.ReceiptBlobClient; -import it.gov.pagopa.receipt.pdf.datastore.model.response.BlobStorageResponse; +import it.gov.pagopa.receipt.pdf.generator.client.ReceiptBlobClient; +import it.gov.pagopa.receipt.pdf.generator.model.response.BlobStorageResponse; import java.io.InputStream; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptCosmosClientImpl.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptCosmosClientImpl.java similarity index 90% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptCosmosClientImpl.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptCosmosClientImpl.java index 993b8579..050fd3ea 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptCosmosClientImpl.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptCosmosClientImpl.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.client.impl; +package it.gov.pagopa.receipt.pdf.generator.client.impl; import com.azure.cosmos.CosmosClient; import com.azure.cosmos.CosmosClientBuilder; @@ -6,9 +6,9 @@ import com.azure.cosmos.CosmosDatabase; import com.azure.cosmos.models.CosmosQueryRequestOptions; import com.azure.cosmos.util.CosmosPagedIterable; -import it.gov.pagopa.receipt.pdf.datastore.client.ReceiptCosmosClient; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.exception.ReceiptNotFoundException; +import it.gov.pagopa.receipt.pdf.generator.client.ReceiptCosmosClient; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.exception.ReceiptNotFoundException; /** * Client for the CosmosDB database diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptQueueClientImpl.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptQueueClientImpl.java similarity index 93% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptQueueClientImpl.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptQueueClientImpl.java index 8ee912a6..9f0edad4 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/client/impl/ReceiptQueueClientImpl.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/client/impl/ReceiptQueueClientImpl.java @@ -1,10 +1,10 @@ -package it.gov.pagopa.receipt.pdf.datastore.client.impl; +package it.gov.pagopa.receipt.pdf.generator.client.impl; import com.azure.core.http.rest.Response; import com.azure.storage.queue.QueueClient; import com.azure.storage.queue.QueueClientBuilder; import com.azure.storage.queue.models.SendMessageResult; -import it.gov.pagopa.receipt.pdf.datastore.client.ReceiptQueueClient; +import it.gov.pagopa.receipt.pdf.generator.client.ReceiptQueueClient; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/AuthRequest.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/AuthRequest.java similarity index 85% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/AuthRequest.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/AuthRequest.java index 1a0552d0..a7a80b87 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/AuthRequest.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/AuthRequest.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/BizEvent.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/BizEvent.java similarity index 89% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/BizEvent.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/BizEvent.java index 892ab52d..4e118da9 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/BizEvent.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/BizEvent.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration.BizEventStatusType; +import it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration.BizEventStatusType; import lombok.*; import java.util.List; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Creditor.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Creditor.java similarity index 80% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Creditor.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Creditor.java index 4990d18b..a898a74f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Creditor.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Creditor.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Debtor.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Debtor.java similarity index 89% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Debtor.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Debtor.java index db2150fb..5e7b5fbc 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Debtor.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Debtor.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/DebtorPosition.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/DebtorPosition.java similarity index 76% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/DebtorPosition.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/DebtorPosition.java index f94c7502..c53bbf4d 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/DebtorPosition.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/DebtorPosition.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Details.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Details.java similarity index 76% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Details.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Details.java index 0ea7c01a..80a08d30 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Details.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Details.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Info.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Info.java similarity index 85% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Info.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Info.java index 6c9b5829..d2ec714e 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Info.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Info.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MBD.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MBD.java similarity index 89% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MBD.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MBD.java index c9915023..c39d0a89 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MBD.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MBD.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MapEntry.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MapEntry.java similarity index 80% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MapEntry.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MapEntry.java index 33ec469a..a688e8d1 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/MapEntry.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/MapEntry.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Payer.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Payer.java similarity index 89% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Payer.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Payer.java index 4c9f8ad6..3f177d01 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Payer.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Payer.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/PaymentInfo.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/PaymentInfo.java similarity index 91% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/PaymentInfo.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/PaymentInfo.java index c4259763..0737c9fa 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/PaymentInfo.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/PaymentInfo.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Psp.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Psp.java similarity index 83% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Psp.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Psp.java index 845f811a..04b4210d 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Psp.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Psp.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transaction.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transaction.java similarity index 88% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transaction.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transaction.java index d5415d26..25411c4f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transaction.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transaction.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionDetails.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionDetails.java similarity index 79% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionDetails.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionDetails.java index 618b9c2b..7200f892 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionDetails.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionDetails.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionPsp.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionPsp.java similarity index 77% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionPsp.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionPsp.java index 8ea3d875..212ed177 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/TransactionPsp.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/TransactionPsp.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transfer.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transfer.java similarity index 91% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transfer.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transfer.java index f45d4a82..8425aa65 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/Transfer.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/Transfer.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.*; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/User.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/User.java similarity index 72% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/User.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/User.java index 67b2be46..410953ea 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/User.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/User.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration.UserType; +import it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration.UserType; import lombok.*; @Getter diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/WalletItem.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/WalletItem.java similarity index 77% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/WalletItem.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/WalletItem.java index 44f95dc2..83d79a78 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/WalletItem.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/WalletItem.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event; +package it.gov.pagopa.receipt.pdf.generator.entity.event; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration.WalletType; +import it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration.WalletType; import lombok.*; import java.util.List; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/BizEventStatusType.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/BizEventStatusType.java similarity index 52% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/BizEventStatusType.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/BizEventStatusType.java index 8621574c..2fb49b1c 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/BizEventStatusType.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/BizEventStatusType.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration; +package it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration; public enum BizEventStatusType { NA, RETRY, FAILED, DONE diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/UserType.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/UserType.java similarity index 74% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/UserType.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/UserType.java index c2ab126b..30536ca5 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/event/enumeration/UserType.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/UserType.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.event.enumeration; +package it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration; import com.google.api.client.util.NullValue; import com.google.api.client.util.Value; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/WalletType.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/WalletType.java new file mode 100644 index 00000000..0d6c4578 --- /dev/null +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/event/enumeration/WalletType.java @@ -0,0 +1,5 @@ +package it.gov.pagopa.receipt.pdf.generator.entity.event.enumeration; + +public enum WalletType { + CARD, PAYPAL, BANCOMATPAY +} diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/EventData.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/EventData.java similarity index 81% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/EventData.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/EventData.java index f521da4d..61557548 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/EventData.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/EventData.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/IOMessageData.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/IOMessageData.java similarity index 78% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/IOMessageData.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/IOMessageData.java index 22be349d..6dbcf54f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/IOMessageData.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/IOMessageData.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReasonError.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReasonError.java similarity index 80% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReasonError.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReasonError.java index ae704f1e..8c571472 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReasonError.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReasonError.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/Receipt.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/Receipt.java similarity index 80% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/Receipt.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/Receipt.java index fdbe20da..c455d7c2 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/Receipt.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/Receipt.java @@ -1,6 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptStatusType; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptStatusType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptError.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptError.java similarity index 56% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptError.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptError.java index 0c864c24..9631eb1a 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptError.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptError.java @@ -1,7 +1,6 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptErrorStatusType; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptStatusType; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptErrorStatusType; import lombok.*; @Getter diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptMetadata.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptMetadata.java similarity index 76% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptMetadata.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptMetadata.java index 744b5f1a..50166acd 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/ReceiptMetadata.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/ReceiptMetadata.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReasonErrorCode.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReasonErrorCode.java similarity index 83% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReasonErrorCode.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReasonErrorCode.java index 3081c1bd..9b057b76 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReasonErrorCode.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReasonErrorCode.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration; public enum ReasonErrorCode { ERROR_QUEUE(902), ERROR_BLOB_STORAGE(901), ERROR_PDF_ENGINE(0); diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptErrorStatusType.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptErrorStatusType.java similarity index 60% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptErrorStatusType.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptErrorStatusType.java index 8cef13b3..41393edc 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptErrorStatusType.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptErrorStatusType.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration; public enum ReceiptErrorStatusType { TO_REVIEW, REVIEWED, NOT_TO_RETRY, REQUEUED diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptStatusType.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptStatusType.java similarity index 74% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptStatusType.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptStatusType.java index c304a173..7ffb1f20 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/entity/receipt/enumeration/ReceiptStatusType.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/entity/receipt/enumeration/ReceiptStatusType.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration; +package it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration; public enum ReceiptStatusType { NOT_QUEUE_SENT, INSERTED, RETRY, GENERATED, SIGNED, FAILED, IO_NOTIFIED, IO_ERROR_TO_NOTIFY, IO_NOTIFIER_RETRY, UNABLE_TO_SEND, NOT_TO_NOTIFY diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/BizEventNotValidException.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/BizEventNotValidException.java similarity index 88% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/BizEventNotValidException.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/BizEventNotValidException.java index 8a361b84..678c3d97 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/BizEventNotValidException.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/BizEventNotValidException.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.exception; +package it.gov.pagopa.receipt.pdf.generator.exception; /** Thrown in case the message triggering the function GenerateReceiptPdf is an invalid biz-event */ public class BizEventNotValidException extends Exception{ diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/ReceiptNotFoundException.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/ReceiptNotFoundException.java similarity index 91% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/ReceiptNotFoundException.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/ReceiptNotFoundException.java index 366ef9ab..35c57633 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/ReceiptNotFoundException.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/ReceiptNotFoundException.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.exception; +package it.gov.pagopa.receipt.pdf.generator.exception; /** Thrown in case no receipt is found in the CosmosDB container */ public class ReceiptNotFoundException extends Exception{ diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/UnableToQueueException.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/UnableToQueueException.java similarity index 90% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/UnableToQueueException.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/UnableToQueueException.java index 2ad5dc5c..64a0295f 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/exception/UnableToQueueException.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/UnableToQueueException.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.exception; +package it.gov.pagopa.receipt.pdf.generator.exception; public class UnableToQueueException extends Exception { diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/AppInfo.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/AppInfo.java similarity index 89% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/AppInfo.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/AppInfo.java index 0386b60e..b09c397c 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/AppInfo.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/AppInfo.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model; +package it.gov.pagopa.receipt.pdf.generator.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorMessage.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorMessage.java similarity index 83% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorMessage.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorMessage.java index 14e571b2..8fbbb147 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorMessage.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorMessage.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model; +package it.gov.pagopa.receipt.pdf.generator.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorResponse.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorResponse.java similarity index 86% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorResponse.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorResponse.java index 8200d5b1..94525da1 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfEngineErrorResponse.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfEngineErrorResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model; +package it.gov.pagopa.receipt.pdf.generator.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfGeneration.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfGeneration.java similarity index 84% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfGeneration.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfGeneration.java index 59509f73..42b7dd1e 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfGeneration.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfGeneration.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model; +package it.gov.pagopa.receipt.pdf.generator.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfMetadata.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfMetadata.java similarity index 85% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfMetadata.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfMetadata.java index 63b73e4c..74db5845 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/PdfMetadata.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/PdfMetadata.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model; +package it.gov.pagopa.receipt.pdf.generator.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/request/PdfEngineRequest.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/request/PdfEngineRequest.java similarity index 76% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/request/PdfEngineRequest.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/request/PdfEngineRequest.java index 690d6a6c..d6435c6d 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/request/PdfEngineRequest.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/request/PdfEngineRequest.java @@ -1,10 +1,9 @@ -package it.gov.pagopa.receipt.pdf.datastore.model.request; +package it.gov.pagopa.receipt.pdf.generator.model.request; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.io.InputStream; import java.net.URL; /** diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/BlobStorageResponse.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/BlobStorageResponse.java similarity index 82% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/BlobStorageResponse.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/BlobStorageResponse.java index af9f3526..ec38c1d1 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/BlobStorageResponse.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/BlobStorageResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model.response; +package it.gov.pagopa.receipt.pdf.generator.model.response; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/PdfEngineResponse.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/PdfEngineResponse.java similarity index 83% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/PdfEngineResponse.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/PdfEngineResponse.java index 357da385..eebe6c95 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/model/response/PdfEngineResponse.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/response/PdfEngineResponse.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.model.response; +package it.gov.pagopa.receipt.pdf.generator.model.response; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/service/GenerateReceiptPdfService.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/GenerateReceiptPdfService.java similarity index 93% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/service/GenerateReceiptPdfService.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/service/GenerateReceiptPdfService.java index 389e1892..0f450e79 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/service/GenerateReceiptPdfService.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/GenerateReceiptPdfService.java @@ -1,21 +1,21 @@ -package it.gov.pagopa.receipt.pdf.datastore.service; +package it.gov.pagopa.receipt.pdf.generator.service; import com.microsoft.azure.functions.OutputBinding; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.PdfEngineClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptBlobClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.BizEvent; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.ReasonError; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.ReceiptMetadata; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReasonErrorCode; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptStatusType; -import it.gov.pagopa.receipt.pdf.datastore.model.PdfGeneration; -import it.gov.pagopa.receipt.pdf.datastore.model.PdfMetadata; -import it.gov.pagopa.receipt.pdf.datastore.model.request.PdfEngineRequest; -import it.gov.pagopa.receipt.pdf.datastore.model.response.BlobStorageResponse; -import it.gov.pagopa.receipt.pdf.datastore.model.response.PdfEngineResponse; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; -import it.gov.pagopa.receipt.pdf.datastore.utils.TemplateMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.client.impl.PdfEngineClientImpl; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptBlobClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.event.BizEvent; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.ReasonError; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.ReceiptMetadata; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReasonErrorCode; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptStatusType; +import it.gov.pagopa.receipt.pdf.generator.model.PdfGeneration; +import it.gov.pagopa.receipt.pdf.generator.model.PdfMetadata; +import it.gov.pagopa.receipt.pdf.generator.model.request.PdfEngineRequest; +import it.gov.pagopa.receipt.pdf.generator.model.response.BlobStorageResponse; +import it.gov.pagopa.receipt.pdf.generator.model.response.PdfEngineResponse; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.utils.TemplateMapperUtils; import lombok.NoArgsConstructor; import org.apache.http.HttpStatus; import org.slf4j.Logger; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/ObjectMapperUtils.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/ObjectMapperUtils.java similarity index 96% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/ObjectMapperUtils.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/ObjectMapperUtils.java index 2d8cd73c..7ed16ef3 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/ObjectMapperUtils.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/ObjectMapperUtils.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.utils; +package it.gov.pagopa.receipt.pdf.generator.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/TemplateMapperUtils.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/TemplateMapperUtils.java similarity index 96% rename from src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/TemplateMapperUtils.java rename to src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/TemplateMapperUtils.java index d1960f49..0682a51e 100644 --- a/src/main/java/it/gov/pagopa/receipt/pdf/datastore/utils/TemplateMapperUtils.java +++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/utils/TemplateMapperUtils.java @@ -1,9 +1,9 @@ -package it.gov.pagopa.receipt.pdf.datastore.utils; +package it.gov.pagopa.receipt.pdf.generator.utils; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.BizEvent; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.Info; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.Transaction; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.TransactionDetails; +import it.gov.pagopa.receipt.pdf.generator.entity.event.BizEvent; +import it.gov.pagopa.receipt.pdf.generator.entity.event.Info; +import it.gov.pagopa.receipt.pdf.generator.entity.event.Transaction; +import it.gov.pagopa.receipt.pdf.generator.entity.event.TransactionDetails; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdfTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdfTest.java similarity index 97% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdfTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdfTest.java index bf004678..4e4209d5 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/GenerateReceiptPdfTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/GenerateReceiptPdfTest.java @@ -1,18 +1,18 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.microsoft.azure.functions.ExecutionContext; import com.microsoft.azure.functions.OutputBinding; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.PdfEngineClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptBlobClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptCosmosClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.EventData; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReasonErrorCode; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptStatusType; -import it.gov.pagopa.receipt.pdf.datastore.exception.BizEventNotValidException; -import it.gov.pagopa.receipt.pdf.datastore.exception.ReceiptNotFoundException; -import it.gov.pagopa.receipt.pdf.datastore.model.response.BlobStorageResponse; -import it.gov.pagopa.receipt.pdf.datastore.model.response.PdfEngineResponse; +import it.gov.pagopa.receipt.pdf.generator.client.impl.PdfEngineClientImpl; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptBlobClientImpl; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptCosmosClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.EventData; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReasonErrorCode; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptStatusType; +import it.gov.pagopa.receipt.pdf.generator.exception.BizEventNotValidException; +import it.gov.pagopa.receipt.pdf.generator.exception.ReceiptNotFoundException; +import it.gov.pagopa.receipt.pdf.generator.model.response.BlobStorageResponse; +import it.gov.pagopa.receipt.pdf.generator.model.response.PdfEngineResponse; import org.apache.http.HttpStatus; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/InfoTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/InfoTest.java similarity index 92% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/InfoTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/InfoTest.java index 32df8065..b5a7b986 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/InfoTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/InfoTest.java @@ -1,11 +1,11 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.microsoft.azure.functions.ExecutionContext; import com.microsoft.azure.functions.HttpRequestMessage; import com.microsoft.azure.functions.HttpResponseMessage; import com.microsoft.azure.functions.HttpStatus; -import it.gov.pagopa.receipt.pdf.datastore.model.AppInfo; -import it.gov.pagopa.receipt.pdf.datastore.util.HttpResponseMessageMock; +import it.gov.pagopa.receipt.pdf.generator.model.AppInfo; +import it.gov.pagopa.receipt.pdf.generator.util.HttpResponseMessageMock; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueueTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueueTest.java similarity index 96% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueueTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueueTest.java index 524966bc..f6cb13cb 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/ManageReceiptPoisonQueueTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/ManageReceiptPoisonQueueTest.java @@ -1,15 +1,15 @@ -package it.gov.pagopa.receipt.pdf.datastore; +package it.gov.pagopa.receipt.pdf.generator; import com.azure.core.http.rest.Response; import com.azure.storage.queue.models.SendMessageResult; import com.fasterxml.jackson.core.JsonProcessingException; import com.microsoft.azure.functions.ExecutionContext; import com.microsoft.azure.functions.OutputBinding; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptQueueClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.event.BizEvent; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.ReceiptError; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.enumeration.ReceiptErrorStatusType; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptQueueClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.event.BizEvent; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.ReceiptError; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.enumeration.ReceiptErrorStatusType; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClientImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClientImplTest.java similarity index 96% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClientImplTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClientImplTest.java index 8cf5ff68..f423d4fd 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/PdfEngineClientImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/PdfEngineClientImplTest.java @@ -1,9 +1,8 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.PdfEngineClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.model.request.PdfEngineRequest; -import it.gov.pagopa.receipt.pdf.datastore.model.response.PdfEngineResponse; -import org.apache.commons.io.FileUtils; +import it.gov.pagopa.receipt.pdf.generator.client.impl.PdfEngineClientImpl; +import it.gov.pagopa.receipt.pdf.generator.model.request.PdfEngineRequest; +import it.gov.pagopa.receipt.pdf.generator.model.response.PdfEngineResponse; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; import org.apache.http.StatusLine; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClientImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClientImplTest.java similarity index 95% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClientImplTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClientImplTest.java index 1f58d1a0..77093354 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptBlobClientImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptBlobClientImplTest.java @@ -1,12 +1,12 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; import com.azure.core.http.rest.Response; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobContainerClient; import com.azure.storage.blob.BlobServiceClient; import com.microsoft.azure.functions.HttpStatus; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptBlobClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.model.response.BlobStorageResponse; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptBlobClientImpl; +import it.gov.pagopa.receipt.pdf.generator.model.response.BlobStorageResponse; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClientImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClientImplTest.java similarity index 93% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClientImplTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClientImplTest.java index 97ea5563..cecd7c51 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptCosmosClientImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptCosmosClientImplTest.java @@ -1,12 +1,12 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; import com.azure.cosmos.CosmosClient; import com.azure.cosmos.CosmosContainer; import com.azure.cosmos.CosmosDatabase; import com.azure.cosmos.util.CosmosPagedIterable; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptCosmosClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.entity.receipt.Receipt; -import it.gov.pagopa.receipt.pdf.datastore.exception.ReceiptNotFoundException; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptCosmosClientImpl; +import it.gov.pagopa.receipt.pdf.generator.entity.receipt.Receipt; +import it.gov.pagopa.receipt.pdf.generator.exception.ReceiptNotFoundException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClientImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClientImplTest.java similarity index 92% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClientImplTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClientImplTest.java index 9eacc388..dd65c8f0 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/client/ReceiptQueueClientImplTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/client/ReceiptQueueClientImplTest.java @@ -1,11 +1,10 @@ -package it.gov.pagopa.receipt.pdf.datastore.client; +package it.gov.pagopa.receipt.pdf.generator.client; import com.azure.core.http.rest.Response; import com.azure.storage.queue.QueueClient; import com.azure.storage.queue.models.SendMessageResult; import com.microsoft.azure.functions.HttpStatus; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptCosmosClientImpl; -import it.gov.pagopa.receipt.pdf.datastore.client.impl.ReceiptQueueClientImpl; +import it.gov.pagopa.receipt.pdf.generator.client.impl.ReceiptQueueClientImpl; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/HttpResponseMessageMock.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/util/HttpResponseMessageMock.java similarity index 97% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/HttpResponseMessageMock.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/util/HttpResponseMessageMock.java index c9cae12c..a5846644 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/HttpResponseMessageMock.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/util/HttpResponseMessageMock.java @@ -1,4 +1,4 @@ -package it.gov.pagopa.receipt.pdf.datastore.util; +package it.gov.pagopa.receipt.pdf.generator.util; import com.microsoft.azure.functions.HttpResponseMessage; diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/ObjectMapperUtilsTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/util/ObjectMapperUtilsTest.java similarity index 80% rename from src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/ObjectMapperUtilsTest.java rename to src/test/java/it/gov/pagopa/receipt/pdf/generator/util/ObjectMapperUtilsTest.java index 0097f2c3..c207de88 100644 --- a/src/test/java/it/gov/pagopa/receipt/pdf/datastore/util/ObjectMapperUtilsTest.java +++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/util/ObjectMapperUtilsTest.java @@ -1,7 +1,7 @@ -package it.gov.pagopa.receipt.pdf.datastore.util; +package it.gov.pagopa.receipt.pdf.generator.util; import com.fasterxml.jackson.core.JsonProcessingException; -import it.gov.pagopa.receipt.pdf.datastore.utils.ObjectMapperUtils; +import it.gov.pagopa.receipt.pdf.generator.utils.ObjectMapperUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test;