Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SASS-8731] Fetch NICs prior data when loading TaskList page #467

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[SASS-8731] Fetch NICs prior data when loading TaskList page #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions app/controllers/actions/SubmittedDataRetrievalActionProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package controllers.actions

import cats.data.EitherT
import connectors.SelfEmploymentConnector
import models.common.{Journey, JourneyContext, TaxYear}
import models.common.{BusinessId, Journey, JourneyContext, TaxYear}
import models.domain.ApiResultT
import models.errors.ServiceError
import models.journeys.TaskListWithRequest
Expand All @@ -27,6 +27,7 @@ import models.journeys.capitalallowances.tailoring.CapitalAllowancesTailoringAns
import models.journeys.expenses.ExpensesTailoringAnswers
import models.journeys.expenses.goodsToSellOrUse.GoodsToSellOrUseJourneyAnswers
import models.journeys.income.IncomeJourneyAnswers
import models.journeys.nics.NICsJourneyAnswers
import models.requests.{OptionalDataRequest, TradesJourneyStatuses}
import play.api.libs.json.Format
import play.api.mvc.AnyContent
Expand Down Expand Up @@ -73,8 +74,10 @@ class SubmittedDataRetrievalActionProviderImpl @Inject() (connector: SelfEmploym
taxYear,
businesses,
gtsouUpdated,
Journey.CapitalAllowancesTailoring)
} yield TaskListWithRequest(taskList, capitalAllowancesUpdated)
Journey.CapitalAllowancesTailoring
) // TODO 10281 fetch Profit or Loss journey answers
nicsUpdated <- loadNicsAnswers[NICsJourneyAnswers](taxYear, businesses, capitalAllowancesUpdated, Journey.NationalInsuranceContributions)
} yield TaskListWithRequest(taskList, nicsUpdated)
}

private def loadAnswers[A: Format](taxYear: TaxYear,
Expand All @@ -91,4 +94,19 @@ class SubmittedDataRetrievalActionProviderImpl @Inject() (connector: SelfEmploym

EitherT.right[ServiceError](result)
}

private def loadNicsAnswers[A: Format](taxYear: TaxYear,
businesses: List[TradesJourneyStatuses],
request: OptionalDataRequest[AnyContent],
journey: Journey)(implicit
ec: ExecutionContext): EitherT[Future, ServiceError, OptionalDataRequest[AnyContent]] = {
val result = businesses.foldLeft(Future.successful(request)) { (futureRequest, _) =>
futureRequest.flatMap { updatedRequest =>
apply[A](req => req.mkJourneyNinoContext(taxYear, BusinessId.nationalInsuranceContributions, journey))
.execute(updatedRequest)
}
}

EitherT.right[ServiceError](result)
}
}