Merge pull request #3840 from nationalarchives/master

Update Play Framework to v3
nationalarchives · Apr 12, 2024 · 95ee0f3 · 95ee0f3
2 parents cc1a5fc + ea6d3be
commit 95ee0f3
Show file tree

Hide file tree

Showing 10 changed files with 859 additions and 1,032 deletions.
diff --git a/app/configuration/ApplicationConfig.scala b/app/configuration/ApplicationConfig.scala
@@ -19,6 +19,8 @@ class ApplicationConfig @Inject() (configuration: Configuration) {
 
   val blockDraftMetadataUpload: Boolean = configuration.get[Boolean]("featureAccessBlock.blockDraftMetadataUpload")
 
+  val blockAutomateJudgmentTransfers: Boolean = configuration.get[Boolean]("featureAccessBlock.blockAutomateJudgmentTransfers")
+
   val metadataValidationBaseUrl: String = configuration.get[String]("metadatavalidation.baseUrl")
 
   val s3Endpoint: String = configuration.get[String]("s3.endpoint")

diff --git a/app/controllers/ConfirmTransferController.scala b/app/controllers/ConfirmTransferController.scala
@@ -142,6 +142,9 @@ class ConfirmTransferController @Inject() (
       }
     } yield res
   }
+
+  def judgmentChecksPassedSubmit(consignmentId: UUID): Action[AnyContent] = finalJudgmentTransferConfirmationSubmit(consignmentId: UUID)
+
 }
 
 case class ConsignmentSummaryData(seriesCode: String, transferringBody: String, totalFiles: Int, consignmentReference: String)

diff --git a/app/controllers/FileChecksResultsController.scala b/app/controllers/FileChecksResultsController.scala
@@ -57,6 +57,7 @@ class FileChecksResultsController @Inject() (
 
   def judgmentFileCheckResultsPage(consignmentId: UUID): Action[AnyContent] = judgmentTypeAction(consignmentId) { implicit request: Request[AnyContent] =>
     val pageTitle = "Results of checks"
+    val blockAutomateJudgmentTransfers = applicationConfig.blockAutomateJudgmentTransfers
     for {
       consignmentStatuses <- consignmentStatusService.getConsignmentStatuses(consignmentId, request.token.bearerAccessToken)
       reference <- consignmentService.getConsignmentRef(consignmentId, request.token.bearerAccessToken)
@@ -69,12 +70,16 @@ class FileChecksResultsController @Inject() (
             fileCheck <- consignmentService.getConsignmentFileChecks(consignmentId, request.token.bearerAccessToken)
             result <-
               if (fileCheck.allChecksSucceeded) {
-                consignmentService
-                  .getConsignmentFilesData(consignmentId, request.token.bearerAccessToken)
-                  .flatMap(files => {
-                    val filename = files.files.head.metadata.clientSideOriginalFilePath.get
-                    Future(Ok(views.html.judgment.judgmentFileChecksResults(filename, pageTitle, consignmentId, reference, request.token.name)).uncache())
-                  })
+                if (blockAutomateJudgmentTransfers) {
+                  consignmentService
+                    .getConsignmentFilesData(consignmentId, request.token.bearerAccessToken)
+                    .flatMap(files => {
+                      val filename = files.files.head.metadata.clientSideOriginalFilePath.get
+                      Future(Ok(views.html.judgment.judgmentFileChecksResults(filename, pageTitle, consignmentId, reference, request.token.name)).uncache())
+                    })
+                } else {
+                  Future(Redirect(routes.ConfirmTransferController.judgmentChecksPassedSubmit(consignmentId)).uncache())
+                }
               } else {
                 Future(Ok(views.html.fileChecksResultsFailed(request.token.name, pageTitle, reference, isJudgmentUser = true)).uncache())
               }

diff --git a/conf/application.base.conf b/conf/application.base.conf
@@ -56,4 +56,5 @@ draft_metadata_s3_bucket_name = ${DRAFT_METADATA_S3_BUCKET_NAME}
 
 featureAccessBlock {
   blockDraftMetadataUpload=${BLOCK_DRAFT_METADATA_UPLOAD}
+  blockAutomateJudgmentTransfers=${BLOCK_AUTOMATE_JUDGMENT_TRANSFERS}
 }
diff --git a/conf/application.local-base.conf b/conf/application.local-base.conf
@@ -21,4 +21,5 @@ draft_metadata_s3_bucket_name = "tdr-draft-metadata-intg"
 
 featureAccessBlock {
   blockDraftMetadataUpload=false
+  blockAutomateJudgmentTransfers=false
 }
diff --git a/conf/routes b/conf/routes
@@ -74,4 +74,5 @@ GET         /judgment/:consignmentId/file-checks
 POST        /judgment/:consignmentId/file-check-progress                                    controllers.FileChecksController.fileCheckProgress(consignmentId: java.util.UUID)
 GET         /judgment/:consignmentId/file-checks-results                                    controllers.FileChecksResultsController.judgmentFileCheckResultsPage(consignmentId: java.util.UUID)
 POST        /judgment/:consignmentId/file-checks-results                                    controllers.ConfirmTransferController.finalJudgmentTransferConfirmationSubmit(consignmentId: java.util.UUID)
+GET         /judgment/:consignmentId/checks-passed                                          controllers.ConfirmTransferController.judgmentChecksPassedSubmit(consignmentId: java.util.UUID)
 GET         /judgment/:consignmentId/transfer-complete                                      controllers.TransferCompleteController.judgmentTransferComplete(consignmentId: java.util.UUID)
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,6 +142,9 @@ class ConfirmTransferController @Inject() ( @@
           }
         } yield res
       }
+      def judgmentChecksPassedSubmit(consignmentId: UUID): Action[AnyContent] = finalJudgmentTransferConfirmationSubmit(consignmentId: UUID)
     }
     case class ConsignmentSummaryData(seriesCode: String, transferringBody: String, totalFiles: Int, consignmentReference: String)
@@ Expand Down @@