From a592f8731a2399fa444983cd58b218f7831959f4 Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 4 Oct 2024 14:33:09 +0100 Subject: [PATCH] Add update resource page --- .../collection_resources_controller.rb | 24 +++++++ .../mandatory_collection_resources_service.rb | 2 + .../_collection_resource_summary_list.erb | 2 +- app/views/collection_resources/edit.html.erb | 28 ++++++++ config/routes.rb | 1 + .../collection_resources_controller_spec.rb | 70 +++++++++++++++++++ 6 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 app/views/collection_resources/edit.html.erb diff --git a/app/controllers/collection_resources_controller.rb b/app/controllers/collection_resources_controller.rb index f23926f7a..23a1b3c79 100644 --- a/app/controllers/collection_resources_controller.rb +++ b/app/controllers/collection_resources_controller.rb @@ -23,8 +23,28 @@ class CollectionResourcesController < ApplicationController download_resource(resource.download_filename) end + def update_mandatory_collection_resource + return render_not_found unless current_user.support? + + year = params[:year].to_i + resource_type = params[:resource_type] + log_type = params[:log_type] + + return render_not_found unless resource_for_year_can_be_updated?(year) + + @collection_resource = MandatoryCollectionResourcesService.generate_resource(log_type, year, resource_type) + + return render_not_found unless @collection_resource + + render "collection_resources/edit" + end + private + def resource_params + params.require(:collection_resource).permit(:year, :log_type, :resource_type, :file) + end + def download_resource(filename) url = "https://#{Rails.application.config.collection_resources_s3_bucket_name}.s3.amazonaws.com/#{filename}" uri = URI.parse(url) @@ -46,4 +66,8 @@ private displayed_collection_resource_years.include?(year) end + + def resource_for_year_can_be_updated?(year) + editable_collection_resource_years.include?(year) + end end diff --git a/app/services/mandatory_collection_resources_service.rb b/app/services/mandatory_collection_resources_service.rb index 74cb92518..82a6bd41e 100644 --- a/app/services/mandatory_collection_resources_service.rb +++ b/app/services/mandatory_collection_resources_service.rb @@ -16,6 +16,8 @@ class MandatoryCollectionResourcesService end def self.generate_resource(log_type, year, resource_type) + return unless log_type && year && resource_type + return unless %w[lettings sales].include?(log_type) return unless MANDATORY_RESOURCES.include?(resource_type) CollectionResource.new( diff --git a/app/views/collection_resources/_collection_resource_summary_list.erb b/app/views/collection_resources/_collection_resource_summary_list.erb index 148c52500..4e3485e76 100644 --- a/app/views/collection_resources/_collection_resource_summary_list.erb +++ b/app/views/collection_resources/_collection_resource_summary_list.erb @@ -10,7 +10,7 @@ <% end %> <% row.with_action( text: "Change", - href: "/", + href: update_mandatory_collection_resource_path(year: resource.year, log_type: resource.log_type, resource_type: resource.resource_type), ) %> <% else %> <% row.with_value do %> diff --git a/app/views/collection_resources/edit.html.erb b/app/views/collection_resources/edit.html.erb new file mode 100644 index 000000000..00bbf39cb --- /dev/null +++ b/app/views/collection_resources/edit.html.erb @@ -0,0 +1,28 @@ +<% content_for :before_content do %> + <%= govuk_back_link href: collection_resources_path %> +<% end %> + +
+
+ <%= form_with model: @collection_resource, scope: :form, url: update_mandatory_collection_resource_path, method: :patch do |f| %> + <%= f.hidden_field :year %> + <%= f.hidden_field :log_type %> + <%= f.hidden_field :resource_type %> + + <%= f.govuk_error_summary %> + + <%= "#{@collection_resource.log_type.humanize} #{text_year_range_format(@collection_resource.year)}" %> +

Change the <%= @collection_resource.resource_type.humanize.downcase %>

+ +

+ This file will be available for all users to download. +

+ + <%= f.govuk_file_field :file, + label: { text: "Upload file", size: "m" } %> + + <%= f.govuk_submit "Save changes" %> + <%= govuk_button_link_to "Cancel", collection_resources_path, secondary: true %> + <% end %> +
+
diff --git a/config/routes.rb b/config/routes.rb index 2d442bc22..1ac459b6b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,6 +42,7 @@ Rails.application.routes.draw do get "collection-resources", to: "collection_resources#index" get "/collection-resources/:log_type/:year/:resource_type/download", to: "collection_resources#download_mandatory_collection_resource", as: :download_mandatory_collection_resource + get "/collection-resources/:log_type/:year/:resource_type/edit", to: "collection_resources#update_mandatory_collection_resource", as: :update_mandatory_collection_resource resources :collection_resources, path: "/collection-resources" do get "/download", to: "collection_resources#download_additional_collection_resource" # when we get to adding them diff --git a/spec/requests/collection_resources_controller_spec.rb b/spec/requests/collection_resources_controller_spec.rb index 4a066ef13..026b917c9 100644 --- a/spec/requests/collection_resources_controller_spec.rb +++ b/spec/requests/collection_resources_controller_spec.rb @@ -86,6 +86,19 @@ RSpec.describe CollectionResourcesController, type: :request do it "displays change links" do expect(page).to have_selector(:link_or_button, "Change", count: 12) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "lettings", resource_type: "paper_form")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "lettings", resource_type: "bulk_upload_template")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "lettings", resource_type: "bulk_upload_specification")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "paper_form")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_template")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_specification")) + + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "lettings", resource_type: "paper_form")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "lettings", resource_type: "bulk_upload_template")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "lettings", resource_type: "bulk_upload_specification")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "sales", resource_type: "paper_form")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "sales", resource_type: "bulk_upload_template")) + expect(page).to have_link("Change", href: update_mandatory_collection_resource_path(year: 2025, log_type: "sales", resource_type: "bulk_upload_specification")) end end @@ -182,4 +195,61 @@ RSpec.describe CollectionResourcesController, type: :request do end end end + + describe "GET #update_mandatory_collection_resource" do + context "when user is not signed in" do + it "redirects to the sign in page" do + get update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_template") + expect(response).to redirect_to(new_user_session_path) + end + end + + context "when user is signed in as a data coordinator" do + let(:user) { create(:user, :data_coordinator) } + + before do + sign_in user + end + + it "returns page not found" do + get update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_template") + expect(response).to have_http_status(:not_found) + end + end + + context "when user is signed in as a data provider" do + let(:user) { create(:user, :data_provider) } + + before do + sign_in user + end + + it "returns page not found" do + get update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_template") + expect(response).to have_http_status(:not_found) + end + end + + context "when user is signed in as a support user" do + let(:user) { create(:user, :support) } + + before do + allow(Time.zone).to receive(:today).and_return(Time.zone.local(2025, 1, 8)) + allow(user).to receive(:need_two_factor_authentication?).and_return(false) + sign_in user + end + + it "displays update collection resources page content" do + get update_mandatory_collection_resource_path(year: 2024, log_type: "sales", resource_type: "bulk_upload_template") + + expect(page).to have_content("Sales 2024 to 2025") + expect(page).to have_content("Change the bulk upload template") + expect(page).to have_content("This file will be available for all users to download.") + expect(page).to have_content("Upload file") + expect(page).to have_button("Save changes") + expect(page).to have_link("Back", href: collection_resources_path) + expect(page).to have_link("Cancel", href: collection_resources_path) + end + end + end end