PIN-4295 Cleaning

pagopa · Nov 28, 2023 · 356d94b · 356d94b
1 parent 994dcdf
commit 356d94b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/common/Adapters.scala b/src/main/scala/it/pagopa/interop/agreementprocess/common/Adapters.scala
@@ -415,6 +415,7 @@ object Adapters {
       uuid    <- id.toUUID.toEither
       name    <- ur.name.toRight(SelfcareEntityNotFilled(ur.getClass().getName(), "name"))
       surname <- ur.surname.toRight(SelfcareEntityNotFilled(ur.getClass().getName(), "surname"))
-    } yield UserResponse(id = uuid, name = name, surname = surname)
+      taxCode <- ur.taxCode.toRight(SelfcareEntityNotFilled(ur.getClass().getName(), "taxCode"))
+    } yield UserResponse(id = uuid, name = name, surname = surname, taxCode = taxCode)
   }
 }
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala b/src/main/scala/it/pagopa/interop/agreementprocess/service/AgreementContractCreator.scala
@@ -141,7 +141,7 @@ final class AgreementContractCreator(
       activator = getUserText(userResponseApi)
     } yield (activator, activation.when)
 
-  def getUserText(user: UserResponse): String = s"${user.name} ${user.surname}"
+  def getUserText(user: UserResponse): String = s"${user.name} ${user.surname} (${user.taxCode})"
 
   def getPdfPayload(
     agreement: PersistentAgreement,

diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/service/model/UserResponse.scala b/src/main/scala/it/pagopa/interop/agreementprocess/service/model/UserResponse.scala
@@ -2,4 +2,4 @@ package it.pagopa.interop.agreementprocess.service.model
 
 import java.util.UUID
 
-final case class UserResponse(id: UUID, name: String, surname: String)
+final case class UserResponse(id: UUID, name: String, surname: String, taxCode: String)
diff --git a/src/test/scala/it/pagopa/interop/agreementprocess/SpecData.scala b/src/test/scala/it/pagopa/interop/agreementprocess/SpecData.scala
@@ -329,6 +329,12 @@ object SpecData {
     createdAt = timestamp
   )
 
-  def userResource(name: String, familyName: String, email: String): UserResponse =
-    UserResponse(surname = Some(familyName), id = Some(SpecData.who.toString), name = Some(name), email = Some(email))
+  def userResponse(name: String, familyName: String, fiscalCode: String, email: String): UserResponse =
+    UserResponse(
+      surname = Some(familyName),
+      taxCode = Some(fiscalCode),
+      id = Some(SpecData.who.toString),
+      name = Some(name),
+      email = Some(email)
+    )
 }
diff --git a/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala b/src/test/scala/it/pagopa/interop/agreementprocess/SpecHelper.scala
@@ -296,8 +296,8 @@ trait SpecHelper extends MockFactory {
     mockAgreementContract
     mockTenantRetrieve(consumer.id, consumer)
     mockTenantRetrieve(producer.id, producer)
-    mockUserRegistryRetrieve(SpecData.userResource("a", "b", "c"))
-    mockUserRegistryRetrieve(SpecData.userResource("d", "e", "f"))
+    mockUserRegistryRetrieve(SpecData.userResponse("a", "b", "c", "e"))
+    mockUserRegistryRetrieve(SpecData.userResponse("d", "e", "f", "g"))
     mockAgreementUpdate(
       agreement.id,
       expectedSeed,
@@ -337,8 +337,8 @@ trait SpecHelper extends MockFactory {
     mockFileManagerWrite
     mockAgreementContract
     mockTenantRetrieve(producer.id, producer)
-    mockUserRegistryRetrieve(SpecData.userResource("a", "b", "c"))
-    mockUserRegistryRetrieve(SpecData.userResource("d", "e", "f"))
+    mockUserRegistryRetrieve(SpecData.userResponse("a", "b", "c", "e"))
+    mockUserRegistryRetrieve(SpecData.userResponse("d", "e", "f", "g"))
     mockClientStateUpdate(agreement.eserviceId, agreement.consumerId, agreement.id, ClientComponentState.ACTIVE)
     mockGetInstitution(consumer.selfcareId.get)
     mockGetInstitution(producer.selfcareId.get)
@@ -370,8 +370,8 @@ trait SpecHelper extends MockFactory {
     mockPDFCreatorCreate
     mockFileManagerWrite
     mockAgreementContract
-    mockUserRegistryRetrieve(SpecData.userResource("a", "b", "c"))
-    mockUserRegistryRetrieve(SpecData.userResource("d", "e", "f"))
+    mockUserRegistryRetrieve(SpecData.userResponse("a", "b", "c", "e"))
+    mockUserRegistryRetrieve(SpecData.userResponse("d", "e", "f", "g"))
     mockClientStateUpdate(agreement.eserviceId, agreement.consumerId, agreement.id, ClientComponentState.ACTIVE)
     mockGetInstitution(consumer.selfcareId.get)
     mockGetInstitution(producer.selfcareId.get)