Browse Source

Add needstype to lettings bulk upload model

pull/1105/head
Kat 4 years ago
parent
commit
938c943876
  1. 2
      app/controllers/bulk_upload_lettings_logs_controller.rb
  2. 2
      app/models/forms/bulk_upload_lettings/upload_your_file.rb
  3. 7
      db/migrate/20221219112421_add_needstype_to_bulk_upload.rb
  4. 1
      db/schema.rb
  5. 4
      spec/models/forms/bulk_upload_lettings/upload_your_file_spec.rb

2
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

2
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,
)

7
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

1
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

4
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

Loading…
Cancel
Save