APIS-7031 Fix issue with responsible individual verification record i…

…n submit application approval request command handler (#500)
hmrc · Jun 12, 2024 · 00821db · 00821db
1 parent e2665fe
commit 00821db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/...ication/services/commands/submission/SubmitApplicationApprovalRequestCommandHandler.scala b/...ication/services/commands/submission/SubmitApplicationApprovalRequestCommandHandler.scala
@@ -133,7 +133,7 @@ class SubmitApplicationApprovalRequestCommandHandler @Inject() (
       _                                  <- E.liftF(stateHistoryRepository.insert(createStateHistory(updatedApp, cmd)))
       updatedSubmission                   = Submission.submit(cmd.timestamp, cmd.requesterEmail.text)(submission)
       savedSubmission                    <- E.liftF(submissionService.store(updatedSubmission))
-      createTouUpliftResult               = createTouUpliftVerificationRecordIfNeeded(isRequesterTheResponsibleIndividual, savedApp, savedSubmission, cmd)
+      createTouUpliftResult               = createResponsibleIndividualVerificationRecordIfNeeded(isRequesterTheResponsibleIndividual, savedApp, savedSubmission, cmd)
 
       verificationId <- E.liftF(createTouUpliftResult)
       _               = logCompletedApprovalRequest(savedApp)
@@ -181,20 +181,18 @@ class SubmitApplicationApprovalRequestCommandHandler @Inject() (
       cmd.timestamp
     )
 
-  private def createTouUpliftVerificationRecordIfNeeded(
+  private def createResponsibleIndividualVerificationRecordIfNeeded(
       isRequesterTheResponsibleIndividual: Boolean,
       application: StoredApplication,
       submission: Submission,
       cmd: SubmitApplicationApprovalRequest
     ): Future[Option[ResponsibleIndividualVerificationId]] = {
     if (!isRequesterTheResponsibleIndividual) {
       for {
-        verification <- responsibleIndividualVerificationService.createNewTouUpliftVerification(
+        verification <- responsibleIndividualVerificationService.createNewToUVerification(
                           application,
                           submission.id,
-                          submission.latestInstance.index,
-                          cmd.requesterName,
-                          cmd.requesterEmail
+                          submission.latestInstance.index
                         )
       } yield Some(verification.id)
 

diff --git a/...platform/modules/approvals/mocks/ResponsibleIndividualVerificationServiceMockModule.scala b/...platform/modules/approvals/mocks/ResponsibleIndividualVerificationServiceMockModule.scala
@@ -61,6 +61,17 @@ trait ResponsibleIndividualVerificationServiceMockModule extends MockitoSugar wi
       }
     }
 
+    object CreateNewToUVerification {
+
+      def thenCreateNewToUVerification(verificationId: ResponsibleIndividualVerificationId = ResponsibleIndividualVerificationId.random) = {
+        when(aMock.createNewToUVerification(*[StoredApplication], *[SubmissionId], *)).thenAnswer((appData: StoredApplication, submissionId: SubmissionId, index: Int) =>
+          Future.successful(
+            ResponsibleIndividualToUVerification(verificationId, appData.id, submissionId, index, appData.name, instant)
+          )
+        )
+      }
+    }
+
     object GetVerification {
 
       def thenGetVerification(code: String) = {

diff --git a/...ion/services/commands/submission/SubmitApplicationApprovalRequestCommandHandlerSpec.scala b/...ion/services/commands/submission/SubmitApplicationApprovalRequestCommandHandlerSpec.scala
@@ -122,7 +122,7 @@ class SubmitApplicationApprovalRequestCommandHandlerSpec extends CommandHandlerB
       SubmissionsServiceMock.Store.thenReturn()
       ApplicationRepoMock.AddApplicationTermsOfUseAcceptance.thenReturn(app)
       val code = ResponsibleIndividualVerificationId.random
-      ResponsibleIndividualVerificationServiceMock.CreateNewTouUpliftVerification.thenCreateNewTouUpliftVerification(code)
+      ResponsibleIndividualVerificationServiceMock.CreateNewToUVerification.thenCreateNewToUVerification(code)
 
       val result = await(underTest.process(app, SubmitApplicationApprovalRequest(Actors.AppCollaborator(appAdminEmail), instant, appAdminName, appAdminEmail)).value).value