PIN-4084 Resolved PR issues

pagopa · Nov 24, 2023 · 5d4a125 · 5d4a125
1 parent 794e1c7
commit 5d4a125
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/resources/interface-specification.yml b/src/main/resources/interface-specification.yml
@@ -824,8 +824,11 @@ components:
         id:
           type: string
           format: uuid
+        externalId:
+          $ref: '#/components/schemas/ExternalId'  
       required:
-        - id    
+        - id
+        - externalId
     Tenant:
       description: Tenant model
       type: object

diff --git a/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/TenantApiServiceImpl.scala b/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/TenantApiServiceImpl.scala
@@ -238,7 +238,7 @@ final case class TenantApiServiceImpl(
       tenantKind     <- getTenantKindLoadingCertifiedAttributes(tenant.attributes, tenant.externalId)
       _              <- updateSelfcareId(tenant, tenantKind)
       _              <- tenantManagementService.addTenantMail(tenant.id, seed.digitalAddress.toDependency)
-    } yield TenantUUID(tenant.id)
+    } yield TenantUUID(tenant.id, tenant.externalId.toApi)
 
     onComplete(result) {
       selfcareUpsertTenantResponse[TenantUUID](operationLabel)(selfcareUpsertTenant200)

diff --git a/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala b/src/main/scala/it/pagopa/interop/tenantprocess/api/impl/package.scala
@@ -42,7 +42,7 @@ package object impl extends SprayJsonSupport with DefaultJsonProtocol {
   implicit def tenantVerifierFormat: RootJsonFormat[TenantVerifier] = jsonFormat4(TenantVerifier)
   implicit def tenantRevokerFormat: RootJsonFormat[TenantRevoker]   = jsonFormat5(TenantRevoker)
 
-  implicit def compactTenantFormat: RootJsonFormat[CompactTenant] = jsonFormat1(CompactTenant)
+  implicit def compactTenantFormat: RootJsonFormat[CompactTenant] = jsonFormat2(CompactTenant)
   implicit def tenantFormat: RootJsonFormat[Tenant]               = jsonFormat11(Tenant)
   implicit def tenantsFormat: RootJsonFormat[Tenants]             = jsonFormat2(Tenants)
   implicit def problemErrorFormat: RootJsonFormat[ProblemError]   = jsonFormat2(ProblemError)