WIP format_array not getting passed for some reason.

sul-dlss · May 24, 2019 · 082a4c6 · 082a4c6
1 parent c81a1f7
commit 082a4c6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/app/controllers/circulation_statistics_reports_controller.rb b/app/controllers/circulation_statistics_reports_controller.rb
@@ -3,11 +3,13 @@
 ###
 class CirculationStatisticsReportsController < ApplicationController
   def new
-    @circulation_statistics_report = CirculationStatisticsReport.new(params[:circulation_statistics_report])
+    @circulation_statistics_report = CirculationStatisticsReport.new
   end
 
   def create
-    @circulation_statistics_report = CirculationStatisticsReport.new(params[:circulation_statistics_report])
+    # byebug
+    # remove_formats(circulation_statistics_report_params: :format_array)
+    @circulation_statistics_report = CirculationStatisticsReport.new(circulation_statistics_report_params)
     if @circulation_statistics_report.valid?
       flash[:notice] = 'Circulation Statistics Report submitted!'
       CirculationStatisticsReportLog.save_stats(@circulation_statistics_report)
@@ -21,4 +23,23 @@ def home_locations
     @home_locations = UniLibsLocs.home_locations_from(params[:lib])
     render layout: false
   end
+
+  private
+
+  def circulation_statistics_report_params
+    params.require(:circulation_statistics_report).permit(:email, :lib_array, :source, :range_type,
+                                                          :call_lo, :call_hi, :call_alpha, :barcodes,
+                                                          :format_array, :exclude_inactive, :min_yr,
+                                                          :max_yr, :exclude_bad_yr, :include_inhouse,
+                                                          :no_qtrly, :ckey_url, :tag_field, :tag_field2,
+                                                          :tags_url, :link_type, :col_header1, :col_header2,
+                                                          :col_header3, :col_header4, :col_header5,
+                                                          :blank_col_array, :lib_loc_array, :user_id)
+  end
+
+  def remove_formats(format_array)
+    remove_list = ['', 'All Formats']
+    formats = (format_array - remove_list).join(',')
+    circulation_statistics_report_params.merge!(format_array: formats)
+  end
 end
diff --git a/app/models/circulation_statistics_report_log.rb b/app/models/circulation_statistics_report_log.rb
@@ -16,7 +16,7 @@ def self.save_stats(circ_stats)
 
   def self.other_params(circ_stats)
     { email: circ_stats.email, selcall_src: circ_stats.source,
-      format: circ_stats.format_array.reject! { |a| a == '' || a == 'All Formats' }.join(','),
+      format: process_format_array(circ_stats.format_array),
       exclude_inactive: circ_stats.exclude_inactive,
       exclude_bad_year: circ_stats.exclude_bad_yr, summary_only: circ_stats.no_qtrly,
       ckey_url: circ_stats.ckey_url, extras_url: circ_stats.tags_url,
@@ -27,6 +27,11 @@ def self.other_params(circ_stats)
       status: 'REQUEST' }
   end
 
+  def self.process_format_array(formats)
+    remove_formats = ['', 'All Formats']
+    formats - remove_formats.join(',')
+  end
+
   # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
   def self.process_range_type_params(circ_stats)
     range_type_params = {}