From 938c9438762020f76d84efed9b70208cbb66fea4 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 19 Dec 2022 13:59:46 +0000
Subject: [PATCH] Add needstype to lettings bulk upload model

---
 app/controllers/bulk_upload_lettings_logs_controller.rb    | 2 +-
 app/models/forms/bulk_upload_lettings/upload_your_file.rb  | 2 ++
 db/migrate/20221219112421_add_needstype_to_bulk_upload.rb  | 7 +++++++
 db/schema.rb                                               | 1 +
 .../forms/bulk_upload_lettings/upload_your_file_spec.rb    | 4 +++-
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20221219112421_add_needstype_to_bulk_upload.rb

diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb
index 104c31c05..77fb11209 100644
--- a/app/controllers/bulk_upload_lettings_logs_controller.rb
+++ b/app/controllers/bulk_upload_lettings_logs_controller.rb
@@ -47,6 +47,6 @@ private
   end
 
   def form_params
-    params.fetch(:form, {}).permit(:year, :file)
+    params.fetch(:form, {}).permit(:year, :needstype, :file)
   end
 end
diff --git a/app/models/forms/bulk_upload_lettings/upload_your_file.rb b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
index f49efafbf..7ba341cb5 100644
--- a/app/models/forms/bulk_upload_lettings/upload_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/upload_your_file.rb
@@ -8,6 +8,7 @@ module Forms
       include Rails.application.routes.url_helpers
 
       attribute :year, :integer
+      attribute :needstype, :integer
       attribute :file
       attribute :current_user
 
@@ -35,6 +36,7 @@ module Forms
           user: current_user,
           log_type: BulkUpload.log_types[:lettings],
           year:,
+          needstype:,
           filename: file.original_filename,
         )
 
diff --git a/db/migrate/20221219112421_add_needstype_to_bulk_upload.rb b/db/migrate/20221219112421_add_needstype_to_bulk_upload.rb
new file mode 100644
index 000000000..4a33f7f84
--- /dev/null
+++ b/db/migrate/20221219112421_add_needstype_to_bulk_upload.rb
@@ -0,0 +1,7 @@
+class AddNeedstypeToBulkUpload < ActiveRecord::Migration[7.0]
+  def change
+    change_table :bulk_uploads, bulk: true do |t|
+      t.column :needstype, :integer
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2d53aab20..6b81c96c9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -22,6 +22,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_21_172821) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "filename"
+    t.integer "needstype"
     t.index ["identifier"], name: "index_bulk_uploads_on_identifier", unique: true
     t.index ["user_id"], name: "index_bulk_uploads_on_user_id"
   end
diff --git a/spec/models/forms/bulk_upload_lettings/upload_your_file_spec.rb b/spec/models/forms/bulk_upload_lettings/upload_your_file_spec.rb
index 5101d10a9..49f7510ef 100644
--- a/spec/models/forms/bulk_upload_lettings/upload_your_file_spec.rb
+++ b/spec/models/forms/bulk_upload_lettings/upload_your_file_spec.rb
@@ -1,9 +1,10 @@
 require "rails_helper"
 
 RSpec.describe Forms::BulkUploadLettings::UploadYourFile do
-  subject(:form) { described_class.new(year:, file:, current_user:) }
+  subject(:form) { described_class.new(year:, needstype:, file:, current_user:) }
 
   let(:year) { 2022 }
+  let(:needstype) { 2 }
   let(:actual_file) { File.open(file_fixture("blank_bulk_upload_sales.csv")) }
   let(:file) do
     ActionDispatch::Http::UploadedFile.new(
@@ -37,6 +38,7 @@ RSpec.describe Forms::BulkUploadLettings::UploadYourFile do
       expect(bulk_upload.user).to eql(current_user)
       expect(bulk_upload.log_type).to eql("lettings")
       expect(bulk_upload.year).to eql(year)
+      expect(bulk_upload.needstype).to eql(needstype)
       expect(bulk_upload.filename).to eql("my-file.csv")
       expect(bulk_upload.identifier).to be_present
     end