Merge pull request #14 from hmrc/add-srn-to-session

Appended srn to internal id when persisting to session cache DB
hmrc · Feb 3, 2023 · 598afac · 598afac
2 parents 25ff276 + c90e071
commit 598afac
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/app/controllers/actions/DataCreationAction.scala b/app/controllers/actions/DataCreationAction.scala
@@ -30,7 +30,8 @@ class DataCreationActionImpl @Inject()(sessionRepository: SessionRepository)(imp
 
  request.userAnswers match {
  case None =>
- val userAnswers = UserAnswers(request.getUserId)
+ val userAnswersKey = request.getUserId + request.schemeDetails.srn
+ val userAnswers = UserAnswers(userAnswersKey)
  sessionRepository.set(userAnswers).map(_ => DataRequest(request.request, userAnswers))
  case Some(data) =>
  Future.successful(DataRequest(request.request, data))

diff --git a/app/controllers/actions/DataRetrievalAction.scala b/app/controllers/actions/DataRetrievalAction.scala
@@ -28,10 +28,8 @@ class DataRetrievalActionImpl @Inject()(
  )(implicit val executionContext: ExecutionContext) extends DataRetrievalAction {
 
  override protected def transform[A](request: AllowedAccessRequest[A]): Future[OptionalDataRequest[A]] = {
-
- sessionRepository.get(request.request.getUserId).map {
- OptionalDataRequest(request, _)
- }
+ val userAnswersKey = request.getUserId + request.schemeDetails.srn
+ sessionRepository.get(userAnswersKey).map(OptionalDataRequest(request, _))
  }
 }
 

diff --git a/app/models/SchemeDetails.scala b/app/models/SchemeDetails.scala
@@ -21,6 +21,7 @@ import play.api.libs.json._
 import utils.WithName
 
 case class SchemeDetails(
+ srn: String,
  schemeName: String,
  pstr: String,
  schemeStatus: SchemeStatus,
@@ -83,6 +84,7 @@ object SchemeDetails {
 
  implicit val reads: Reads[SchemeDetails] =
  (
+ (__ \ "srn").read[String] and
  (__ \ "schemeName").read[String] and
  (__ \ "pstr").read[String] and
  (__ \ "schemeStatus").read[SchemeStatus] and

diff --git a/app/models/requests/DataRequest.scala b/app/models/requests/DataRequest.scala
@@ -17,11 +17,13 @@
 package models.requests
 
 import play.api.mvc.{Request, WrappedRequest}
-import models.UserAnswers
+import models.{SchemeDetails, UserAnswers}
 
 case class OptionalDataRequest[A] (request: AllowedAccessRequest[A], userAnswers: Option[UserAnswers]) extends WrappedRequest[A](request) {
 
  def getUserId: String = request.getUserId
+
+ def schemeDetails: SchemeDetails = request.schemeDetails
 }
 
 case class DataRequest[A] (request: AllowedAccessRequest[A], userAnswers: UserAnswers) extends WrappedRequest[A](request) {

diff --git a/test-utils/generators/ModelGenerators.scala b/test-utils/generators/ModelGenerators.scala
@@ -74,13 +74,14 @@ trait ModelGenerators extends BasicGenerators {
 
  val schemeDetailsGen: Gen[SchemeDetails] =
  for {
+ srn <- nonEmptyString
  name <- nonEmptyString
  pstr <- nonEmptyString
  status <- schemeStatusGen
  schemeType <- nonEmptyString
  authorisingPsa <- Gen.option(nonEmptyString)
  establishers <- Gen.listOf(establisherGen)
- } yield SchemeDetails(name, pstr, status, schemeType, authorisingPsa, establishers)
+ } yield SchemeDetails(srn, name, pstr, status, schemeType, authorisingPsa, establishers)
 
  val pensionSchemeUserGen: Gen[PensionSchemeUser] =
  Gen.oneOf(Administrator, Practitioner)

diff --git a/test-utils/models/ModelSerializers.scala b/test-utils/models/ModelSerializers.scala
@@ -48,6 +48,7 @@ trait ModelSerializers {
  )
 
  Json.obj(
+ "srn" -> details.srn,
  "schemeName" -> details.schemeName,
  "pstr" -> details.pstr,
  "schemeStatus" -> details.schemeStatus,

diff --git a/test/controllers/ControllerBaseSpec.scala b/test/controllers/ControllerBaseSpec.scala
@@ -45,6 +45,7 @@ trait ControllerBaseSpec
  val userAnswers: UserAnswers = UserAnswers(userAnswersId, Json.obj("non" -> "empty"))
 
  val defaultSchemeDetails: SchemeDetails = SchemeDetails(
+ "testSRN",
  "testSchemeName",
  "testPSTR",
  SchemeStatus.Open,

diff --git a/test/controllers/actions/DataCreationActionSpec.scala b/test/controllers/actions/DataCreationActionSpec.scala
@@ -66,7 +66,7 @@ class DataCreationActionSpec extends BaseSpec {
 
 
  result.request mustBe request
- result.userAnswers.id mustBe request.getUserId
+ result.userAnswers.id mustBe request.getUserId + request.schemeDetails.srn
  verify(sessionRepository, times(1)).set(any())
  }
  }

diff --git a/test/controllers/actions/DataRetrievalActionSpec.scala b/test/controllers/actions/DataRetrievalActionSpec.scala
@@ -41,7 +41,7 @@ class DataRetrievalActionSpec extends BaseSpec {
  "there is no data in the cache" in {
 
  val sessionRepository = mock[SessionRepository]
- when(sessionRepository.get(request.request.getUserId)) thenReturn Future(None)
+ when(sessionRepository.get(request.request.getUserId + request.schemeDetails.srn)) thenReturn Future(None)
  val action = new Harness(sessionRepository)
 
  val result = action.callTransform().futureValue
@@ -54,7 +54,7 @@ class DataRetrievalActionSpec extends BaseSpec {
  "when there is data in the cache" in {
 
  val sessionRepository = mock[SessionRepository]
- when(sessionRepository.get(request.request.getUserId)) thenReturn Future(Some(UserAnswers("id")))
+ when(sessionRepository.get(request.request.getUserId + request.schemeDetails.srn)) thenReturn Future(Some(UserAnswers("id")))
  val action = new Harness(sessionRepository)
 
  val result = action.callTransform().futureValue