From b47b63cb259cd9e75be297b337608c820c49f0b8 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Thu, 28 Nov 2024 14:12:02 +0000 Subject: [PATCH] Refactor --- app/controllers/bulk_upload_lettings_logs_controller.rb | 9 ++++----- app/controllers/bulk_upload_sales_logs_controller.rb | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index e15ea92f6..39bc05f7e 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -1,7 +1,7 @@ class BulkUploadLettingsLogsController < ApplicationController before_action :authenticate_user! - before_action :validate_data_protection_agrement_signed! - before_action :validate_year! + before_action :validate_data_protection_agreement_signed! + before_action :validate_year!, except: %w[start] def start if have_choice_of_year? @@ -25,16 +25,15 @@ class BulkUploadLettingsLogsController < ApplicationController private - def validate_data_protection_agrement_signed! + def validate_data_protection_agreement_signed! return if @current_user.organisation.data_protection_confirmed? redirect_to lettings_logs_path end def validate_year! - return if params[:action] == "start" return if params[:id] == "year" - return if params[:id] == "guidance" && (params[:form].nil? || params[:form][:year].nil?) + return if params[:id] == "guidance" && params.dig(:form, :year).nil? allowed_years = [current_year] allowed_years.push(current_year - 1) if FormHandler.instance.lettings_in_crossover_period? diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index 6b3259b10..cb04cea95 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -1,7 +1,7 @@ class BulkUploadSalesLogsController < ApplicationController before_action :authenticate_user! - before_action :validate_data_protection_agrement_signed! - before_action :validate_year! + before_action :validate_data_protection_agreement_signed! + before_action :validate_year!, except: %w[start] def start if have_choice_of_year? @@ -25,16 +25,15 @@ class BulkUploadSalesLogsController < ApplicationController private - def validate_data_protection_agrement_signed! + def validate_data_protection_agreement_signed! return if @current_user.organisation.data_protection_confirmed? redirect_to sales_logs_path end def validate_year! - return if params[:action] == "start" return if params[:id] == "year" - return if params[:id] == "guidance" && (params[:form].nil? || params[:form][:year].nil?) + return if params[:id] == "guidance" && params.dig(:form, :year).nil? allowed_years = [current_year] allowed_years.push(current_year - 1) if FormHandler.instance.sales_in_crossover_period?