-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #548 from hmrc/TGP-2699/Implement-endpoint-for-UKI…
…MS-number-page Tgp 2699/implement endpoint for ukims number page
- Loading branch information
Showing
8 changed files
with
459 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright 2024 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 controllers | ||
|
|
||
| import connectors.TraderProfileConnector | ||
| import controllers.actions._ | ||
| import forms.UkimsNumberFormProvider | ||
| import models.Mode | ||
| import navigation.Navigator | ||
| import pages.{NewUkimsNumberPage, UkimsNumberPage} | ||
| import play.api.data.{Form, FormError} | ||
| import play.api.i18n.{Messages, MessagesApi} | ||
| import play.api.mvc.{Action, AnyContent, MessagesControllerComponents} | ||
| import repositories.SessionRepository | ||
| import views.html.{NewUkimsNumberView, UkimsNumberView} | ||
|
|
||
| import javax.inject.Inject | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
|
|
||
| class NewUkimsNumberController @Inject() ( | ||
| override val messagesApi: MessagesApi, | ||
| sessionRepository: SessionRepository, | ||
| navigator: Navigator, | ||
| identify: IdentifierAction, | ||
| getData: DataRetrievalAction, | ||
| requireData: DataRequiredAction, | ||
| formProvider: UkimsNumberFormProvider, | ||
| traderProfileConnector: TraderProfileConnector, | ||
| val controllerComponents: MessagesControllerComponents, | ||
| view: UkimsNumberView, | ||
| newView: NewUkimsNumberView | ||
| )(implicit ec: ExecutionContext) | ||
| extends BaseController { | ||
|
|
||
| private val form = formProvider() | ||
|
|
||
| def onPageLoad(mode: Mode): Action[AnyContent] = | ||
| (identify andThen getData andThen requireData) { implicit request => | ||
| val preparedForm = request.userAnswers.get(UkimsNumberPage) match { | ||
| case None => form | ||
| case Some(value) => form.fill(value) | ||
| } | ||
|
|
||
| Ok(newView(preparedForm, routes.NewUkimsNumberController.onSubmit(mode))) | ||
| } | ||
|
|
||
| def onSubmit(mode: Mode): Action[AnyContent] = (identify andThen getData andThen requireData).async { | ||
| implicit request => | ||
| form | ||
| .bindFromRequest() | ||
| .fold( | ||
| formWithErrors => | ||
| Future | ||
| .successful(BadRequest(newView(formWithErrors, routes.NewUkimsNumberController.onSubmit(mode)))), | ||
| value => | ||
| for { | ||
| profile <- traderProfileConnector.getTraderProfile(request.eori) | ||
| updatedAnswers <- Future.fromTry(request.userAnswers.set(NewUkimsNumberPage, value)) | ||
| _ <- sessionRepository.set(updatedAnswers) | ||
| } yield | ||
| if (value == profile.ukimsNumber) { | ||
| val formWithApiErrors = | ||
| createFormWithErrors(form, value, "ukimsNumberChangeController.duplicateUkimsNumber") | ||
| BadRequest(view(formWithApiErrors, routes.NewUkimsNumberController.onSubmit(mode))) | ||
| } else { | ||
| Redirect(navigator.nextPage(NewUkimsNumberPage, mode, updatedAnswers)) | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| private def createFormWithErrors[T](form: Form[T], value: T, errorMessageKey: String, field: String = "value")( | ||
| implicit messages: Messages | ||
| ): Form[T] = | ||
| form | ||
| .fill(value) | ||
| .copy(errors = Seq(FormError(field, messages(errorMessageKey)))) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright 2024 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 pages | ||
|
|
||
| import play.api.libs.json.JsPath | ||
| import utils.Constants.ukimsNumberKey | ||
|
|
||
| case object NewUkimsNumberPage extends QuestionPage[String] { | ||
|
|
||
| override def path: JsPath = JsPath \ toString | ||
|
|
||
| override def toString: String = ukimsNumberKey | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| @* | ||
| * Copyright 2024 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. | ||
| *@ | ||
|
|
||
| @import viewmodels.LabelSize._ | ||
| @import viewmodels.InputWidth._ | ||
| @import models.Mode | ||
|
|
||
|
|
||
| @this( | ||
| layout: templates.Layout, | ||
| formHelper: FormWithCSRF, | ||
| govukErrorSummary: GovukErrorSummary, | ||
| govukInput: GovukInput, | ||
| govukButton: GovukButton | ||
| ) | ||
|
|
||
| @(form: Form[_], action: Call, isCreateJourney: Boolean = false)(implicit request: Request[_], messages: Messages) | ||
|
|
||
| @layout(pageTitle = title(form, messages("newUkimsNumber.title"))) { | ||
|
|
||
| @if(form.errors.nonEmpty) { | ||
| @govukErrorSummary(ErrorSummaryViewModel(form)) | ||
| } | ||
|
|
||
| <h1 class="govuk-heading-l">@messages("newUkimsNumber.h1")</h1> | ||
| <p class="govuk-body">@messages("newUkimsNumber.p1")</p> | ||
| <p class="govuk-body">@messages("newUkimsNumber.p2")</p> | ||
|
|
||
| @formHelper(action = action, Symbol("autoComplete") -> "off") { | ||
|
|
||
| @govukInput( | ||
| InputViewModel( | ||
| field = form("value"), | ||
| label = LabelViewModel(messages("newUkimsNumber.heading")).withSize(Medium) | ||
| ) | ||
| .withHint( | ||
| HintViewModel(messages("newUkimsNumber.hint")) | ||
| .withCssClass("text-overflow") | ||
| .withAttribute(("style", "word-wrap: break-word")) | ||
| ) | ||
| .withWidth(Fixed30) | ||
| ) | ||
|
|
||
| @govukButton( | ||
| ButtonViewModel(messages("site.continue")) | ||
| ) | ||
| } | ||
|
|
||
| @if(isCreateJourney) { | ||
| <p class="govuk-body"> | ||
| <a href="@routes.UkimsKickOutController.onPageLoad().url" class="govuk-link">@messages("newUkimsNumber.linkText")</a> | ||
| </p> | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.