Skip to content

Commit

Permalink
PIN-4084 Change name to TenantUUID
Browse files Browse the repository at this point in the history
  • Loading branch information
nttdata-rtorsoli committed Nov 24, 2023
1 parent 5d4a125 commit 4145b24
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import it.pagopa.interop.tenantprocess.api.adapters.TenantManagementAdapters._
import it.pagopa.interop.tenantprocess.error.ResponseHandlers._
import it.pagopa.interop.tenantprocess.error.TenantProcessErrors._
import it.pagopa.interop.tenantprocess.model._
import it.pagopa.interop.tenantprocess.model.{CompactTenant => TenantUUID}
import it.pagopa.interop.tenantprocess.model.{CompactTenant => ProcessCompactTenant}
import it.pagopa.interop.tenantprocess.service._
import it.pagopa.interop.tenantmanagement.model.tenant.PersistentExternalId

Expand Down Expand Up @@ -208,7 +208,7 @@ final case class TenantApiServiceImpl(

override def selfcareUpsertTenant(seed: SelfcareTenantSeed)(implicit
contexts: Seq[(String, String)],
toEntityMarshallerTenant: ToEntityMarshaller[TenantUUID],
toEntityMarshallerTenant: ToEntityMarshaller[ProcessCompactTenant],
toEntityMarshallerProblem: ToEntityMarshaller[Problem]
): Route = authorize(ADMIN_ROLE, API_ROLE, SECURITY_ROLE, INTERNAL_ROLE) {
val operationLabel = s"Creating tenant with external id ${seed.externalId} via SelfCare request"
Expand All @@ -230,18 +230,18 @@ final case class TenantApiServiceImpl(
tenant.selfcareId.fold(updateTenant())(verifyConflict)
}

val result: Future[TenantUUID] = for {
val result: Future[ProcessCompactTenant] = for {
existingTenant <- findTenant(seed.externalId)
_ <- existingTenant.traverse(t => assertResourceAllowed(t.id))
tenant <- existingTenant
.fold(createTenant(seed, Nil, now, getTenantKind(Nil, seed.externalId).fromAPI))(Future.successful)
tenantKind <- getTenantKindLoadingCertifiedAttributes(tenant.attributes, tenant.externalId)
_ <- updateSelfcareId(tenant, tenantKind)
_ <- tenantManagementService.addTenantMail(tenant.id, seed.digitalAddress.toDependency)
} yield TenantUUID(tenant.id, tenant.externalId.toApi)
} yield ProcessCompactTenant(tenant.id, tenant.externalId.toApi)

onComplete(result) {
selfcareUpsertTenantResponse[TenantUUID](operationLabel)(selfcareUpsertTenant200)
selfcareUpsertTenantResponse[ProcessCompactTenant](operationLabel)(selfcareUpsertTenant200)
}
}

Expand Down

0 comments on commit 4145b24

Please sign in to comment.