diff --git a/.env.development b/.env.development index 267807510..a361d7b33 100644 --- a/.env.development +++ b/.env.development @@ -13,6 +13,7 @@ BETA_SEARCH_SWITCHING_ENABLED=true DUTY_CALCULATOR=true DUTY_CALCULATOR_BASE_URL=http://localhost:3002/duty-calculator FRONTEND_HOST=http://localhost +GREEN_LANES_ENABLED=true HTTPARTY_READ_TIMEOUT=661 PERMUTATIONS=true PORT=3001 @@ -28,4 +29,3 @@ TARIFF_SUPPORT_EMAIL=support@example.com UPDATED_NAVIGATION=true WEBCHAT_URL='test-online-services-helpdesk' WELSH=true -ALLOW_GREEN_LANE=true diff --git a/.tool-versions b/.tool-versions index dc17f7f6a..fafefefc3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ cf 7.1.0 yarn 1.22.10 -nodejs 16.13.1 +nodejs 20.8.0 diff --git a/app/controllers/green_lanes/category_assessments_controller.rb b/app/controllers/green_lanes/category_assessments_controller.rb index a71d0366a..9dddea14a 100644 --- a/app/controllers/green_lanes/category_assessments_controller.rb +++ b/app/controllers/green_lanes/category_assessments_controller.rb @@ -31,7 +31,7 @@ def ca_search_params end def check_allowed - raise TradeTariffFrontend::FeatureUnavailable unless TradeTariffFrontend.green_lane_allowed? + raise TradeTariffFrontend::FeatureUnavailable unless TradeTariffFrontend.green_lanes_enabled? end end end diff --git a/app/controllers/green_lanes/check_moving_requirements_controller.rb b/app/controllers/green_lanes/check_moving_requirements_controller.rb new file mode 100644 index 000000000..95f2d00eb --- /dev/null +++ b/app/controllers/green_lanes/check_moving_requirements_controller.rb @@ -0,0 +1,45 @@ +module GreenLanes + class CheckMovingRequirementsController < ApplicationController + before_action :check_moving_requirements, + :disable_switch_service_banner, + :disable_search_form + + def start + @commodity_code = params[:code] + render 'start' + end + + def edit + @commodity_code = params[:code] + @check_moving_requirements_form = CheckMovingRequirementsForm.new(commodity_code: @commodity_code) + + render 'edit' + end + + def update + @check_moving_requirements_form = CheckMovingRequirementsForm.new(check_moving_requirements_params) + + if @check_moving_requirements_form.valid? + redirect_to result_green_lanes_check_moving_requirements_path + else + render 'edit', status: :unprocessable_entity + end + end + + private + + def check_moving_requirements_params + params.require(:green_lanes_check_moving_requirements_form).permit( + :commodity_code, + :country_of_origin, + :moving_date, + ) + end + + def check_moving_requirements + unless TradeTariffFrontend.green_lanes_enabled? + raise TradeTariffFrontend::FeatureUnavailable + end + end + end +end diff --git a/app/forms/green_lanes/check_moving_requirements_form.rb b/app/forms/green_lanes/check_moving_requirements_form.rb new file mode 100644 index 000000000..c4c921ae9 --- /dev/null +++ b/app/forms/green_lanes/check_moving_requirements_form.rb @@ -0,0 +1,17 @@ +module GreenLanes + class CheckMovingRequirementsForm + include ActiveModel::Model + include ActiveModel::Attributes + include ActiveRecord::AttributeAssignment + + attribute :commodity_code, :string + attribute :country_of_origin, :string + attribute :moving_date, :date + + validates :commodity_code, length: { is: 10 }, + format: { with: /\A\d+\z/, message: :only_numbers } + + validates :country_of_origin, presence: true + validates :moving_date, presence: true + end +end diff --git a/app/views/green_lanes/check_moving_requirements/edit.html.erb b/app/views/green_lanes/check_moving_requirements/edit.html.erb new file mode 100644 index 000000000..c3e7d76b9 --- /dev/null +++ b/app/views/green_lanes/check_moving_requirements/edit.html.erb @@ -0,0 +1,68 @@ +<%= back_link start_green_lanes_check_moving_requirements_path %> + +
+
+ +
+ + Check arrangements for internal market movements + + +

+ Tell us about your movement of goods +

+
+ + <%= form_for @check_moving_requirements_form, builder: GOVUKDesignSystemFormBuilder::FormBuilder, + method: :put, + url: green_lanes_check_moving_requirements_path do |f| %> + + <%= f.govuk_error_summary %> + +

Details provided will help us display specific requirements for your goods.

+ + <%= f.govuk_text_field :commodity_code, maxlength: 10, + label: { text: "What is your commodity code?", size: 's'}, + hint: { text: "Commodity codes are internationally recognised reference numbers that describe specific goods." \ + "Search the Online Trade Tariff if you're unsure of your commodity code.", + }, + style: "width:330px" + %> + + <%= f.govuk_collection_select :country_of_origin, + GreenLanes::CategoryAssessmentSearch.country_options, + :id, + :long_description, + options: { include_blank: '' }, + label: { text: "What is the origin of your goods?", size: 's' }, + hint: { text: "Origin allows for various policy measures to be implemented and for duties" \ + "to be calculated. Find out more about origin if you're unsure which country to select.", + }, + style: "width:330px" + %> + + <%= f.label :commodity_code, "When is the movement of goods taking place?", class: 'govuk-heading-s', + for: 'green_lanes_check_moving_requirements_form_moving_date_3i' %> + + <%= f.govuk_date_field :moving_date, + maxlength_enabled: true, + hint: { text: "Arrangements can change over time. If you are unsure of the date of " \ + "movement and want to check arrangements currently in place, enter today's date.", + class: 'govuk-body-l' + }, + legend: nil %> + + <%= f.submit "Continue", class: "govuk-button" %> + <% end %> + +

If you need help using this tool

+

+ Contact xxxxxxx ... +

+ +
+
diff --git a/app/views/green_lanes/check_moving_requirements/result.html.erb b/app/views/green_lanes/check_moving_requirements/result.html.erb new file mode 100644 index 000000000..3e4b6b5c9 --- /dev/null +++ b/app/views/green_lanes/check_moving_requirements/result.html.erb @@ -0,0 +1,15 @@ +<% content_for :top_breadcrumbs do %> + <%= generate_breadcrumbs( + "Check measures for movements from GB to NI", + [ + [t('breadcrumb.home'), home_path], + ["Section", browse_sections_path], + ] + ) %> +<% end %> + +<%= page_header do %> +

+ Requirements for your movement of goods +

+<% end %> diff --git a/app/views/green_lanes/check_moving_requirements/start.html.erb b/app/views/green_lanes/check_moving_requirements/start.html.erb new file mode 100644 index 000000000..994e090ae --- /dev/null +++ b/app/views/green_lanes/check_moving_requirements/start.html.erb @@ -0,0 +1,80 @@ +<%= back_link home_path %> + +
+
+
+

+ Check arrangements for internal market movements +

+
+ +

+ Use this tool if you are a trader moving goods from Great Britain to Northern Ireland and believe that your goods are 'not of risk' of onward movement to the EU. +

+ +

+ For eligible goods moving from Great Britain to Northern Ireland, traders can benefit from a simplified process for internal market movements. +

+ +

+ If you're based anywhere in the UK, you can join the UK Internal Market Scheme (UKIMS) to access the simplified process and benefit from reduced customs duties and checks. +

+ +

+ Use this tool to: +

+ +

Before you start

+

+ You'll need to know: +

+

+ + <%= button_to edit_green_lanes_check_moving_requirements_path, + method: :get, + params: { code: @commodity_code }, + class: "govuk-button govuk-button--start" do %> + + Start now + <%= render 'shared/start_arrow' %> + <% end %> + +

If you need help using this tool

+

+ Contact xxxxxxx ... +

+ +
+ +
+
+

+ Subsections +

+ + +
+
+
diff --git a/app/views/meursing_lookup/steps/_start.html.erb b/app/views/meursing_lookup/steps/_start.html.erb index 5b8977a78..6e1578170 100644 --- a/app/views/meursing_lookup/steps/_start.html.erb +++ b/app/views/meursing_lookup/steps/_start.html.erb @@ -36,9 +36,7 @@ role="button" draggable="false" class="govuk-button govuk-!-margin-top-2 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button"> Start now - + <%= render 'shared/start_arrow' %>

Documents to download

diff --git a/app/views/shared/_feedback_useful_banner.html.erb b/app/views/shared/_feedback_useful_banner.html.erb index 7d5a4a498..4e95da354 100644 --- a/app/views/shared/_feedback_useful_banner.html.erb +++ b/app/views/shared/_feedback_useful_banner.html.erb @@ -2,7 +2,7 @@
-

is this page useful?

+

Is this page useful?

  • <%= link_to 'Yes', feedback_path(page_useful: 'yes'), class: 'govuk-button govuk-button--secondary' %>
    • diff --git a/app/views/shared/_start_arrow.html.erb b/app/views/shared/_start_arrow.html.erb new file mode 100644 index 000000000..5a0cb7849 --- /dev/null +++ b/app/views/shared/_start_arrow.html.erb @@ -0,0 +1,3 @@ + diff --git a/config/locales/en.yml b/config/locales/en.yml index e07774ad6..b26bd3842 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -393,6 +393,16 @@ en: rule: inclusion: Select whether your goods meet any of these rules + green_lanes/check_moving_requirements_form: + attributes: + moving_date: + blank: Enter a valid date + country_of_origin: + blank: Select the country of origin + commodity_code: + wrong_length: Commodity code must have 10 digits + only_numbers: Commodity code must only contain numbers + helpers: legend: rules_of_origin_steps_scheme: diff --git a/config/routes.rb b/config/routes.rb index 8da6fc326..87e31c8e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -110,6 +110,11 @@ scope constraints: ->(_req) { TradeTariffFrontend::ServiceChooser.uk? } do namespace :green_lanes do resource :category_assessments, only: %i[create show] + + resource :check_moving_requirements, only: %i[update edit] do + get 'start' + get 'result' + end end end diff --git a/lib/trade_tariff_frontend.rb b/lib/trade_tariff_frontend.rb index f84437c51..7f6856045 100644 --- a/lib/trade_tariff_frontend.rb +++ b/lib/trade_tariff_frontend.rb @@ -173,8 +173,8 @@ def legacy_results_to_show ENV.fetch('LEGACY_RESULTS_TO_SHOW', '5').to_i end - def green_lane_allowed? - ENV['ALLOW_GREEN_LANE'].to_s == 'true' + def green_lanes_enabled? + ENV['GREEN_LANES_ENABLED'].to_s == 'true' end def green_lanes_api_token diff --git a/spec/features/feedback_spec.rb b/spec/features/feedback_spec.rb index d71bae793..d677c2c87 100644 --- a/spec/features/feedback_spec.rb +++ b/spec/features/feedback_spec.rb @@ -38,13 +38,13 @@ expect(page).to have_css 'a', text: 'Yes' expect(page).to have_css 'a', text: 'No' expect(page).to have_css 'a', text: 'Report a problem with this page' - expect(page).to have_css 'p', text: 'is this page useful?' + expect(page).to have_css 'p', text: 'Is this page useful?' click_on 'Yes' expect(page).not_to have_css 'a', text: 'Yes' expect(page).not_to have_css 'a', text: 'No' expect(page).not_to have_css 'a', text: 'Report a problem with this page' - expect(page).not_to have_css 'p', text: 'is this page useful?' + expect(page).not_to have_css 'p', text: 'Is this page useful?' end scenario 'feedback banner is not shown on feedback page' do diff --git a/spec/forms/green_lanes/check_moving_requirements_form_spec.rb b/spec/forms/green_lanes/check_moving_requirements_form_spec.rb new file mode 100644 index 000000000..b193f203d --- /dev/null +++ b/spec/forms/green_lanes/check_moving_requirements_form_spec.rb @@ -0,0 +1,35 @@ +require 'spec_helper' + +RSpec.describe GreenLanes::CheckMovingRequirementsForm, type: :model do + describe 'validations' do + subject(:form) { described_class.new(params) } + + before { form.valid? } + + context 'when all the attributes are correct' do + let(:params) do + { + commodity_code: '1234567890', + country_of_origin: 'IT', + moving_date: { 1 => 1998, 2 => 12, 3 => 25 }, + } + end + + it { expect(form.errors).to be_empty } + end + + context 'when the attributes are incorrect' do + let(:params) do + { + commodity_code: '12345AAA', + country_of_origin: '', + moving_date: { 1 => 1998, 2 => 12, 3 => nil }, + } + end + + it { expect(form.errors[:commodity_code]).to eq(['Commodity code must have 10 digits', 'Commodity code must only contain numbers']) } + it { expect(form.errors[:country_of_origin]).to eq(['Select the country of origin']) } + it { expect(form.errors[:moving_date]).to eq(['Enter a valid date']) } + end + end +end diff --git a/spec/requests/green_lanes/category_assessments_controller_spec.rb b/spec/requests/green_lanes/category_assessments_controller_spec.rb index 720402a21..3e74ffe87 100644 --- a/spec/requests/green_lanes/category_assessments_controller_spec.rb +++ b/spec/requests/green_lanes/category_assessments_controller_spec.rb @@ -4,7 +4,7 @@ subject { make_request && response } before do - allow(TradeTariffFrontend).to receive(:green_lane_allowed?).and_return true + allow(TradeTariffFrontend).to receive(:green_lanes_enabled?).and_return true allow(TradeTariffFrontend).to receive(:green_lanes_api_token).and_return '' allow(GeographicalArea).to receive(:all).and_return countries end @@ -94,7 +94,7 @@ context 'when green lanes is not allowed' do before do - allow(TradeTariffFrontend).to receive(:green_lane_allowed?).and_return false + allow(TradeTariffFrontend).to receive(:green_lanes_enabled?).and_return false end let(:make_request) { get green_lanes_category_assessments_path } diff --git a/spec/requests/green_lanes/check_moving_requirements_controller_spec.rb b/spec/requests/green_lanes/check_moving_requirements_controller_spec.rb new file mode 100644 index 000000000..2b72f3aeb --- /dev/null +++ b/spec/requests/green_lanes/check_moving_requirements_controller_spec.rb @@ -0,0 +1,74 @@ +require 'spec_helper' + +RSpec.describe GreenLanes::CheckMovingRequirementsController, type: :request do + subject { make_request && response } + + before do + allow(GreenLanes::CategoryAssessmentSearch).to receive(:country_options).and_return([]) + allow(TradeTariffFrontend).to receive(:green_lanes_enabled?).and_return(true) + end + + describe 'GET #start' do + let(:make_request) do + get start_green_lanes_check_moving_requirements_path + end + + it { is_expected.to have_http_status :ok } + end + + describe 'when the feature "check moving requirements" is disabled' do + let(:make_request) do + get start_green_lanes_check_moving_requirements_path + end + + before do + allow(TradeTariffFrontend).to receive(:green_lanes_enabled?).and_return(false) + end + + it { is_expected.to have_http_status :not_found } + + it { is_expected.to render_template 'errors/not_found' } + end + + describe 'GET #edit' do + let(:make_request) do + get edit_green_lanes_check_moving_requirements_path + end + + it { is_expected.to have_http_status :ok } + end + + describe 'PUT #update' do + context 'when all the form values are correct' do + let(:make_request) do + put green_lanes_check_moving_requirements_path, params: { + green_lanes_check_moving_requirements_form: { + commodity_code: '1234567890', + country_of_origin: 'IT', + 'moving_date(3i)' => '3', + 'moving_date(2i)' => '2', + 'moving_date(1i)' => '2022', + }, + } + end + + it { is_expected.to redirect_to(result_green_lanes_check_moving_requirements_path) } + end + + context 'when a value is missing or incorrect' do + let(:make_request) do + put green_lanes_check_moving_requirements_path, params: { + green_lanes_check_moving_requirements_form: { + commodity_code: '', + country_of_origin: 'IT', + 'moving_date(3i)' => '3', + 'moving_date(2i)' => '2', + 'moving_date(1i)' => '2022', + }, + } + end + + it { is_expected.to have_http_status :unprocessable_entity } + end + end +end diff --git a/terraform/README.md b/terraform/README.md index 04d8c70c7..dac986878 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -46,7 +46,7 @@ Terraform to deploy the service into AWS. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [allow\_green\_lanes](#input\_allow\_green\_lanes) | Enable green lanes api UI in front end | `bool` | `false` | no | +| [allow\_green\_lanes](#input\_allow\_green\_lanes) | Enable green lanes api UI in front end | `bool` | `false` | no | | [base\_domain](#input\_base\_domain) | URL of the service. | `string` | n/a | yes | | [cpu](#input\_cpu) | CPU units to use. | `number` | n/a | yes | | [docker\_tag](#input\_docker\_tag) | Image tag to use. | `string` | n/a | yes | diff --git a/terraform/beta.tf b/terraform/beta.tf index f62888bbd..7b7eac21a 100644 --- a/terraform/beta.tf +++ b/terraform/beta.tf @@ -151,7 +151,7 @@ module "beta_service" { }, { name = "ALLOW_GREEN_LANE" - value = var.allow_green_lanes + value = var.green_lanes_enabled }, ] diff --git a/terraform/config_development.tfvars b/terraform/config_development.tfvars index 6bf9e6127..d0c82e0dc 100644 --- a/terraform/config_development.tfvars +++ b/terraform/config_development.tfvars @@ -1,7 +1,7 @@ -region = "eu-west-2" -environment = "development" -base_domain = "dev.trade-tariff.service.gov.uk" -cpu = 1024 -memory = 2048 -tariff_email_to = "hmrc-trade-tariff-support-g@digital.hmrc.gov.uk" -allow_green_lanes = true +region = "eu-west-2" +environment = "development" +base_domain = "dev.trade-tariff.service.gov.uk" +cpu = 1024 +memory = 2048 +tariff_email_to = "hmrc-trade-tariff-support-g@digital.hmrc.gov.uk" +green_lanes_enabled = true diff --git a/terraform/config_staging.tfvars b/terraform/config_staging.tfvars index aef140a4a..7eb10d83a 100644 --- a/terraform/config_staging.tfvars +++ b/terraform/config_staging.tfvars @@ -1,10 +1,10 @@ -region = "eu-west-2" -environment = "staging" -base_domain = "staging.trade-tariff.service.gov.uk" -cpu = 1024 -memory = 2048 -service_count = 4 -min_capacity = 2 -max_capacity = 8 -tariff_email_to = "hmrc-trade-tariff-support-g@digital.hmrc.gov.uk" -allow_green_lanes = true +region = "eu-west-2" +environment = "staging" +base_domain = "staging.trade-tariff.service.gov.uk" +cpu = 1024 +memory = 2048 +service_count = 4 +min_capacity = 2 +max_capacity = 8 +tariff_email_to = "hmrc-trade-tariff-support-g@digital.hmrc.gov.uk" +green_lanes_enabled = true diff --git a/terraform/main.tf b/terraform/main.tf index 2e129ba8f..3561074b5 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -150,8 +150,8 @@ module "service" { value = var.environment }, { - name = "ALLOW_GREEN_LANE" - value = var.allow_green_lanes + name = "GREEN_LANES_ENABLED" + value = var.green_lanes_enabled }, ] diff --git a/terraform/variables.tf b/terraform/variables.tf index 29c72c723..d4c62da4c 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -51,7 +51,7 @@ variable "tariff_email_to" { type = string } -variable "allow_green_lanes" { +variable "green_lanes_enabled" { description = "Enable green lanes api UI in front end" type = bool default = false