bulk upload years now dynamic

app/models/forms/bulk_upload_lettings/year.rb

@@ -12,15 +12,20 @@ module Forms
       end
 
       def options
-        [
+        possible_years.map do |year|
-          OpenStruct.new(id: "2022", name: "2022/2023"),
+          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
-          OpenStruct.new(id: "2021", name: "2021/2022"),
+        end
-        ]
       end
 
       def back_path
         Rails.application.routes.url_helpers.lettings_logs_path
       end
+
+    private
+
+      def possible_years
+        FormHandler.instance.lettings_forms.values.map { |form| form.start_date.year }.sort.reverse
+      end
     end
   end
 end

app/models/forms/bulk_upload_sales/year.rb

@@ -12,15 +12,20 @@ module Forms
       end
 
       def options
-        [
+        possible_years.map do |year|
-          OpenStruct.new(id: "2022", name: "2022/2023"),
+          OpenStruct.new(id: year, name: "#{year}/#{year + 1}")
-          OpenStruct.new(id: "2021", name: "2021/2022"),
+        end
-        ]
       end
 
       def back_path
         Rails.application.routes.url_helpers.sales_logs_path
       end
+
+    private
+
+      def possible_years
+        FormHandler.instance.sales_forms.values.map { |form| form.start_date.year }.sort.reverse
+      end
     end
   end
 end

spec/models/forms/bulk_upload_lettings/year_spec.rb

@@ -0,0 +1,12 @@
+require "rails_helper"
+
+RSpec.describe Forms::BulkUploadLettings::Year do
+  subject(:form) { described_class.new }
+
+  describe "#options" do
+    it "returns correct years" do
+      expect(form.options.map(&:id)).to eql([2022, 2021])
+      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+    end
+  end
+end

spec/models/forms/bulk_upload_sales/year_spec.rb

@@ -0,0 +1,12 @@
+require "rails_helper"
+
+RSpec.describe Forms::BulkUploadSales::Year do
+  subject(:form) { described_class.new }
+
+  describe "#options" do
+    it "returns correct years" do
+      expect(form.options.map(&:id)).to eql([2022, 2021])
+      expect(form.options.map(&:name)).to eql(%w[2022/2023 2021/2022])
+    end
+  end
+end