PIN-4667 - Allow agreement archiving only on Active or Suspended state (

#259)
pagopa · Mar 18, 2024 · 3ec2311 · 3ec2311
1 parent 84f1d66
commit 3ec2311
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala b/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/AgreementApiServiceImpl.scala
@@ -1347,6 +1347,7 @@ final case class AgreementApiServiceImpl(
       agreementUUID  <- agreementId.toFutureUUID
       agreement      <- agreementManagementService.getAgreementById(agreementUUID)
       _              <- assertRequesterIsConsumer(requesterOrgId, agreement)
+      _              <- agreement.assertArchivableState.toFuture
       updated        <- archive(agreement.toManagement)
       _ <- archivingPurposesQueueService.send[ArchiveEvent](ArchiveEvent(updated.id, offsetDateTimeSupplier.get()))
       _ <- archivingEservicesQueueService.send[ArchiveEvent](ArchiveEvent(updated.id, offsetDateTimeSupplier.get()))

diff --git a/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/ResponseHandlers.scala b/src/main/scala/it/pagopa/interop/agreementprocess/api/impl/ResponseHandlers.scala
@@ -72,10 +72,11 @@ object ResponseHandlers extends AkkaResponses {
     success: T => Route
   )(result: Try[T])(implicit contexts: Seq[(String, String)], logger: LoggerTakingImplicit[ContextFieldsToLog]): Route =
     result match {
-      case Success(s)                       => success(s)
-      case Failure(ex: AgreementNotFound)   => notFound(ex, logMessage)
-      case Failure(ex: OperationNotAllowed) => forbidden(ex, logMessage)
-      case Failure(ex)                      => internalServerError(ex, logMessage)
+      case Success(s)                               => success(s)
+      case Failure(ex: AgreementNotFound)           => notFound(ex, logMessage)
+      case Failure(ex: AgreementNotInExpectedState) => badRequest(ex, logMessage)
+      case Failure(ex: OperationNotAllowed)         => forbidden(ex, logMessage)
+      case Failure(ex)                              => internalServerError(ex, logMessage)
     }
 
   def suspendAgreementResponse[T](logMessage: String)(

diff --git a/src/test/scala/it/pagopa/interop/agreementprocess/AgreementArchiviationSpec.scala b/src/test/scala/it/pagopa/interop/agreementprocess/AgreementArchiviationSpec.scala
@@ -64,5 +64,48 @@ class AgreementArchiviationSpec extends AnyWordSpecLike with SpecHelper with Sca
         status shouldEqual StatusCodes.NotFound
       }
     }
+    "fail if agreement is in Pending state" in {
+      val agreement =
+        SpecData.agreement.copy(state = AgreementManagement.AgreementState.PENDING, consumerId = requesterOrgId)
+
+      mockAgreementRetrieve(agreement.toPersistent)
+
+      Get() ~> service.archiveAgreement(agreement.id.toString) ~> check {
+        status shouldEqual StatusCodes.BadRequest
+      }
+    }
+    "fail if agreement is in Draft state" in {
+      val agreement =
+        SpecData.agreement.copy(state = AgreementManagement.AgreementState.DRAFT, consumerId = requesterOrgId)
+
+      mockAgreementRetrieve(agreement.toPersistent)
+
+      Get() ~> service.archiveAgreement(agreement.id.toString) ~> check {
+        status shouldEqual StatusCodes.BadRequest
+      }
+    }
+    "fail if agreement is in MissingCertifiedAttributes state" in {
+      val agreement =
+        SpecData.agreement.copy(
+          state = AgreementManagement.AgreementState.MISSING_CERTIFIED_ATTRIBUTES,
+          consumerId = requesterOrgId
+        )
+
+      mockAgreementRetrieve(agreement.toPersistent)
+
+      Get() ~> service.archiveAgreement(agreement.id.toString) ~> check {
+        status shouldEqual StatusCodes.BadRequest
+      }
+    }
+    "fail if agreement is in Rejected state" in {
+      val agreement =
+        SpecData.agreement.copy(state = AgreementManagement.AgreementState.REJECTED, consumerId = requesterOrgId)
+
+      mockAgreementRetrieve(agreement.toPersistent)
+
+      Get() ~> service.archiveAgreement(agreement.id.toString) ~> check {
+        status shouldEqual StatusCodes.BadRequest
+      }
+    }
   }
 }