From 56db4b9aa82c7c82a0948464e1be64554dfd75f2 Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Mon, 16 Feb 2026 11:14:29 +0000 Subject: [PATCH 1/2] CLDC-4231: add create test log buttons for current and next collection years --- .../create_log_actions_component.html.erb | 16 ++++++++-- .../create_log_actions_component.rb | 17 ++++++++++ app/controllers/test_data_controller.rb | 32 +++++++++++++++++++ config/routes.rb | 4 +++ 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/app/components/create_log_actions_component.html.erb b/app/components/create_log_actions_component.html.erb index 3eab0f871..d0eb56b16 100644 --- a/app/components/create_log_actions_component.html.erb +++ b/app/components/create_log_actions_component.html.erb @@ -14,13 +14,25 @@ These tools can only be seen and used in testing environments.
<%= govuk_button_link_to create_test_log_href, class: "govuk-button" do %> - New test log + New <%= current_collection_year_label %> test log + + <% end %> + <%= govuk_button_link_to create_next_year_test_log_href, class: "govuk-button" do %> + New <%= next_collection_year_label %> test log <% end %> <%= govuk_button_link_to create_setup_test_log_href, class: "govuk-button" do %> - New test log (setup only) + New <%= current_collection_year_label %> test log (setup only) + + <% end %> + <%= govuk_button_link_to create_next_year_setup_test_log_href, class: "govuk-button" do %> + New <%= next_collection_year_label %> test log (setup only) diff --git a/app/components/create_log_actions_component.rb b/app/components/create_log_actions_component.rb index ae240bc91..c618c01fc 100644 --- a/app/components/create_log_actions_component.rb +++ b/app/components/create_log_actions_component.rb @@ -1,5 +1,6 @@ class CreateLogActionsComponent < ViewComponent::Base include Rails.application.routes.url_helpers + include CollectionTimeHelper attr_reader :bulk_upload, :user, :log_type @@ -38,10 +39,26 @@ class CreateLogActionsComponent < ViewComponent::Base send("create_test_#{log_type}_log_path") end + def create_next_year_test_log_href + send("create_next_year_test_#{log_type}_log_path") + end + def create_setup_test_log_href send("create_setup_test_#{log_type}_log_path") end + def create_next_year_setup_test_log_href + send("create_next_year_setup_test_#{log_type}_log_path") + end + + def current_collection_year_label + "#{current_collection_start_year - 2000}/#{current_collection_end_year - 2000}" + end + + def next_collection_year_label + "#{next_collection_start_year - 2000}/#{next_collection_end_year - 2000}" + end + def create_test_bulk_upload_href(year) send("create_#{year}_test_#{log_type}_bulk_upload_path") end diff --git a/app/controllers/test_data_controller.rb b/app/controllers/test_data_controller.rb index d9315d68c..e0737edec 100644 --- a/app/controllers/test_data_controller.rb +++ b/app/controllers/test_data_controller.rb @@ -10,6 +10,14 @@ class TestDataController < ApplicationController redirect_to lettings_log_path(log) end + def create_next_year_test_lettings_log + return render_not_found unless FeatureToggle.create_test_logs_enabled? + + end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days + log = FactoryBot.create(:lettings_log, :completed, assigned_to: current_user, ppostcode_full: "SW1A 1AA", manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + redirect_to lettings_log_path(log) + end + def create_setup_test_lettings_log return render_not_found unless FeatureToggle.create_test_logs_enabled? @@ -17,6 +25,14 @@ class TestDataController < ApplicationController redirect_to lettings_log_path(log) end + def create_next_year_setup_test_lettings_log + return render_not_found unless FeatureToggle.create_test_logs_enabled? + + end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days + log = FactoryBot.create(:lettings_log, :setup_completed, assigned_to: current_user, manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + redirect_to lettings_log_path(log) + end + %w[2025 2026].each do |year| define_method("create_#{year}_test_lettings_bulk_upload") do return render_not_found unless FeatureToggle.create_test_logs_enabled? @@ -47,6 +63,14 @@ class TestDataController < ApplicationController redirect_to sales_log_path(log) end + def create_next_year_test_sales_log + return render_not_found unless FeatureToggle.create_test_logs_enabled? + + end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days + log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + redirect_to sales_log_path(log) + end + def create_setup_test_sales_log return render_not_found unless FeatureToggle.create_test_logs_enabled? @@ -54,6 +78,14 @@ class TestDataController < ApplicationController redirect_to sales_log_path(log) end + def create_next_year_setup_test_sales_log + return render_not_found unless FeatureToggle.create_test_logs_enabled? + + end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days + log = FactoryBot.create(:sales_log, :shared_ownership_setup_complete, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + redirect_to sales_log_path(log) + end + %w[2025 2026].each do |year| define_method("create_#{year}_test_sales_bulk_upload") do return render_not_found unless FeatureToggle.create_test_logs_enabled? diff --git a/config/routes.rb b/config/routes.rb index e0abecef1..a9ea0da42 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -405,11 +405,15 @@ Rails.application.routes.draw do if FeatureToggle.create_test_logs_enabled? get "create-test-lettings-log", to: "test_data#create_test_lettings_log" + get "create-next-year-test-lettings-log", to: "test_data#create_next_year_test_lettings_log" get "create-setup-test-lettings-log", to: "test_data#create_setup_test_lettings_log" + get "create-next-year-setup-test-lettings-log", to: "test_data#create_next_year_setup_test_lettings_log" get "create-2025-test-lettings-bulk-upload", to: "test_data#create_2025_test_lettings_bulk_upload" get "create-2026-test-lettings-bulk-upload", to: "test_data#create_2026_test_lettings_bulk_upload" get "create-test-sales-log", to: "test_data#create_test_sales_log" + get "create-next-year-test-sales-log", to: "test_data#create_next_year_test_sales_log" get "create-setup-test-sales-log", to: "test_data#create_setup_test_sales_log" + get "create-next-year-setup-test-sales-log", to: "test_data#create_next_year_setup_test_sales_log" get "create-2025-test-sales-bulk-upload", to: "test_data#create_2025_test_sales_bulk_upload" get "create-2026-test-sales-bulk-upload", to: "test_data#create_2026_test_sales_bulk_upload" end From b252fefb5ad600826ddc7bdbea1b01fe198ec185 Mon Sep 17 00:00:00 2001 From: Nat Dean-Lewis Date: Mon, 16 Feb 2026 11:25:57 +0000 Subject: [PATCH 2/2] CLDC-4231: remove end date overrides --- app/controllers/test_data_controller.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/controllers/test_data_controller.rb b/app/controllers/test_data_controller.rb index e0737edec..5298a4fc7 100644 --- a/app/controllers/test_data_controller.rb +++ b/app/controllers/test_data_controller.rb @@ -13,8 +13,7 @@ class TestDataController < ApplicationController def create_next_year_test_lettings_log return render_not_found unless FeatureToggle.create_test_logs_enabled? - end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days - log = FactoryBot.create(:lettings_log, :completed, assigned_to: current_user, ppostcode_full: "SW1A 1AA", manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + log = FactoryBot.create(:lettings_log, :completed, assigned_to: current_user, ppostcode_full: "SW1A 1AA", manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1))) redirect_to lettings_log_path(log) end @@ -28,8 +27,7 @@ class TestDataController < ApplicationController def create_next_year_setup_test_lettings_log return render_not_found unless FeatureToggle.create_test_logs_enabled? - end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days - log = FactoryBot.create(:lettings_log, :setup_completed, assigned_to: current_user, manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + log = FactoryBot.create(:lettings_log, :setup_completed, assigned_to: current_user, manual_address_entry_selected: false, startdate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1))) redirect_to lettings_log_path(log) end @@ -66,8 +64,7 @@ class TestDataController < ApplicationController def create_next_year_test_sales_log return render_not_found unless FeatureToggle.create_test_logs_enabled? - end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days - log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + log = FactoryBot.create(:sales_log, :completed, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1))) redirect_to sales_log_path(log) end @@ -81,8 +78,7 @@ class TestDataController < ApplicationController def create_next_year_setup_test_sales_log return render_not_found unless FeatureToggle.create_test_logs_enabled? - end_date_override = FeatureToggle.allow_future_form_use? ? nil : Time.zone.now + 14.days - log = FactoryBot.create(:sales_log, :shared_ownership_setup_complete, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1), end_date_override:)) + log = FactoryBot.create(:sales_log, :shared_ownership_setup_complete, assigned_to: current_user, manual_address_entry_selected: false, saledate: generate_different_date_within_collection_year(Time.zone.local(next_collection_start_year, 4, 1))) redirect_to sales_log_path(log) end