Moves UniUpdatesBatch as model method for each controller and adds fi…

…lter_duplicate_barcodes concern

app/controllers/change_current_locations_controller.rb

@@ -9,10 +9,10 @@ def create
     @change_current_location = ChangeCurrentLocation.new(params[:change_current_location])
     if @change_current_location.valid?
       array_of_item_ids = @change_current_location.parse_uploaded_file
-      filtered_item_ids = UniUpdates.filter_duplicates(array_of_item_ids)
+      filtered_item_ids = FilterDuplicateBarcodes.filtered_item_ids(array_of_item_ids)
       uniques = filtered_item_ids[0]
       duplicates = filtered_item_ids[1].join(' ')
-      @uni_updates_batch = UniUpdatesBatch.create_current_location_batch(params, uniques.count)
+      @uni_updates_batch = ChangeCurrentLocation.batch_for_transfer_item(params, uniques)
       UniUpdates.create_for_batch(uniques, @uni_updates_batch)
       WebformsMailer.batch_upload_email(@uni_updates_batch, duplicates).deliver_now
       flash[:notice] = 'Batch uploaded!'

app/controllers/change_home_locations_controller.rb

@@ -9,10 +9,10 @@ def create
     @change_home_location = ChangeHomeLocation.new(params[:change_home_location])
     if @change_home_location.valid?
       array_of_item_ids = @change_home_location.parse_uploaded_file
-      filtered_item_ids = UniUpdates.filter_duplicates(array_of_item_ids)
+      filtered_item_ids = FilterDuplicateBarcodes.filtered_item_ids(array_of_item_ids)
       uniques = filtered_item_ids[0]
       duplicates = filtered_item_ids[1].join(' ')
-      @uni_updates_batch = UniUpdatesBatch.create_home_location_batch(params, uniques.count)
+      @uni_updates_batch = ChangeHomeLocation.batch_for_transfer_item(params, uniques)
       UniUpdates.create_for_batch(uniques, @uni_updates_batch)
       WebformsMailer.batch_upload_email(@uni_updates_batch, duplicates).deliver_now
       flash[:notice] = 'Batch uploaded!'

app/controllers/change_item_types_controller.rb

@@ -9,10 +9,10 @@ def create
     @change_item_type = ChangeItemType.new(params[:change_item_type])
     if @change_item_type.valid?
       array_of_item_ids = @change_item_type.parse_uploaded_file
-      filtered_item_ids = UniUpdates.filter_duplicates(array_of_item_ids)
+      filtered_item_ids = FilterDuplicateBarcodes.filtered_item_ids(array_of_item_ids)
       uniques = filtered_item_ids[0]
       duplicates = filtered_item_ids[1].join(' ')
-      @uni_updates_batch = UniUpdatesBatch.create_item_type_batch(params, uniques.count)
+      @uni_updates_batch = ChangeItemType.batch_for_transfer_item(params, uniques)
       UniUpdates.create_for_batch(uniques, @uni_updates_batch)
       WebformsMailer.batch_upload_email(@uni_updates_batch, duplicates).deliver_now
       flash[:notice] = 'Batch uploaded!'

app/controllers/concerns/filter_duplicate_barcodes.rb

@@ -0,0 +1,10 @@
+###
+# Utilities to Filter duplicate barcodes from UniUpdates
+###
+module FilterDuplicateBarcodes
+  extend ActiveSupport::Concern
+
+  def self.filtered_item_ids(array_of_item_ids)
+    UniUpdates.filter_duplicates(array_of_item_ids)
+  end
+end

app/controllers/transfer_items_controller.rb

@@ -9,10 +9,10 @@ def create
     @transfer_item = TransferItem.new(params[:transfer_item])
     if @transfer_item.valid?
       array_of_item_ids = @transfer_item.parse_uploaded_file
-      filtered_item_ids = UniUpdates.filter_duplicates(array_of_item_ids)
+      filtered_item_ids = FilterDuplicateBarcodes.filtered_item_ids(array_of_item_ids)
       uniques = filtered_item_ids[0]
       duplicates = filtered_item_ids[1].join(' ')
-      @uni_updates_batch = UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+      @uni_updates_batch = TransferItem.batch_for_transfer_item(params, uniques)
       UniUpdates.create_for_batch(uniques, @uni_updates_batch)
       WebformsMailer.batch_upload_email(@uni_updates_batch, duplicates).deliver_now
       flash[:notice] = 'Batch uploaded!'

app/controllers/withdraw_items_controller.rb

@@ -9,10 +9,10 @@ def create
     @withdraw_item = WithdrawItem.new(params[:withdraw_item])
     if @withdraw_item.valid?
       array_of_item_ids = @withdraw_item.parse_uploaded_file
-      filtered_item_ids = UniUpdates.filter_duplicates(array_of_item_ids)
+      filtered_item_ids = FilterDuplicateBarcodes.filtered_item_ids(array_of_item_ids)
       uniques = filtered_item_ids[0]
       duplicates = filtered_item_ids[1].join(' ')
-      @uni_updates_batch = UniUpdatesBatch.create_withdraw_item_batch(params, uniques.count)
+      @uni_updates_batch = WithdrawItem.batch_for_transfer_item(params, uniques)
       UniUpdates.create_for_batch(uniques, @uni_updates_batch)
       WebformsMailer.batch_upload_email(@uni_updates_batch, duplicates).deliver_now
       flash[:notice] = 'Batch uploaded!'

app/models/change_current_location.rb

@@ -17,6 +17,12 @@ class ChangeCurrentLocation
   attr_accessor :priority
   attr_accessor :export_yn
   attr_accessor :check_bc_first
+  attr_accessor :params
+  attr_accessor :uniques
   validates :current_library, :new_current_location, :item_ids, presence: true
   validates :email, format: { with: Rails.configuration.email_pattern }, allow_blank: true
+
+  def self.batch_for_transfer_item(params, uniques)
+    UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+  end
 end

app/models/change_home_location.rb

@@ -19,4 +19,8 @@ class ChangeHomeLocation
   attr_accessor :check_bc_first
   validates :current_library, :new_home_location, :item_ids, presence: true
   validates :email, format: { with: Rails.configuration.email_pattern }, allow_blank: true
+
+  def self.batch_for_transfer_item(params, uniques)
+    UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+  end
 end

app/models/change_item_type.rb

@@ -20,4 +20,8 @@ class ChangeItemType
   attr_accessor :check_bc_first
   validates :current_library, :new_item_type, :item_ids, presence: true
   validates :email, format: { with: Rails.configuration.email_pattern }, allow_blank: true
+
+  def self.batch_for_transfer_item(params, uniques)
+    UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+  end
 end

app/models/transfer_item.rb

@@ -10,4 +10,8 @@ class TransferItem
   validates :current_library, :new_library, :new_homeloc, :item_ids,
             presence: true
   validates :email, format: { with: Rails.configuration.email_pattern }, allow_blank: true
+
+  def self.batch_for_transfer_item(params, uniques)
+    UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+  end
 end

app/models/withdraw_item.rb

@@ -6,6 +6,12 @@ class WithdrawItem
   include ActiveModel::Model
   attr_accessor :current_library, :item_ids, :email, :comments, :load_date,
                 :user_name, :action, :priority, :export_yn, :check_bc_first
+  attr_accessor :params
+  attr_accessor :uniques
   validates :current_library, :item_ids, presence: true
   validates :email, format: { with: Rails.configuration.email_pattern }, allow_blank: true
+
+  def self.batch_for_transfer_item(params, uniques)
+    UniUpdatesBatch.create_transfer_item_batch(params, uniques.count)
+  end
 end

spec/controllers/change_current_locations_spec.rb

@@ -9,19 +9,22 @@
     end
   end
   describe 'post#create' do
+    before do
+      stub_current_user(FactoryBot.create(:authorized_user))
+      allow(ChangeCurrentLocation).to receive(:batch_for_transfer_item)
+        .and_return(FactoryBot.create(:uni_updates_batch))
+    end
     let(:barcode_file) do
       extend ActionDispatch::TestProcess
       fixture_file_upload('files/test_file.txt', 'text/plain')
     end
     it 'returns 302 when changing_current_location' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_current_location: { current_library: 'GREEN',
                                                new_current_location: 'SHADOW',
                                                item_ids: barcode_file }
       expect(response).to have_http_status(302)
     end
     it 'renders new template with an invalid object' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_current_location: { current_library: '', new_current_location: '' }
       expect(response).to render_template('new')
     end

spec/controllers/change_home_locations_controller_spec.rb

@@ -9,19 +9,21 @@
     end
   end
   describe 'post#create' do
+    before do
+      stub_current_user(FactoryBot.create(:authorized_user))
+      allow(ChangeHomeLocation).to receive(:batch_for_transfer_item).and_return(FactoryBot.create(:uni_updates_batch))
+    end
     let(:barcode_file) do
       extend ActionDispatch::TestProcess
       fixture_file_upload('files/test_file.txt', 'text/plain')
     end
     it 'returns 302 when changing_home_location' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_home_location: { current_library: 'GREEN',
                                             new_home_location: 'STACKS',
                                             item_ids: barcode_file }
       expect(response).to have_http_status(302)
     end
     it 'renders new template with an invalid object' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_current_location: { current_library: '',
                                                new_current_location: '' }
       expect(response).to render_template('new')

spec/controllers/change_item_types_controller_spec.rb

@@ -9,17 +9,19 @@
     end
   end
   describe 'post#create' do
+    before do
+      stub_current_user(FactoryBot.create(:authorized_user))
+      allow(ChangeItemType).to receive(:batch_for_transfer_item).and_return(FactoryBot.create(:uni_updates_batch))
+    end
     let(:barcode_file) do
       extend ActionDispatch::TestProcess
       fixture_file_upload('files/test_file.txt', 'text/plain')
     end
     it 'returns 302 when changing_item_type' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_item_type: { current_library: 'GREEN', new_item_type: 'UNKNOWN', item_ids: barcode_file }
       expect(response).to have_http_status(302)
     end
     it 'renders new template with an invalid object' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, change_item_type: { current_library: '', new_item_type: '' }
       expect(response).to render_template('new')
     end

spec/controllers/withdraw_items_controller_spec.rb

@@ -9,17 +9,19 @@
     end
   end
   describe 'post#create' do
+    before do
+      stub_current_user(FactoryBot.create(:authorized_user))
+      allow(WithdrawItem).to receive(:batch_for_transfer_item).and_return(FactoryBot.create(:uni_updates_batch))
+    end
     let(:barcode_file) do
       extend ActionDispatch::TestProcess
       fixture_file_upload('files/test_file.txt', 'text/plain')
     end
     it 'returns 302 when withdraw_item' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, withdraw_item: { current_library: 'GREEN', item_ids: barcode_file }
       expect(response).to have_http_status(302)
     end
     it 'renders new template with an invalid object' do
-      stub_current_user(FactoryBot.create(:authorized_user))
       post :create, withdraw_item: { current_library: '' }
       expect(response).to render_template('new')
     end