Merge pull request #21 from pagopa/PRDP-145-feat-add-logo-management

[PRDP-145] feat add logo management
pagopa · Oct 16, 2023 · bc4a79c · bc4a79c
2 parents b5e2e83 + 0171b06
commit bc4a79c
Show file tree

Hide file tree

Showing 14 changed files with 306 additions and 207 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -8,6 +8,9 @@ services:
     build:
       dockerfile: Dockerfile
       context: ../
+    environment:
+      BRAND_LOGO_MAP: '{"MASTERCARD":"assets/mastercard.png","VISA":"assets/visa.png","AMEX":"assets/amex.png","MAESTRO":"assets/maestro.png","JCB":"assets/jcb.png","OTHER":"","DINERS":"assets/diners.png","DISCOVER":"assets/discover.png","UNIONPAY":"assets/unionpay.png"}'
+      PSP_INFO_MAP: '{"60000000001":{"logo":"assets/nexi-logo.png","name":"Nexi","companyName":"Nexi Payments S.p.A.","address":"Corso Sempione","buildingNumber":"55","postalCode":"20149","city":"Milano","province":"MI","fee":{"amount":"2,00"}}}'
     env_file:
       - ./.env
     ports:

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopareceiptpdfgenerator
 description: Microservice description
 type: application
-version: 0.76.0
-appVersion: 1.3.2
+version: 0.83.0
+appVersion: 1.3.8-PRDP-145-feat-add-logo-management
 dependencies:
   - name: microservice-chart
     version: 2.4.0

diff --git a/helm/templates/configmaps.yaml b/helm/templates/configmaps.yaml
@@ -0,0 +1,10 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: template-maps
+  namespace: receipts
+data:
+  brand-logo-map: |
+    {"MASTERCARD":"assets/mastercard.png","VISA":"assets/visa.png","AMEX":"https://assets.cdn.platform.pagopa.it/payment-methods/amex.png","MAESTRO":"assets/maestro.png","JCB":"assets/jcb.png","OTHER":"","DINERS":"assets/diners.png","DISCOVER":"assets/discover.png","UNIONPAY":"assets/unionpay.png"}
+  psp-info-map: |
+    {"CIPBITMM":{"logo":"https://assets.cdn.io.italia.it/logos/abi/32875.png","name":"Nexi","companyName":"Nexi Payments S.p.A.","address":"Corso Sempione","buildingNumber":"55","postalCode":"20149","city":"Milano","province":"MI","fee":{"amount":"2,00"}}}
diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.2"
+    tag: "1.3.8-PRDP-145-feat-add-logo-management"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -100,6 +100,10 @@ microservice-chart:
     OTEL_LOGS_EXPORTER: none
     OTEL_TRACES_SAMPLER: "always_on"
     AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx1024m -XX:+UseG1GC"
+  envConfigMapExternals:
+    template-maps:
+      PSP_INFO_MAP: psp-info-map
+      BRAND_LOGO_MAP: brand-logo-map
   envFieldRef:
     APP_NAME: "metadata.labels['app.kubernetes.io/instance']"
     APP_VERSION: "metadata.labels['app.kubernetes.io/version']"

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.2"
+    tag: "1.3.8-PRDP-145-feat-add-logo-management"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -54,14 +54,14 @@ microservice-chart:
     allowPrivilegeEscalation: false
   resources:
     requests:
-      memory: "1512Mi"
-      cpu: "0.75"
+      memory: "1024Mi"
+      cpu: "0.40"
     limits:
       memory: "1512Mi"
       cpu: "0.75"
   autoscaling:
     enable: true
-    minReplica: 2
+    minReplica: 3
     maxReplica: 10
     pollingInterval: 10 # seconds
     cooldownPeriod: 50 # seconds
@@ -81,35 +81,39 @@ microservice-chart:
     ENV: "prod"
     WEBSITE_SITE_NAME: "pagopareceiptpdfgenerator" # required to show cloud role name in application insights
     FUNCTIONS_WORKER_RUNTIME: "java"
-    RECEIPT_QUEUE_TOPIC: 'pagopa-p-weu-receipts-queue-receipt-waiting-4-gen'
+    RECEIPT_QUEUE_TOPIC: "pagopa-p-weu-receipts-queue-receipt-waiting-4-gen"
     RECEIPT_QUEUE_TOPIC_POISON: "pagopa-d-weu-receipts-queue-receipt-waiting-4-gen-poison"
-    COSMOS_RECEIPT_QUEUE_MAX_RETRY: '5'
-    PDF_ENGINE_ENDPOINT: 'https://api.prod.platform.pagopa.it/shared/pdf-engine/v1/generate-pdf'
-    COSMOS_RECEIPT_SERVICE_ENDPOINT: 'https://pagopa-p-weu-receipts-ds-cosmos-account.documents.azure.com:443/'
-    COSMOS_RECEIPT_DB_NAME: 'db'
-    COSMOS_RECEIPT_CONTAINER_NAME: 'receipts'
-    BLOB_STORAGE_ACCOUNT_ENDPOINT: 'https://pagopapweureceiptsfnsa.blob.core.windows.net'
-    BLOB_STORAGE_CONTAINER_NAME: 'pagopa-p-weu-receipts-azure-blob-receipt-st-attach'
+    COSMOS_RECEIPT_QUEUE_MAX_RETRY: "5"
+    PDF_ENGINE_ENDPOINT: "https://api.prod.platform.pagopa.it/shared/pdf-engine/v1/generate-pdf"
+    COSMOS_RECEIPT_SERVICE_ENDPOINT: "https://pagopa-p-weu-receipts-ds-cosmos-account.documents.azure.com:443/"
+    COSMOS_RECEIPT_DB_NAME: "db"
+    COSMOS_RECEIPT_CONTAINER_NAME: "receipts"
+    BLOB_STORAGE_ACCOUNT_ENDPOINT: "https://pagopapweureceiptsfnsa.blob.core.windows.net"
+    BLOB_STORAGE_CONTAINER_NAME: "pagopa-p-weu-receipts-azure-blob-receipt-st-attach"
     WORKING_DIRECTORY_PATH: "/temp"
     ENABLE_ECS_CONSOLE: "true"
     CONSOLE_LOG_THRESHOLD: "DEBUG"
     CONSOLE_LOG_PATTERN: "%d{HH:mm:ss.SSS}[%thread]%-5level%logger{36}-%msg%n"
     CONSOLE_LOG_CHARSET: "UTF-8"
     OTEL_RESOURCE_ATTRIBUTES: "service.name=pagopareceiptpdfgeneratorotl,deployment.environment=prod"
     OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317"
-    OTEL_LOGS_EXPORTER: none
+    OTEL_LOGS_EXPORTER: "none"
     OTEL_TRACES_SAMPLER: "always_on"
     AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx1024m -XX:+UseG1GC"
+  envConfigMapExternals:
+    template-maps:
+      PSP_INFO_MAP: psp-info-map
+      BRAND_LOGO_MAP: brand-logo-map
   envFieldRef:
     APP_NAME: "metadata.labels['app.kubernetes.io/instance']"
     APP_VERSION: "metadata.labels['app.kubernetes.io/version']"
   envSecret:
-    APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string'
-    RECEIPTS_STORAGE_CONN_STRING: 'pdf-blob-storage-p-connection-string'
-    COSMOS_RECEIPTS_CONN_STRING: 'cosmos-receipt-p-connection-string'
-    OCP_APIM_SUBSCRIPTION_KEY: 'shared-apim-p-subscription-key'
+    APPLICATIONINSIGHTS_CONNECTION_STRING: "ai-p-connection-string"
+    RECEIPTS_STORAGE_CONN_STRING: "pdf-blob-storage-p-connection-string"
+    COSMOS_RECEIPTS_CONN_STRING: "cosmos-receipt-p-connection-string"
+    OCP_APIM_SUBSCRIPTION_KEY: "shared-apim-p-subscription-key"
     COSMOS_RECEIPT_KEY: "cosmos-receipt-pkey"
-    OTEL_EXPORTER_OTLP_HEADERS: 'elastic-otl-secret-token'
+    OTEL_EXPORTER_OTLP_HEADERS: "elastic-otl-secret-token"
   keyvault:
     name: "pagopa-p-receipts-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-receipt-pdf-generator
-    tag: "1.3.2"
+    tag: "1.3.8-PRDP-145-feat-add-logo-management"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:
@@ -54,8 +54,8 @@ microservice-chart:
     allowPrivilegeEscalation: false
   resources:
     requests:
-      memory: "1512Mi"
-      cpu: "0.75"
+      memory: "1024Mi"
+      cpu: "0.40"
     limits:
       memory: "1512Mi"
       cpu: "0.75"
@@ -81,15 +81,15 @@ microservice-chart:
     ENV: "uat"
     WEBSITE_SITE_NAME: "pagopareceiptpdfgenerator" # required to show cloud role name in application insights
     FUNCTIONS_WORKER_RUNTIME: "java"
-    RECEIPT_QUEUE_TOPIC: 'pagopa-u-weu-receipts-queue-receipt-waiting-4-gen'
+    RECEIPT_QUEUE_TOPIC: "pagopa-u-weu-receipts-queue-receipt-waiting-4-gen"
     RECEIPT_QUEUE_TOPIC_POISON: "pagopa-u-weu-receipts-queue-receipt-waiting-4-gen-poison"
-    COSMOS_RECEIPT_QUEUE_MAX_RETRY: '5'
-    PDF_ENGINE_ENDPOINT: 'https://api.uat.platform.pagopa.it/shared/pdf-engine/v1/generate-pdf'
-    COSMOS_RECEIPT_SERVICE_ENDPOINT: 'https://pagopa-u-weu-receipts-ds-cosmos-account.documents.azure.com:443/'
-    COSMOS_RECEIPT_DB_NAME: 'db'
-    COSMOS_RECEIPT_CONTAINER_NAME: 'receipts'
-    BLOB_STORAGE_ACCOUNT_ENDPOINT: 'https://pagopauweureceiptsfnsa.blob.core.windows.net'
-    BLOB_STORAGE_CONTAINER_NAME: 'pagopa-u-weu-receipts-azure-blob-receipt-st-attach'
+    COSMOS_RECEIPT_QUEUE_MAX_RETRY: "5"
+    PDF_ENGINE_ENDPOINT: "https://api.uat.platform.pagopa.it/shared/pdf-engine/v1/generate-pdf"
+    COSMOS_RECEIPT_SERVICE_ENDPOINT: "https://pagopa-u-weu-receipts-ds-cosmos-account.documents.azure.com:443/"
+    COSMOS_RECEIPT_DB_NAME: "db"
+    COSMOS_RECEIPT_CONTAINER_NAME: "receipts"
+    BLOB_STORAGE_ACCOUNT_ENDPOINT: "https://pagopauweureceiptsfnsa.blob.core.windows.net"
+    BLOB_STORAGE_CONTAINER_NAME: "pagopa-u-weu-receipts-azure-blob-receipt-st-attach"
     WORKING_DIRECTORY_PATH: "/temp"
     ENABLE_ECS_CONSOLE: "true"
     CONSOLE_LOG_THRESHOLD: "DEBUG"
@@ -100,16 +100,20 @@ microservice-chart:
     OTEL_LOGS_EXPORTER: "none"
     OTEL_TRACES_SAMPLER: "always_on"
     AZURE_FUNCTIONS_MESH_JAVA_OPTS: "-javaagent:/home/site/wwwroot/jmx_prometheus_javaagent-0.19.0.jar=12345:/home/site/wwwroot/config.yaml -javaagent:/home/site/wwwroot/opentelemetry-javaagent.jar -Xmx1024m -XX:+UseG1GC"
+  envConfigMapExternals:
+    template-maps:
+      PSP_INFO_MAP: psp-info-map
+      BRAND_LOGO_MAP: brand-logo-map
   envFieldRef:
     APP_NAME: "metadata.labels['app.kubernetes.io/instance']"
     APP_VERSION: "metadata.labels['app.kubernetes.io/version']"
   envSecret:
-    APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string'
+    APPLICATIONINSIGHTS_CONNECTION_STRING: "ai-u-connection-string"
     RECEIPTS_STORAGE_CONN_STRING: "receipts-storage-account-connection-string"
     COSMOS_RECEIPTS_CONN_STRING: "cosmos-receipt-connection-string"
-    OCP_APIM_SUBSCRIPTION_KEY: 'shared-apim-u-subscription-key'
+    OCP_APIM_SUBSCRIPTION_KEY: "shared-apim-u-subscription-key"
     COSMOS_RECEIPT_KEY: "cosmos-receipt-pkey"
-    OTEL_EXPORTER_OTLP_HEADERS: 'elastic-otl-secret-token'
+    OTEL_EXPORTER_OTLP_HEADERS: "elastic-otl-secret-token"
   keyvault:
     name: "pagopa-u-receipts-kv"
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"

diff --git a/host.json b/host.json
@@ -11,9 +11,9 @@
     "queues": {
       "maxPollingInterval": "00:00:02",
       "visibilityTimeout" : "00:00:30",
-      "batchSize": 8,
+      "batchSize": 12,
       "maxDequeueCount": 5,
-      "newBatchThreshold": 4,
+      "newBatchThreshold": 6,
       "messageEncoding": "none"
     }
   },

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>it.gov.pagopa.receipt</groupId>
     <artifactId>receipt-pdf-generator</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.8-PRDP-145-feat-add-logo-management</version>
     <packaging>jar</packaging>
 
     <name>pagopa-receipt-pdf-generator</name>

diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/PdfJsonMappingException.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/exception/PdfJsonMappingException.java
@@ -0,0 +1,8 @@
+package it.gov.pagopa.receipt.pdf.generator.exception;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public class PdfJsonMappingException extends RuntimeException {
+    public PdfJsonMappingException(JsonProcessingException e) {
+    }
+}
diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/template/PSP.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/model/template/PSP.java
@@ -13,5 +13,12 @@ public class PSP {
 
     private String name;
     private PSPFee fee;
+    private String companyName;
+    private String logo;
+    private String address;
+    private String buildingNumber;
+    private String postalCode;
+    private String city;
+    private String province;
 
 }
diff --git a/.../java/it/gov/pagopa/receipt/pdf/generator/service/impl/GenerateReceiptPdfServiceImpl.java b/.../java/it/gov/pagopa/receipt/pdf/generator/service/impl/GenerateReceiptPdfServiceImpl.java
@@ -220,12 +220,7 @@ private ReceiptPDFTemplate buildTemplate(BizEvent bizEvent, boolean partialTempl
                         .id(BizEventToPdfMapper.getId(bizEvent))
                         .timestamp(BizEventToPdfMapper.getTimestamp(bizEvent))
                         .amount(BizEventToPdfMapper.getAmount(bizEvent))
-                        .psp(PSP.builder()
-                                .name(BizEventToPdfMapper.getPspName(bizEvent))
-                                .fee(PSPFee.builder()
-                                        .amount(BizEventToPdfMapper.getPspFee(bizEvent))
-                                        .build())
-                                .build())
+                        .psp(BizEventToPdfMapper.getPsp(bizEvent))
                         .rrn(BizEventToPdfMapper.getRnn(bizEvent))
                         .paymentMethod(PaymentMethod.builder()
                                 .name(BizEventToPdfMapper.getPaymentMethodName(bizEvent))