APB-10760 new confirmation page with decision date (#209)

Author: nubz

app/uk/gov/hmrc/agentregistration/shared/AgentApplication.scala

@@ -38,6 +38,7 @@ sealed trait AgentApplication:
   def linkId: LinkId
   def groupId: GroupId
   def createdAt: Instant
+  def submittedAt: Option[Instant] // only populated when the application is submitted, not during the registration journey
   def applicationState: ApplicationState
   def businessType: BusinessType
   def userRole: Option[UserRole]
@@ -107,6 +108,8 @@ sealed trait AgentApplication:
     expectedDataNotDefinedError("numberOfIndividuals")
   )
 
+  def getSubmittedAt: Instant = submittedAt.getOrElse(expectedDataNotDefinedError("submittedAt"))
+
   private def as[T <: AgentApplication](using ct: reflect.ClassTag[T]): Option[T] =
     this match
       case t: T => Some(t)
@@ -132,6 +135,7 @@ final case class AgentApplicationSoleTrader(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsSoleTrader],
@@ -162,6 +166,7 @@ final case class AgentApplicationLlp(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsLlp],
@@ -191,6 +196,7 @@ final case class AgentApplicationLimitedCompany(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsLimitedCompany],
@@ -220,6 +226,7 @@ final case class AgentApplicationGeneralPartnership(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsGeneralPartnership],
@@ -247,6 +254,7 @@ final case class AgentApplicationLimitedPartnership(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsPartnership],
@@ -274,6 +282,7 @@ final case class AgentApplicationScottishLimitedPartnership(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsPartnership],
@@ -301,6 +310,7 @@ final case class AgentApplicationScottishPartnership(
   override val linkId: LinkId,
   override val groupId: GroupId,
   override val createdAt: Instant,
+  override val submittedAt: Option[Instant],
   override val applicationState: ApplicationState,
   override val userRole: Option[UserRole],
   businessDetails: Option[BusinessDetailsScottishPartnership],

app/uk/gov/hmrc/agentregistrationfrontend/config/AppConfig.scala

@@ -99,6 +99,8 @@ class AppConfig @Inject() (
   val companiesHouseUrl: String = ConfigHelper.readConfigAsValidUrlString("urls.companies-house", configuration)
   val contacHmrctUrl: String = ConfigHelper.readConfigAsValidUrlString("urls.contact-hmrc", configuration)
 
+  val applicationDecisionLeadTime: FiniteDuration = configuration.get[FiniteDuration]("application-decision-lead-time")
+
   object Upscan:
 
     val maxFileSize: ConfigMemorySize = configuration.underlying.getMemorySize("uploads.max-file-size")

app/uk/gov/hmrc/agentregistrationfrontend/connectors/AgentRegistrationRiskingConnector.scala

@@ -16,8 +16,10 @@
 
 package uk.gov.hmrc.agentregistrationfrontend.connectors
 
-import uk.gov.hmrc.agentregistrationfrontend.config.AppConfig
+import uk.gov.hmrc.agentregistration.shared.AgentApplicationId
 import uk.gov.hmrc.agentregistration.shared.risking.SubmitForRiskingRequest
+import uk.gov.hmrc.agentregistrationfrontend.config.AppConfig
+import uk.gov.hmrc.agentregistrationfrontend.model.ApplicationForRiskingStatus
 import uk.gov.hmrc.http.client.HttpClientV2
 
 import javax.inject.Inject
@@ -54,4 +56,22 @@ extends Connector:
             )
       .andLogOnFailure(s"Failed to submit agent application for risking: ${submitForRiskingRequest.agentApplication.agentApplicationId.value}")
 
+  def getApplicationStatus(agentApplicationId: AgentApplicationId)(using RequestHeader): Future[ApplicationForRiskingStatus] =
+    val url: URL = url"$baseUrl/application-status/${agentApplicationId.value}"
+    httpClient
+      .get(url)
+      .execute[HttpResponse]
+      .map: response =>
+        response.status match
+          case Status.OK => (response.json \ "status").as[ApplicationForRiskingStatus]
+          case other =>
+            Errors.throwUpstreamErrorResponse(
+              httpMethod = "GET",
+              url = url,
+              status = other,
+              response = response,
+              info = "get application status problem"
+            )
+      .andLogOnFailure(s"Failed to get application status for agent application ID: ${agentApplicationId.value}")
+
   private val baseUrl: String = appConfig.agentRegistrationRiskingBaseUrl + "/agent-registration-risking"

app/uk/gov/hmrc/agentregistrationfrontend/controllers/applicant/AgentApplicationController.scala

@@ -21,20 +21,31 @@ import play.api.mvc.AnyContent
 import play.api.mvc.MessagesControllerComponents
 import uk.gov.hmrc.agentregistration.shared.AgentApplication
 import uk.gov.hmrc.agentregistrationfrontend.action.applicant.ApplicantActions
+import uk.gov.hmrc.agentregistrationfrontend.config.AppConfig
+import uk.gov.hmrc.agentregistrationfrontend.model.ApplicationForRiskingStatus
+import uk.gov.hmrc.agentregistrationfrontend.services.applicant.AgentRegistrationRiskingService
+import uk.gov.hmrc.agentregistrationfrontend.util.DisplayDate.displayDateForLang
 import uk.gov.hmrc.agentregistrationfrontend.views.html.SimplePage
 import uk.gov.hmrc.agentregistrationfrontend.views.html.applicant.ConfirmationPage
 import uk.gov.hmrc.agentregistrationfrontend.views.html.applicant.ViewApplicationPage
 
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
 import javax.inject.Inject
 import javax.inject.Singleton
+import scala.concurrent.duration.FiniteDuration
 
 @Singleton
 class AgentApplicationController @Inject() (
   actions: ApplicantActions,
   mcc: MessagesControllerComponents,
   simplePage: SimplePage,
   confirmationPage: ConfirmationPage,
-  viewApplicationPage: ViewApplicationPage
+  viewApplicationPage: ViewApplicationPage,
+  appConfig: AppConfig,
+  agentRegistrationRiskingService: AgentRegistrationRiskingService
 )
 extends FrontendController(mcc, actions):
 
@@ -59,11 +70,36 @@ extends FrontendController(mcc, actions):
 
   def applicationSubmitted: Action[AnyContent] = actions
     .getApplicationSubmitted
-    .getBusinessPartnerRecord:
+    .async:
       implicit request =>
-        Ok(confirmationPage(
-          entityName = request.businessPartnerRecordResponse.getEntityName,
-          agentApplication = request.get[AgentApplication]
+        val agentApplication: AgentApplication = request.get
+        // make a call to risking for the latest status of the application
+        agentRegistrationRiskingService
+          .getApplicationStatus(agentApplication.agentApplicationId)
+          .map:
+            case ApplicationForRiskingStatus.ReadyForSubmission => // show the confirmation screen
+              val decisionLeadTime: FiniteDuration = appConfig.applicationDecisionLeadTime
+              val submittedAt: Instant = agentApplication.getSubmittedAt
+              val localDateOfDecision: LocalDate =
+                submittedAt
+                  .plus(decisionLeadTime.toMillis, ChronoUnit.MILLIS)
+                  .atZone(ZoneId.systemDefault())
+                  .toLocalDate
+              Ok(confirmationPage(
+                dateOfDecision = displayDateForLang(Some(localDateOfDecision)),
+                agentApplication = agentApplication
+              ))
+            case _ => Redirect(AppRoutes.apply.AgentApplicationController.viewApplicationProgress)
+
+  def viewApplicationProgress: Action[AnyContent] = actions
+    .getApplicationSubmitted:
+      implicit request =>
+        val agentApplication: AgentApplication = request.get
+        Ok(simplePage(
+          h1 = s"Application reference: ${agentApplication.agentApplicationId.value}",
+          bodyText = Some(
+            "Placeholder for the Application Progress page..."
+          )
         ))
 
   def viewSubmittedApplication: Action[AnyContent] = actions

app/uk/gov/hmrc/agentregistrationfrontend/controllers/applicant/DeclarationController.scala

@@ -31,11 +31,14 @@ import uk.gov.hmrc.agentregistrationfrontend.services.applicant.AgentRegistratio
 import uk.gov.hmrc.agentregistrationfrontend.services.individual.IndividualProvideDetailsService
 import uk.gov.hmrc.agentregistrationfrontend.views.html.applicant.DeclarationPage
 
+import java.time.Clock
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class DeclarationController @Inject() (
+  clock: Clock,
   mcc: MessagesControllerComponents,
   actions: ApplicantActions,
   view: DeclarationPage,
@@ -91,5 +94,7 @@ extends FrontendController(mcc, actions):
               request.agentApplication
                 .modify(_.applicationState)
                 .setTo(ApplicationState.SentForRisking)
+                .modify(_.submittedAt)
+                .setTo(Some(Instant.now(clock)))
             )
         yield Redirect(AppRoutes.apply.AgentApplicationController.applicationSubmitted)

app/uk/gov/hmrc/agentregistrationfrontend/controllers/applicant/TaskListController.scala

@@ -21,17 +21,12 @@ import play.api.mvc.AnyContent
 import play.api.mvc.MessagesControllerComponents
 import uk.gov.hmrc.agentregistration.shared.AgentApplication
 import uk.gov.hmrc.agentregistration.shared.BusinessPartnerRecordResponse
-import uk.gov.hmrc.agentregistration.shared.StateOfAgreement
 import uk.gov.hmrc.agentregistration.shared.hasCheckPassed
 import uk.gov.hmrc.agentregistration.shared.individual.IndividualProvidedDetails
-import uk.gov.hmrc.agentregistration.shared.individual.ProvidedDetailsState
-import uk.gov.hmrc.agentregistration.shared.lists.NumberOfIndividuals
-import uk.gov.hmrc.agentregistration.shared.util.SafeEquals.*
 import uk.gov.hmrc.agentregistrationfrontend.action.applicant.ApplicantActions
-import uk.gov.hmrc.agentregistrationfrontend.model.TaskListStatus
-import uk.gov.hmrc.agentregistrationfrontend.model.TaskStatus
-import uk.gov.hmrc.agentregistrationfrontend.views.html.applicant.TaskListPage
+import uk.gov.hmrc.agentregistrationfrontend.model.taskListStatus
 import uk.gov.hmrc.agentregistrationfrontend.services.individual.IndividualProvideDetailsService
+import uk.gov.hmrc.agentregistrationfrontend.views.html.applicant.TaskListPage
 
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -74,70 +69,3 @@ extends FrontendController(mcc, actions):
           entityName = request.get[BusinessPartnerRecordResponse].getEntityName,
           agentApplication = agentApplication
         ))
-
-  extension (agentApplication: AgentApplication)
-
-    def taskListStatus(existingList: List[IndividualProvidedDetails]): TaskListStatus = {
-      val contactIsComplete = agentApplication.applicantContactDetails.exists(_.isComplete)
-      val amlsDetailsCompleted = agentApplication.amlsDetails.exists(_.isComplete)
-      val agentDetailsIsComplete = agentApplication.agentDetails.exists(_.isComplete)
-      val hmrcStandardForAgentsAgreed = agentApplication.hmrcStandardForAgentsAgreed === StateOfAgreement.Agreed
-      def otherRelevantIndividualsComplete(existingList: List[IndividualProvidedDetails]): Boolean =
-        agentApplication.hasOtherRelevantIndividuals match
-          case Some(true) => existingList.exists(!_.isPersonOfControl)
-          case Some(false) => true
-          case None => false
-      def listDetailsCompleted(existingList: List[IndividualProvidedDetails]): Boolean =
-        agentApplication match
-          case a: AgentApplication.IsAgentApplicationForDeclaringNumberOfKeyIndividuals =>
-            NumberOfIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), a.numberOfIndividuals)
-            && otherRelevantIndividualsComplete(existingList)
-          case a: AgentApplication.IsIncorporated =>
-            NumberOfIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), a.numberOfIndividuals)
-            && otherRelevantIndividualsComplete(existingList)
-          case _ => false
-
-      val listProgressComplete = listDetailsCompleted(existingList) && existingList.forall(_.hasFinished)
-      // any state other than Precreated indicates the link has been sent; require the list to be non-empty
-      val listSharingComplete =
-        listDetailsCompleted(existingList) &&
-          existingList.forall(_.providedDetailsState =!= ProvidedDetailsState.Precreated)
-      TaskListStatus(
-        contactDetails = TaskStatus(
-          canStart = true, // Contact details can be started at any time
-          isComplete = contactIsComplete
-        ),
-        amlsDetails = TaskStatus(
-          canStart = true, // AMLS details can be started at any time
-          isComplete = amlsDetailsCompleted
-        ),
-        agentDetails = TaskStatus(
-          canStart = contactIsComplete, // Agent details can be started only when contact details are complete
-          isComplete = agentDetailsIsComplete
-        ),
-        hmrcStandardForAgents = TaskStatus(
-          canStart = true, // HMRC Standard for Agents can be started at any time
-          isComplete = hmrcStandardForAgentsAgreed
-        ),
-        listDetails = TaskStatus(
-          canStart = contactIsComplete, // List details can be started only once we have a contact name
-          isComplete = listDetailsCompleted(existingList)
-        ),
-        listShare = TaskStatus(
-          canStart = listDetailsCompleted(existingList), // List sharing cannot be started until list details are completed
-          isComplete = listSharingComplete
-        ),
-        listTracking = TaskStatus(
-          canStart = listSharingComplete, // List tracking cannot be started until list share is complete
-          isComplete = listProgressComplete
-        ),
-        declaration = TaskStatus(
-          canStart =
-            contactIsComplete
-              && amlsDetailsCompleted
-              && agentDetailsIsComplete
-              && hmrcStandardForAgentsAgreed, // Declaration can be started only when all prior tasks are complete
-          isComplete = false // Declaration is never "complete" until submission
-        )
-      )
-    }

app/uk/gov/hmrc/agentregistrationfrontend/model/AgentApplicationExt.scala

@@ -16,12 +16,12 @@
 
 package uk.gov.hmrc.agentregistrationfrontend.model
 
+import uk.gov.hmrc.agentregistration.shared.*
 import uk.gov.hmrc.agentregistration.shared.individual.IndividualProvidedDetails
 import uk.gov.hmrc.agentregistration.shared.individual.ProvidedDetailsState
-import uk.gov.hmrc.agentregistration.shared.lists.NumberOfRequiredKeyIndividuals
+import uk.gov.hmrc.agentregistration.shared.lists.NumberOfIndividuals
 import uk.gov.hmrc.agentregistration.shared.util.SafeEquals.=!=
 import uk.gov.hmrc.agentregistration.shared.util.SafeEquals.===
-import uk.gov.hmrc.agentregistration.shared.*
 
 extension (agentApplication: AgentApplication)
 
@@ -40,11 +40,12 @@ extension (agentApplication: AgentApplication)
     def listDetailsCompleted(existingList: List[IndividualProvidedDetails]): Boolean =
       agentApplication match
         case a: AgentApplication.IsAgentApplicationForDeclaringNumberOfKeyIndividuals =>
-          a.getNumberOfRequiredKeyIndividuals.exists(n =>
-            NumberOfRequiredKeyIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), n)
-          )
+          NumberOfIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), a.numberOfIndividuals)
+          && otherRelevantIndividualsComplete(existingList)
+        case a: AgentApplication.IsIncorporated =>
+          NumberOfIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), a.numberOfIndividuals)
           && otherRelevantIndividualsComplete(existingList)
-        case _ => true
+        case _ => false
 
     val listProgressComplete = listDetailsCompleted(existingList) && existingList.forall(_.hasFinished)
     // any state other than Precreated indicates the link has been sent; require the list to be non-empty

app/uk/gov/hmrc/agentregistrationfrontend/model/ApplicationForRiskingStatus.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2026 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package uk.gov.hmrc.agentregistrationfrontend.model
+
+import play.api.libs.json.Format
+import uk.gov.hmrc.agentregistration.shared.util.JsonFormatsFactory
+
+enum ApplicationForRiskingStatus:
+
+  case ReadyForSubmission
+  case SubmittedForRisking
+  case Approved
+  case FailedNonFixable
+  case FailedFixable
+  case ReadyForResubmission
+
+object ApplicationForRiskingStatus:
+  given Format[ApplicationForRiskingStatus] = JsonFormatsFactory.makeEnumFormat[ApplicationForRiskingStatus]

app/uk/gov/hmrc/agentregistrationfrontend/services/applicant/AgentRegistrationRiskingService.scala

@@ -17,8 +17,10 @@
 package uk.gov.hmrc.agentregistrationfrontend.services.applicant
 
 import play.api.mvc.RequestHeader
-import uk.gov.hmrc.agentregistrationfrontend.connectors.AgentRegistrationRiskingConnector
+import uk.gov.hmrc.agentregistration.shared.AgentApplicationId
 import uk.gov.hmrc.agentregistration.shared.risking.SubmitForRiskingRequest
+import uk.gov.hmrc.agentregistrationfrontend.connectors.AgentRegistrationRiskingConnector
+import uk.gov.hmrc.agentregistrationfrontend.model.ApplicationForRiskingStatus
 import uk.gov.hmrc.agentregistrationfrontend.util.RequestAwareLogging
 
 import javax.inject.Inject
@@ -34,3 +36,7 @@ extends RequestAwareLogging:
 
   def submitForRisking(submitForRiskingRequest: SubmitForRiskingRequest)(using request: RequestHeader): Future[Unit] = agentRegistrationRiskingConnector
     .submitForRisking(submitForRiskingRequest)
+
+  def getApplicationStatus(agentApplicationId: AgentApplicationId)(using request: RequestHeader): Future[ApplicationForRiskingStatus] =
+    agentRegistrationRiskingConnector
+      .getApplicationStatus(agentApplicationId)