From 5ed930108dbc59e718f204fa196cb1db653f7b67 Mon Sep 17 00:00:00 2001 From: Bilal Date: Thu, 9 Jul 2020 20:11:57 +0200 Subject: [PATCH] TMP commit --- app/jobs/generate_contracts_zip_job.rb | 7 ++++--- app/models/concerns/csv_exportable.rb | 6 +----- app/models/location_release.rb | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/jobs/generate_contracts_zip_job.rb b/app/jobs/generate_contracts_zip_job.rb index c21954a..f1b4137 100644 --- a/app/jobs/generate_contracts_zip_job.rb +++ b/app/jobs/generate_contracts_zip_job.rb @@ -21,9 +21,10 @@ class GenerateContractsZipJob < ApplicationJob zipfile.add(attachment, File.join("#{dir}/", attachment)) end - csv_file = generate_csv releases - puts ">>>>> GENERATED =====" - zipfile.get_output_stream("#{@folder_name}.csv") { |f| f.puts(csv_file) } + if Object.const_get(@release_type).include?(CsvExportable) + csv_file = generate_csv releases + zipfile.get_output_stream("#{@folder_name}.csv") { |f| f.puts(csv_file) } + end end @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip") diff --git a/app/models/concerns/csv_exportable.rb b/app/models/concerns/csv_exportable.rb index c8cc664..df2ac33 100644 --- a/app/models/concerns/csv_exportable.rb +++ b/app/models/concerns/csv_exportable.rb @@ -25,7 +25,6 @@ module CsvExportable included do class << self def csv_headers - puts "HEADERS ====" plural_class_name = self.name.underscore.pluralize headers = HEADERS[self.name.underscore.to_sym] @@ -36,12 +35,9 @@ module CsvExportable end def to_csv_row - puts "==== = CSV ROW" - v = VALUES[self.class.name.underscore.to_sym].map do |function| + VALUES[self.class.name.underscore.to_sym].map do |function| send(function) end - puts v - v end private diff --git a/app/models/location_release.rb b/app/models/location_release.rb index a5b6a02..389d0c7 100644 --- a/app/models/location_release.rb +++ b/app/models/location_release.rb @@ -10,6 +10,7 @@ class LocationRelease < ApplicationRecord include Syncable include Taggable include PersonName + include CsvExportable composed_of :address, mapping: [