From 9250496d950b08ff3271bd2a98fab1d4c2c5b545 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 14 Sep 2022 15:53:29 +0100 Subject: [PATCH] Use current, previous and next forms in sales log model --- app/models/sales_log.rb | 5 +++-- spec/models/sales_log_spec.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index 716cd598c..a8b1b02f8 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -21,9 +21,10 @@ class SalesLog < Log end def form_name - return unless saledate + return unless startdate - "#{collection_start_year}_#{collection_start_year + 1}_sales" + form_mappings = { 0 => "current_sales", 1 => "previous_sales", -1 => "next_sales" } + form_mappings[FormHandler.instance.current_collection_start_year - collection_start_year] if collection_start_year.present? end def form diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb index 8ccbf082a..7ab423266 100644 --- a/spec/models/sales_log_spec.rb +++ b/spec/models/sales_log_spec.rb @@ -34,7 +34,7 @@ RSpec.describe SalesLog, type: :model do it "has returns the correct form based on the start date" do expect(sales_log.form_name).to be_nil expect(sales_log.form).to be_a(Form) - expect(sales_log_2.form_name).to eq("2022_2023_sales") + expect(sales_log_2.form_name).to eq("current_sales") expect(sales_log_2.form).to be_a(Form) end end