Working csv export for all reports

.env.example

@@ -18,3 +18,7 @@ MAILER_ADDRESS=xxxxxxxxxx
 MAILER_USERNAME=xxxxxxxxxx
 MAILER_PASSWORD=xxxxxxxxxx
 MAILER_HOST=xxxxxxxxxx
+
+# Sidekiq admin
+SIDEKIQ_ADMIN_USERNAME=xxxxxxxxxxxxx
+SIDEKIQ_ADMIN_PASSWORD=xxxxxxxxxxxxx

Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 # Frameworks
 gem 'rails', '4.2.6'
+gem 'sinatra', :require => false
+
 
 # DB
 gem 'pg', '~> 0.18.4'

Gemfile.lock

@@ -277,6 +277,7 @@ DEPENDENCIES
   select2-rails!
   sidekiq (~> 4.1.4)
   simplecov
+  sinatra
   slack-notifier (~> 1.5.1)
   uglifier (>= 1.3.0)
   web-console (~> 2.0)

config/initializers/sidekiq.rb

@@ -1,3 +1,10 @@
+require 'sidekiq'
+require 'sidekiq/web'
+
+Sidekiq::Web.use(Rack::Auth::Basic) do |user, password|
+    [user, password] == [ENV['SIDEKIQ_ADMIN_USERNAME'], ENV['SIDEKIQ_ADMIN_PASSWORD']]
+end
+
 Sidekiq.configure_server do |config|
   config.redis = {url: $redis.client.options[:url]}
 end

config/routes.rb

@@ -15,6 +15,9 @@
     resources :users, controller: "users"
   end
 
+  require 'sidekiq/web'
+  mount Sidekiq::Web => '/sidekiq'
+
   get "/search", to: "reports#search", as: "search_reports"
   get "/export", to: "reports#export", as: "export_reports"
   get "/reports/:id/validate", to: "reports#validate", as: "validate_report"

lib/modules/csv_builder.rb

@@ -13,21 +13,20 @@ def self.build(reports)
                     "Confiscation?", "Arrests Made?", "Prosecution?", "Prosecution Successful?", "Punishment Successful?",
                     "Other Illegal Activities", "Man-made disturbances"]
 
-    filepath = "#{Rails.root.to_s}/tmp/csv_export_#{DateTime.now.to_i}"
+    filepath = "#{Rails.root.to_s}/tmp/csv_export_#{DateTime.now.to_i}.csv"
 
     CSV.open(filepath, "wb") do |csv|
       csv << column_names
       reports.each do |report|
         # Make the first row for the report, no apes
-        row = make_report_row(report)
-        csv << row
+        csv << self.make_report_row(report)
 
         # For each ape in live, dead and parts, make a row
-        statuses = ['live', 'dead', 'parts']
-        statuses.each do |status|
-          apes['answers'][status].each do |ape|
-            row = make_report_row(report, ape, status.to_sym)
-            csv << row
+        ['live', 'dead', 'parts'].each do |status|
+          if report.data.dig('answers', status).present? # If any live/dead/parts
+            report.data['answers'][status].each do |ape|
+              csv << self.make_report_row(report, ape, status.to_sym)
+            end
           end
         end
       end
@@ -36,7 +35,7 @@ def self.build(reports)
     filepath
   end
 
-  def make_report_row(report, ape=nil, status=nil)
+  def self.make_report_row(report, ape=nil, status=nil)
     # If an ape is passed in, it create a row with the details of this ape,
     # if not, it leaves these details blank and just creates a report row
 
@@ -47,16 +46,16 @@ def make_report_row(report, ape=nil, status=nil)
       report&.user&.agency&.name,
       report.data.dig('answers', 'own_organisation', 'selected'),
       report.created_at,
-      report.dig('answers', 'country_of_discovery', 'selected'),
-      report.data('answers', 'region_of_discovery', 'selected'),
+      report.data.dig('answers', 'country_of_discovery', 'selected'),
+      report.data.dig('answers', 'region_of_discovery', 'selected'),
       report.answer_to("date_of_discovery")&.strftime("%d/%m/%Y"),
-      report.data.dig('answers', 'location_coords', 'selected'),
+      report.data.dig('answers', 'location_coords', 'selected')&.values&.join(", "),
       report.data.dig('answers', 'type_of_location', 'selected')
     ]
 
     if ape.present? && (status == :live or status == :dead)
       ape_data = [
-        status.titleize,
+        status.to_s.titleize,
         ape.dig("genus_#{status}", 'selected'),
         ape.dig("species_subspecies_#{status}", 'selected'),
         ape.dig("intended_use_#{status}", 'selected'),
@@ -71,8 +70,7 @@ def make_report_row(report, ape=nil, status=nil)
       ]
 
       # Add empty fields for body parts
-      ape_data += Array.new(7, "")
-      end
+      ape_data += Array.new(7, nil)
     else
       #"Bone Qty",
       #"Foot/Hand Qty",
@@ -81,7 +79,7 @@ def make_report_row(report, ape=nil, status=nil)
       #"Meat Kg",
       #"Skin Qty",
       #"Skull Qty"
-      ape_data = Array.new(19, "")
+      ape_data = Array.new(19, nil)
     end
 
     report_data_2 = [
@@ -90,8 +88,8 @@ def make_report_row(report, ape=nil, status=nil)
       report.data.dig('answers', 'prosecution', 'selected'),
       report.data.dig('answers', 'prosecution_successful', 'selected'),
       report.data.dig('answers', 'punishment', 'selected'),
-      report.data.dig('answers', 'illegal_activities', 'selected'),
-      report.data.dig('answers', 'proximity', 'selected')
+      report.data.dig('answers', 'illegal_activities', 'selected')&.join(", "),
+      report.data.dig('answers', 'proximity', 'selected')&.join(", ")
     ]
 
     # Join the segments to form the full row