PIN-4488 Corrections after merge

pagopa · Feb 6, 2024 · ad102b6 · ad102b6
1 parent 6c79321
commit ad102b6
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/src/main/scala/it/pagopa/interop/catalogprocess/api/impl/ProcessApiServiceImpl.scala b/src/main/scala/it/pagopa/interop/catalogprocess/api/impl/ProcessApiServiceImpl.scala
@@ -73,7 +73,7 @@ final case class ProcessApiServiceImpl(
       origin         <- getExternalIdOriginFuture(contexts)
       _              <- if (origin == IPA) Future.unit else Future.failed(OriginIsNotCompliant(IPA))
       clientSeed = eServiceSeed.toDependency(organizationId)
-      _               <- checkDuplicateName(None, eServiceSeed.name, clientSeed.producerId)
+      _               <- checkDuplicateName(organizationId, None, eServiceSeed.name, clientSeed.producerId)
       createdEService <- catalogManagementService.createEService(clientSeed)
     } yield createdEService.toApi
 
@@ -481,9 +481,25 @@ final case class ProcessApiServiceImpl(
     }
   }
 
-  private def checkDuplicateName(eServiceId: Option[UUID], name: String, producerId: UUID): Future[Unit] = for {
+  private def checkDuplicateName(
+    requesterId: UUID,
+    eServiceId: Option[UUID],
+    name: String,
+    producerId: UUID
+  ): Future[Unit] = for {
     result <- catalogManagementService
-      .getEServices(name.some, Seq.empty, Seq(producerId), Seq.empty, Seq.empty, None, 0, 1, exactMatchOnName = true)
+      .getEServices(
+        requesterId,
+        name.some,
+        Seq.empty,
+        Seq(producerId),
+        Seq.empty,
+        Seq.empty,
+        None,
+        0,
+        1,
+        exactMatchOnName = true
+      )
     eservice = eServiceId.fold(result.results)(id => result.results.filterNot(_.id == id))
     _ <- eservice.headOption.map(_.name).fold(Future.unit)(_ => Future.failed(DuplicatedEServiceName(name)))
   } yield ()
@@ -497,13 +513,13 @@ final case class ProcessApiServiceImpl(
     logger.info(operationLabel)
 
     val result = for {
-      organizationId  <- getOrganizationIdFutureUUID(contexts)
-      eServiceUuid    <- eServiceId.toFutureUUID
-      catalogItem     <- catalogManagementService.getEServiceById(eServiceUuid)
-      _               <- assertRequesterAllowed(catalogItem.producerId)(organizationId)
-      _               <- eServiceCanBeUpdated(catalogItem).toFuture
-      _               <- checkDuplicateName(Some(eServiceUuid), updateEServiceSeed.name, catalogItem.producerId)
-      _               <- deleteRiskAnalysisOnModeUpdate(updateEServiceSeed.mode, catalogItem)
+      organizationId <- getOrganizationIdFutureUUID(contexts)
+      eServiceUuid   <- eServiceId.toFutureUUID
+      catalogItem    <- catalogManagementService.getEServiceById(eServiceUuid)
+      _              <- assertRequesterAllowed(catalogItem.producerId)(organizationId)
+      _              <- eServiceCanBeUpdated(catalogItem).toFuture
+      _ <- checkDuplicateName(organizationId, Some(eServiceUuid), updateEServiceSeed.name, catalogItem.producerId)
+      _ <- deleteRiskAnalysisOnModeUpdate(updateEServiceSeed.mode, catalogItem)
       updatedEService <- catalogManagementService.updateEServiceById(eServiceId, updateEServiceSeed.toDependency)
     } yield updatedEService.toApi
 

diff --git a/src/test/scala/it/pagopa/interop/catalogprocess/CatalogProcessSpec.scala b/src/test/scala/it/pagopa/interop/catalogprocess/CatalogProcessSpec.scala
@@ -628,6 +628,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
 
       (mockCatalogManagementService
         .getEServices(
+          _: UUID,
           _: Option[String],
           _: Seq[UUID],
           _: Seq[UUID],
@@ -636,9 +637,11 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           _: Option[CatalogItemMode],
           _: Int,
           _: Int,
+          _: Boolean,
           _: Boolean
         )(_: ExecutionContext, _: ReadModelService))
         .expects(
+          requesterId,
           Some(updatedEServiceSeed.name),
           Seq.empty,
           Seq(requesterId),
@@ -648,6 +651,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           0,
           1,
           true,
+          false,
           *,
           *
         )
@@ -709,6 +713,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
 
       (mockCatalogManagementService
         .getEServices(
+          _: UUID,
           _: Option[String],
           _: Seq[UUID],
           _: Seq[UUID],
@@ -717,9 +722,11 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           _: Option[CatalogItemMode],
           _: Int,
           _: Int,
+          _: Boolean,
           _: Boolean
         )(_: ExecutionContext, _: ReadModelService))
         .expects(
+          requesterId,
           Some(updatedEServiceSeed.name),
           Seq.empty,
           Seq(requesterId),
@@ -729,6 +736,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           0,
           1,
           true,
+          false,
           *,
           *
         )
@@ -810,6 +818,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
 
       (mockCatalogManagementService
         .getEServices(
+          _: UUID,
           _: Option[String],
           _: Seq[UUID],
           _: Seq[UUID],
@@ -818,9 +827,11 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           _: Option[CatalogItemMode],
           _: Int,
           _: Int,
+          _: Boolean,
           _: Boolean
         )(_: ExecutionContext, _: ReadModelService))
         .expects(
+          requesterId,
           Some(updatedEServiceSeed.name),
           Seq.empty,
           Seq(requesterId),
@@ -830,6 +841,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           0,
           1,
           true,
+          false,
           *,
           *
         )
@@ -896,6 +908,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
 
       (mockCatalogManagementService
         .getEServices(
+          _: UUID,
           _: Option[String],
           _: Seq[UUID],
           _: Seq[UUID],
@@ -904,9 +917,11 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           _: Option[CatalogItemMode],
           _: Int,
           _: Int,
+          _: Boolean,
           _: Boolean
         )(_: ExecutionContext, _: ReadModelService))
         .expects(
+          requesterId,
           Some(updatedEServiceSeed.name),
           Seq.empty,
           Seq(requesterId),
@@ -916,6 +931,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           0,
           1,
           true,
+          false,
           *,
           *
         )
@@ -960,6 +976,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
 
       (mockCatalogManagementService
         .getEServices(
+          _: UUID,
           _: Option[String],
           _: Seq[UUID],
           _: Seq[UUID],
@@ -968,9 +985,11 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           _: Option[CatalogItemMode],
           _: Int,
           _: Int,
+          _: Boolean,
           _: Boolean
         )(_: ExecutionContext, _: ReadModelService))
         .expects(
+          requesterId,
           Some(updatedEServiceSeed.name),
           Seq.empty,
           Seq(requesterId),
@@ -980,6 +999,7 @@ class CatalogProcessSpec extends SpecHelper with AnyWordSpecLike with ScalatestR
           0,
           1,
           true,
+          false,
           *,
           *
         )