PODS-9662 simple change of making srn

app/connectors/PensionSchemeVarianceLockConnector.scala

@@ -29,23 +29,24 @@ import uk.gov.hmrc.http.HttpClient
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Try}
+import models.SchemeReferenceNumber
 
 @ImplementedBy(classOf[PensionSchemeVarianceLockConnectorImpl])
 trait PensionSchemeVarianceLockConnector {
 
-  def lock(psaId: String, srn: String)
+  def lock(psaId: String, srn: SchemeReferenceNumber)
           (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Lock]
 
-  def getLock(psaId: String, srn: String)
+  def getLock(psaId: String, srn: SchemeReferenceNumber)
              (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Option[SchemeVariance]]
 
   def getLockByPsa(psaId: String)
                   (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Option[SchemeVariance]]
 
-  def isLockByPsaIdOrSchemeId(psaId: String, srn: String)
+  def isLockByPsaIdOrSchemeId(psaId: String, srn: SchemeReferenceNumber)
                              (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Option[Lock]]
 
-  def releaseLock(psaId: String, srn: String)
+  def releaseLock(psaId: String, srn: SchemeReferenceNumber)
                  (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Unit]
 
 }
@@ -56,10 +57,10 @@ class PensionSchemeVarianceLockConnectorImpl @Inject()(http: HttpClient, config:
 
   private val logger  = Logger(classOf[PensionSchemeVarianceLockConnectorImpl])
 
-  override def lock(psaId: String, srn: String)
+  override def lock(psaId: String, srn: SchemeReferenceNumber)
                    (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Lock] = {
 
-    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn)
+    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn.id)
 
     val url = s"${config.updateSchemeDetailsUrl}/lock"
 
@@ -77,10 +78,10 @@ class PensionSchemeVarianceLockConnectorImpl @Inject()(http: HttpClient, config:
     } andThen logExceptions("Unable to get the lock")
   }
 
-  override def getLock(psaId: String, srn: String)
+  override def getLock(psaId: String, srn: SchemeReferenceNumber)
                       (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Option[SchemeVariance]] = {
 
-    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn)
+    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn.id)
 
     val url = s"${config.updateSchemeDetailsUrl}/getLock"
 
@@ -124,10 +125,10 @@ class PensionSchemeVarianceLockConnectorImpl @Inject()(http: HttpClient, config:
   }
 
 
-  override def isLockByPsaIdOrSchemeId(psaId: String, srn: String)
+  override def isLockByPsaIdOrSchemeId(psaId: String, srn: SchemeReferenceNumber)
                                       (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Option[Lock]] = {
 
-    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn)
+    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn.id)
 
     val url = s"${config.updateSchemeDetailsUrl}/isLockByPsaOrScheme"
 
@@ -151,10 +152,10 @@ class PensionSchemeVarianceLockConnectorImpl @Inject()(http: HttpClient, config:
     case Failure(t: Throwable) => logger.error(msg, t)
   }
 
-  override def releaseLock(psaId: String, srn: String)
+  override def releaseLock(psaId: String, srn: SchemeReferenceNumber)
                           (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Unit] = {
 
-    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn)
+    implicit val headerCarrier: HeaderCarrier = hc.withExtraHeaders("psaId" -> psaId, "srn" -> srn.id)
 
     val url = s"${config.updateSchemeDetailsUrl}/release-lock"
 

app/connectors/PensionsSchemeConnector.scala

@@ -28,6 +28,7 @@ import uk.gov.hmrc.http.{HttpClient, HttpResponse, HeaderCarrier}
 import utils.{UserAnswers, HttpResponseHelper}
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 @ImplementedBy(classOf[PensionsSchemeConnectorImpl])
 trait PensionsSchemeConnector {
@@ -39,7 +40,7 @@ trait PensionsSchemeConnector {
   def updateSchemeDetails(psaId: String, pstr: String, answers: UserAnswers)
                          (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[Unit]
 
-  def checkForAssociation(userId: String, srn: String, isPsa: Boolean = true)
+  def checkForAssociation(userId: String, srn: SchemeReferenceNumber, isPsa: Boolean = true)
                          (implicit headerCarrier: HeaderCarrier,
                           ec: ExecutionContext, request: RequestHeader): Future[Either[HttpResponse, Boolean]]
 }
@@ -84,11 +85,11 @@ class PensionsSchemeConnectorImpl @Inject()(http: HttpClient, config: FrontendAp
     }
   }
 
-  def checkForAssociation(userId: String, srn: String, isPsa: Boolean)
+  def checkForAssociation(userId: String, srn: SchemeReferenceNumber, isPsa: Boolean)
                          (implicit headerCarrier: HeaderCarrier,
                           ec: ExecutionContext, request: RequestHeader): Future[Either[HttpResponse, Boolean]] = {
     val headers: Seq[(String, String)] =
-      Seq((if(isPsa) "psaId" else "pspId", userId), ("schemeReferenceNumber", srn), ("Content-Type", "application/json"))
+      Seq((if(isPsa) "psaId" else "pspId", userId), ("schemeReferenceNumber", srn.id), ("Content-Type", "application/json"))
 
     implicit val hc: HeaderCarrier = headerCarrier.withExtraHeaders(headers: _*)
 

app/connectors/SchemeDetailsConnector.scala

@@ -27,13 +27,14 @@ import utils.{HttpResponseHelper, UserAnswers}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Failure
+import models.SchemeReferenceNumber
 
 @ImplementedBy(classOf[SchemeDetailsConnectorImpl])
 trait SchemeDetailsConnector {
   def getSchemeDetails(psaId: String, schemeIdType: String, idNumber: String, refreshData: Option[Boolean] = None)
                       (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[UserAnswers]
 
-  def getPspSchemeDetails(pspId: String, srn: String, refreshData: Option[Boolean] = None)
+  def getPspSchemeDetails(pspId: String, srn: SchemeReferenceNumber, refreshData: Option[Boolean] = None)
                          (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[UserAnswers]
 }
 
@@ -65,11 +66,11 @@ class SchemeDetailsConnectorImpl @Inject()(http: HttpClient, config: FrontendApp
     }
   }
 
-  override def getPspSchemeDetails(pspId: String, srn: String, refreshData: Option[Boolean])
+  override def getPspSchemeDetails(pspId: String, srn: SchemeReferenceNumber, refreshData: Option[Boolean])
                                   (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[UserAnswers] = {
 
     val url = config.pspSchemeDetailsUrl
-    val schemeHc = hc.withExtraHeaders("srn" -> srn,
+    val schemeHc = hc.withExtraHeaders("srn" -> srn.id,
     "pspId" -> pspId,
     "refreshData" -> refreshData.map(_.toString).getOrElse("false"))
 

app/controllers/AnyMoreChangesController.scala

@@ -34,6 +34,7 @@ import utils.annotations.Variations
 import views.html.anyMoreChanges
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 class AnyMoreChangesController @Inject()(appConfig: FrontendAppConfig,
                                          override val messagesApi: MessagesApi,
@@ -51,13 +52,13 @@ class AnyMoreChangesController @Inject()(appConfig: FrontendAppConfig,
   private val form: Form[Boolean] = formProvider()
   private val postCall = controllers.routes.AnyMoreChangesController.onSubmit _
 
-  def onPageLoad(srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(UpdateMode, srn) andThen
+  def onPageLoad(srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(UpdateMode, srn) andThen
     allowAccess(srn) andThen requireData).async {
     implicit request =>
       Future.successful(Ok(view(form, existingSchemeName, dateToCompleteDeclaration, postCall(srn), srn)))
   }
 
-  def onSubmit(srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(UpdateMode, srn) andThen
+  def onSubmit(srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(UpdateMode, srn) andThen
     requireData).async {
     implicit request =>
       form.bindFromRequest().fold(

app/controllers/BenefitsSecuredByInsuranceController.scala

@@ -33,6 +33,7 @@ import utils.annotations.{AboutBenefitsAndInsurance, InsuranceService}
 import views.html.benefitsSecuredByInsurance
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 class BenefitsSecuredByInsuranceController @Inject()(appConfig: FrontendAppConfig,
                                                      override val messagesApi: MessagesApi,
@@ -48,9 +49,9 @@ class BenefitsSecuredByInsuranceController @Inject()(appConfig: FrontendAppConfi
                                                     )(implicit val executionContext: ExecutionContext) extends
   FrontendBaseController with I18nSupport with Retrievals {
 
-  val postCall: (Mode, Option[String]) => Call = routes.BenefitsSecuredByInsuranceController.onSubmit
+  val postCall: (Mode, Option[SchemeReferenceNumber]) => Call = routes.BenefitsSecuredByInsuranceController.onSubmit
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] =
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] =
     (authenticate() andThen getData(mode, srn) andThen allowAccess(srn) andThen requireData).async {
       implicit request =>
         SchemeNameId.retrieve.map { schemeName =>
@@ -64,7 +65,7 @@ class BenefitsSecuredByInsuranceController @Inject()(appConfig: FrontendAppConfi
 
   private def form(schemeName: String)(implicit messages: Messages): Form[Boolean] = formProvider(schemeName)
 
-  def onSubmit(mode: Mode, srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
+  def onSubmit(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
     andThen requireData).async {
     implicit request =>
       SchemeNameId.retrieve.map { schemeName =>

app/controllers/CheckYourAnswersBeforeYouStartController.scala

@@ -48,20 +48,20 @@ class CheckYourAnswersBeforeYouStartController @Inject()(override val messagesAp
   FrontendBaseController
   with Enumerable.Implicits with I18nSupport with Retrievals {
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] =
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] =
     (authenticate() andThen getData(mode, srn) andThen allowAccess(srn) andThen requireData).async {
       implicit request =>
 
         Future.successful(Ok(view(vm(mode, srn))))
     }
 
-    def pspOnPageLoad(srn: String): Action[AnyContent] =
+    def pspOnPageLoad(srn: SchemeReferenceNumber): Action[AnyContent] =
       (authenticate(Some(PSP)) andThen getPspData(srn) andThen allowAccess(Some(srn), allowPsa = true, allowPsp = true) andThen requireData).async {
         implicit request =>
           Future.successful(Ok(view(vm(UpdateMode, Some(srn)))))
       }
 
-  private def vm(mode: Mode, srn: Option[String])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
+  private def vm(mode: Mode, srn: Option[SchemeReferenceNumber])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
     implicit val userAnswers: UserAnswers = request.userAnswers
 
     val beforeYouStart = AnswerSection(

app/controllers/CheckYourAnswersBenefitsAndInsuranceController.scala

@@ -34,6 +34,7 @@ import views.html.checkYourAnswers
 
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
+import models.SchemeReferenceNumber
 
 class CheckYourAnswersBenefitsAndInsuranceController @Inject()(override val messagesApi: MessagesApi,
                                                                authenticate: AuthAction,
@@ -48,19 +49,19 @@ class CheckYourAnswersBenefitsAndInsuranceController @Inject()(override val mess
   extends FrontendBaseController
     with Enumerable.Implicits with I18nSupport with Retrievals {
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] =
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] =
     (authenticate() andThen getData(mode, srn) andThen allowAccess(srn) andThen requireData) {
       implicit request =>
         Ok(view(vm(mode, srn)))
     }
 
-  def pspOnPageLoad(srn: String): Action[AnyContent] =
+  def pspOnPageLoad(srn: SchemeReferenceNumber): Action[AnyContent] =
     (authenticate(Some(PSP)) andThen getPspData(srn) andThen allowAccess(Some(srn), allowPsa = true, allowPsp = true) andThen requireData) {
       implicit request =>
         Ok(view(vm(UpdateMode, Some(srn))))
     }
 
-  private def vm(mode: Mode, srn: Option[String])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
+  private def vm(mode: Mode, srn: Option[SchemeReferenceNumber])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
 
       implicit val userAnswers: UserAnswers = request.userAnswers
       val benefitsAndInsuranceSection = AnswerSection(

app/controllers/CheckYourAnswersMembersController.scala

@@ -46,19 +46,19 @@ class CheckYourAnswersMembersController @Inject()(override val messagesApi: Mess
   FrontendBaseController
   with Enumerable.Implicits with I18nSupport with Retrievals {
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] =
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] =
     (authenticate() andThen getData(mode, srn) andThen allowAccess(srn) andThen requireData).async {
       implicit request =>
         Future.successful(Ok(view(vm(mode, srn))))
     }
 
-  def pspOnPageLoad(srn: String): Action[AnyContent] =
+  def pspOnPageLoad(srn: SchemeReferenceNumber): Action[AnyContent] =
     (authenticate(Some(PSP)) andThen getPspData(srn) andThen allowAccess(Some(srn), allowPsa = true, allowPsp = true) andThen requireData).async {
       implicit request =>
         Future.successful(Ok(view(vm(UpdateMode, Some(srn)))))
     }
 
-  private def vm(mode: Mode, srn: Option[String])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
+  private def vm(mode: Mode, srn: Option[SchemeReferenceNumber])(implicit request: DataRequest[AnyContent]): CYAViewModel = {
     implicit val userAnswers: UserAnswers = request.userAnswers
     val membersSection = AnswerSection(
       None,

app/controllers/DeleteSchemeChangesController.scala

@@ -31,6 +31,7 @@ import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendBaseController
 import views.html.deleteSchemeChanges
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 class DeleteSchemeChangesController @Inject()(
                                                appConfig: FrontendAppConfig,
@@ -49,7 +50,7 @@ class DeleteSchemeChangesController @Inject()(
   private lazy val postCall = routes.DeleteSchemeChangesController.onSubmit _
   private val form: Form[Boolean] = formProvider()
 
-  def onPageLoad(srn: String): Action[AnyContent] = (authenticate() andThen getData()).async {
+  def onPageLoad(srn: SchemeReferenceNumber): Action[AnyContent] = (authenticate() andThen getData()).async {
     implicit request =>
       request.psaId match {
         case Some(psaId) =>
@@ -61,7 +62,7 @@ class DeleteSchemeChangesController @Inject()(
       }
   }
 
-      private def getSchemeName(srn: String, psaId: String)(block: (String, String) => Future[Result])
+      private def getSchemeName(srn: SchemeReferenceNumber, psaId: String)(block: (String, String) => Future[Result])
                                (implicit hc: HeaderCarrier): Future[Result] =
         minimalPsaConnector.getPsaNameFromPsaID(psaId).flatMap { psaName =>
           updateConnector.fetch(srn).flatMap { data =>
@@ -78,7 +79,7 @@ class DeleteSchemeChangesController @Inject()(
           }
         }
 
-      def onSubmit(srn: String): Action[AnyContent] = (authenticate() andThen getData()).async {
+      def onSubmit(srn: SchemeReferenceNumber): Action[AnyContent] = (authenticate() andThen getData()).async {
         implicit request =>
           request.psaId.map { psaId =>
             getSchemeName(srn, psaId.id) { (psaName, schemeName) =>

app/controllers/InsuranceCompanyNameController.scala

@@ -33,6 +33,7 @@ import utils.annotations.{AboutBenefitsAndInsurance, InsuranceService}
 import views.html.insuranceCompanyName
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 class InsuranceCompanyNameController @Inject()(appConfig: FrontendAppConfig,
                                                override val messagesApi: MessagesApi,
@@ -50,15 +51,15 @@ class InsuranceCompanyNameController @Inject()(appConfig: FrontendAppConfig,
 
   private val form = formProvider()
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
     andThen allowAccess(srn)) {
     implicit request =>
       val preparedForm = request.userAnswers.flatMap(_.get(InsuranceCompanyNameId)).fold(form)(v => form.fill(v))
       val submitCall: Call = controllers.routes.InsuranceCompanyNameController.onSubmit(mode, srn)
       Ok(view(preparedForm, mode, existingSchemeName, submitCall, srn))
   }
 
-  def onSubmit(mode: Mode, srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
+  def onSubmit(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
     andThen requireData).async {
     implicit request =>
       form.bindFromRequest().fold(

app/controllers/InsurancePolicyNumberController.scala

@@ -33,6 +33,7 @@ import utils.annotations.{AboutBenefitsAndInsurance, InsuranceService}
 import views.html.insurancePolicyNumber
 
 import scala.concurrent.{ExecutionContext, Future}
+import models.SchemeReferenceNumber
 
 class InsurancePolicyNumberController @Inject()(appConfig: FrontendAppConfig,
                                                 override val messagesApi: MessagesApi,
@@ -50,7 +51,7 @@ class InsurancePolicyNumberController @Inject()(appConfig: FrontendAppConfig,
 
   private val form = formProvider()
 
-  def onPageLoad(mode: Mode, srn: Option[String]): Action[AnyContent] =
+  def onPageLoad(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] =
     (authenticate() andThen getData(mode, srn) andThen allowAccess(srn) andThen requireData).async {
       implicit request =>
 
@@ -63,9 +64,9 @@ class InsurancePolicyNumberController @Inject()(appConfig: FrontendAppConfig,
         Future.successful(Ok(view(preparedForm, mode, companyName, existingSchemeName, postCall(mode, srn), srn)))
     }
 
-  def postCall: (Mode, Option[String]) => Call = routes.InsurancePolicyNumberController.onSubmit
+  def postCall: (Mode, Option[SchemeReferenceNumber]) => Call = routes.InsurancePolicyNumberController.onSubmit
 
-  def onSubmit(mode: Mode, srn: Option[String]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
+  def onSubmit(mode: Mode, srn: Option[SchemeReferenceNumber]): Action[AnyContent] = (authenticate() andThen getData(mode, srn)
     andThen requireData).async {
     implicit request =>
       form.bindFromRequest().fold(