From 406c83259186fe9283942ca65140d2e0c18c2a3e Mon Sep 17 00:00:00 2001
From: Riccardo Torsoli <riccardo.torsoli@nttdata.com>
Date: Wed, 26 Jul 2023 16:55:37 +0200
Subject: [PATCH] PIN-3679 Resolved PR issues

---
 src/main/resources/agreementTemplate/index.html      |  4 ++--
 .../service/AgreementContractCreator.scala           |  6 ++++--
 .../agreementprocess/service/PDFCreator.scala        | 12 ++++++++----
 .../agreementprocess/service/util/PDFPayload.scala   |  6 ++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/agreementTemplate/index.html b/src/main/resources/agreementTemplate/index.html
index dc7ff1b4..be4d348a 100644
--- a/src/main/resources/agreementTemplate/index.html
+++ b/src/main/resources/agreementTemplate/index.html
@@ -42,9 +42,9 @@ <h1>Richiesta di fruizione</h1>
     In data <strong>${todayDate}</strong> alle ore <strong>${todayTime}</strong>, l’Infrastruttura ha ricevuto la
     richiesta di fruizione contraddistinta da id <strong>${agreementId}</strong> (di seguito “Richiesta di Fruizione”),
     inviata dall’aderente
-    <strong>${consumerName} (codice IPA: ${consumerValue}) </strong> (di seguito “Fruitore”), tramite l’operatore amministrativo
+    <strong>${consumerText}</strong> (di seguito “Fruitore”), tramite l’operatore amministrativo
     <strong>${submitter}</strong>,
-    per l’E-service <strong>${eServiceName}</strong> reso disponibile dall’aderente <strong>${producerName} (codice IPA: ${producerValue})</strong>
+    per l’E-service <strong>${eServiceName}</strong> reso disponibile dall’aderente <strong>${producerText}</strong>
     (di seguito “Erogatore”) di cui il Fruitore soddisfa i seguenti requisiti di fruizione per lo stesso previsti
     dall’Erogatore.
 </div>
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala b/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala
index 4b82ca57..c9937990 100644
--- a/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala
+++ b/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala
@@ -157,9 +157,11 @@ final class AgreementContractCreator(
       agreementId = agreement.id,
       eService = eService.name,
       producerName = producer.name,
-      producerValue = producer.externalId.value,
+      producerOrigin = producer.externalId.origin,
+      producerIPACode = producer.externalId.value,
       consumerName = consumer.name,
-      consumerValue = consumer.externalId.value,
+      consumerOrigin = consumer.externalId.origin,
+      consumerIPACode = consumer.externalId.value,
       certified = certified,
       declared = declared,
       verified = verified,
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/service/PDFCreator.scala b/src/main/scala/it/pagopa/interop/agreementprocess/service/PDFCreator.scala
index 4b288cbb..84521113 100644
--- a/src/main/scala/it/pagopa/interop/agreementprocess/service/PDFCreator.scala
+++ b/src/main/scala/it/pagopa/interop/agreementprocess/service/PDFCreator.scala
@@ -65,13 +65,17 @@ object PDFCreator extends PDFCreator with PDFManager {
       "activationTime"      -> activationTime,
       "activator"           -> pdfPayload.activator,
       "eServiceName"        -> pdfPayload.eService,
-      "producerName"        -> pdfPayload.producerName,
-      "producerValue"       -> pdfPayload.producerValue,
-      "consumerName"        -> pdfPayload.consumerName,
-      "consumerValue"       -> pdfPayload.consumerValue
+      "producerText" -> getTenantText(pdfPayload.producerName, pdfPayload.producerOrigin, pdfPayload.producerIPACode),
+      "consumerText" -> getTenantText(pdfPayload.consumerName, pdfPayload.consumerOrigin, pdfPayload.consumerIPACode)
     )
   }
 
+  private def getTenantText(name: String, origin: String, value: String): String = {
+    if (origin == "IPA")
+      s"$name (codice IPA: ${value})"
+    else name
+  }
+
   private def getDeclaredAttributesText(declared: Seq[(ClientAttribute, PersistentDeclaredAttribute)]): String =
     declared.map { case (clientAttribute, tenantAttribute) =>
       val date = getDateText(tenantAttribute.assignmentTimestamp)
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/service/util/PDFPayload.scala b/src/main/scala/it/pagopa/interop/agreementprocess/service/util/PDFPayload.scala
index ad9be648..a2be7cfc 100644
--- a/src/main/scala/it/pagopa/interop/agreementprocess/service/util/PDFPayload.scala
+++ b/src/main/scala/it/pagopa/interop/agreementprocess/service/util/PDFPayload.scala
@@ -15,9 +15,11 @@ final case class PDFPayload(
   agreementId: UUID,
   eService: String,
   producerName: String,
+  producerOrigin: String,
+  producerIPACode: String,
   consumerName: String,
-  producerValue: String,
-  consumerValue: String,
+  consumerOrigin: String,
+  consumerIPACode: String,
   certified: Seq[(ClientAttribute, PersistentCertifiedAttribute)],
   declared: Seq[(ClientAttribute, PersistentDeclaredAttribute)],
   verified: Seq[(ClientAttribute, PersistentVerifiedAttribute)],