APB-10713 fix task list links for incorporated (#207)

Author: nubz

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

@@ -103,7 +103,9 @@ sealed trait AgentApplication:
 
   def getAmlsDetails: AmlsDetails = amlsDetails.getOrElse(expectedDataNotDefinedError("amlsDetails"))
 
-  def getNumberOfIndividuals: NumberOfIndividuals
+  def getNumberOfIndividuals: NumberOfIndividuals = numberOfIndividuals.getOrElse(
+    expectedDataNotDefinedError("numberOfIndividuals")
+  )
 
   private def as[T <: AgentApplication](using ct: reflect.ClassTag[T]): Option[T] =
     this match
@@ -148,9 +150,6 @@ extends AgentApplication:
   override val businessType: BusinessType.SoleTrader.type = BusinessType.SoleTrader
   def getBusinessDetails: BusinessDetailsSoleTrader = businessDetails.getOrElse(expectedDataNotDefinedError("businessDetails"))
   override def numberOfIndividuals: Option[NumberOfRequiredKeyIndividuals] = Some(AgentApplicationSoleTrader.numberOfRequiredKeyIndividuals)
-  override def getNumberOfIndividuals: NumberOfRequiredKeyIndividuals = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
 
 object AgentApplicationSoleTrader:
   val numberOfRequiredKeyIndividuals: NumberOfRequiredKeyIndividuals = FiveOrLess(1)
@@ -180,9 +179,6 @@ final case class AgentApplicationLlp(
 extends AgentApplication:
 
   override val businessType: BusinessType.Partnership.LimitedLiabilityPartnership.type = BusinessType.Partnership.LimitedLiabilityPartnership
-  override def getNumberOfIndividuals: NumberOfCompaniesHouseOfficers = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
 
   def getBusinessDetails: BusinessDetailsLlp = businessDetails.getOrThrowExpectedDataMissing("businessDetails")
   def getCrn: Crn = getBusinessDetails.companyProfile.companyNumber
@@ -212,9 +208,6 @@ final case class AgentApplicationLimitedCompany(
 extends AgentApplication:
 
   override val businessType: BusinessType.LimitedCompany.type = BusinessType.LimitedCompany
-  override def getNumberOfIndividuals: NumberOfCompaniesHouseOfficers = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
 
   def getBusinessDetails: BusinessDetailsLimitedCompany = businessDetails.getOrThrowExpectedDataMissing("businessDetails")
   def getCrn: Crn = getBusinessDetails.companyProfile.companyNumber
@@ -244,10 +237,6 @@ extends AgentApplication:
 
   override val businessType: BusinessType.Partnership.GeneralPartnership.type = BusinessType.Partnership.GeneralPartnership
 
-  override def getNumberOfIndividuals: NumberOfRequiredKeyIndividuals = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
-
   def getBusinessDetails: BusinessDetailsGeneralPartnership = businessDetails.getOrElse(expectedDataNotDefinedError("businessDetails"))
 
 /** Application for Limited Partnership. This final case class represents the data entered by a user for registering as a Limited Partnership.
@@ -275,9 +264,6 @@ final case class AgentApplicationLimitedPartnership(
 extends AgentApplication:
 
   override val businessType: BusinessType.Partnership.LimitedPartnership.type = BusinessType.Partnership.LimitedPartnership
-  override def getNumberOfIndividuals: NumberOfCompaniesHouseOfficers = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
 
   def getBusinessDetails: BusinessDetailsPartnership = businessDetails.getOrThrowExpectedDataMissing("businessDetails")
   def getCrn: Crn = getBusinessDetails.companyProfile.companyNumber
@@ -305,9 +291,6 @@ final case class AgentApplicationScottishLimitedPartnership(
 extends AgentApplication:
 
   override val businessType: BusinessType.Partnership.ScottishLimitedPartnership.type = BusinessType.Partnership.ScottishLimitedPartnership
-  override def getNumberOfIndividuals: NumberOfCompaniesHouseOfficers = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
 
   def getBusinessDetails: BusinessDetailsPartnership = businessDetails.getOrThrowExpectedDataMissing("businessDetails")
   def getCrn: Crn = getBusinessDetails.companyProfile.companyNumber
@@ -335,10 +318,6 @@ extends AgentApplication:
 
   override val businessType: BusinessType.Partnership.ScottishPartnership.type = BusinessType.Partnership.ScottishPartnership
 
-  override def getNumberOfIndividuals: NumberOfRequiredKeyIndividuals = numberOfIndividuals.getOrElse(
-    expectedDataNotDefinedError("numberOfRequiredKeyIndividuals")
-  )
-
   def getBusinessDetails: BusinessDetailsScottishPartnership = businessDetails.getOrThrowExpectedDataMissing("businessDetails")
 
 object AgentApplication:

app/uk/gov/hmrc/agentregistration/shared/lists/NumberOfIndividuals.scala

@@ -32,6 +32,7 @@ extends NumberOfIndividuals:
 
   def isValid: Boolean
   def totalListSize: Int
+  def numberOfIndividuals: Int
 
 /** When there less or equal 5, the Applicant has to declare the exact number of all key individuals (partners, directors, owners, etc) */
 final case class FiveOrLess(
@@ -42,6 +43,8 @@ extends NumberOfRequiredKeyIndividuals:
   override def isValid: Boolean = numberOfKeyIndividuals <= 5 && numberOfKeyIndividuals >= 1
   override def totalListSize: Int = numberOfKeyIndividuals
 
+  override def numberOfIndividuals: Int = totalListSize
+
 /** When there are more than 5, the Applicant has to declare how many of those are responsible for tax matters */
 final case class SixOrMore(
   numberOfKeyIndividualsResponsibleForTaxMatters: Int
@@ -54,6 +57,8 @@ extends NumberOfRequiredKeyIndividuals:
 
   override def totalListSize: Int = numberOfKeyIndividualsResponsibleForTaxMatters + requiredPadding
 
+  override def numberOfIndividuals: Int = numberOfKeyIndividualsResponsibleForTaxMatters
+
 object NumberOfRequiredKeyIndividuals:
 
   def isKeyIndividualListComplete(
@@ -81,6 +86,8 @@ extends NumberOfIndividuals:
   def isValid: Boolean
   def totalListSize: Int
 
+  def numberOfIndividuals: Int
+
 /** When there less or equal 5, the Applicant has to declare the exact number of all key individuals (partners, directors, owners, etc) */
 final case class FiveOrLessOfficers(
   override val numberOfCompaniesHouseOfficers: Int,
@@ -90,6 +97,7 @@ extends NumberOfCompaniesHouseOfficers:
 
   override def isValid: Boolean = numberOfCompaniesHouseOfficers <= 5 && numberOfCompaniesHouseOfficers >= 1
   override def totalListSize: Int = numberOfCompaniesHouseOfficers
+  override def numberOfIndividuals: Int = totalListSize
 
 /** When there are more than 5, the Applicant has to declare how many of those are responsible for tax matters */
 final case class SixOrMoreOfficers(
@@ -104,6 +112,8 @@ extends NumberOfCompaniesHouseOfficers:
 
   def requiredPadding: Int = Math.max(0, 5 - numberOfOfficersResponsibleForTaxMatters)
 
+  override def numberOfIndividuals: Int = numberOfOfficersResponsibleForTaxMatters
+
 object NumberOfCompaniesHouseOfficers:
 
   def isOfficersListComplete(

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

@@ -92,7 +92,10 @@ extends FrontendController(mcc, actions):
           case a: AgentApplication.IsAgentApplicationForDeclaringNumberOfKeyIndividuals =>
             NumberOfIndividuals.isKeyIndividualListComplete(existingList.count(_.isPersonOfControl), a.numberOfIndividuals)
             && otherRelevantIndividualsComplete(existingList)
-          case _ => true
+          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