DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

refactor(export): use predefined helpers

Browse source
This commit is contained in:
Paul Chavard 2022-04-12 11:59:24 +02:00
parent d14e132305
commit caace89d98
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/models/export.rb
View file

@ -87,22 +87,6 @@ class Export < ApplicationRecord
procedure_presentation_id.present? procedure_presentation_id.present?
end end
def xlsx?
format == self.class.formats.fetch(:xlsx)
end
def ods?
format == self.class.formats.fetch(:ods)
end
def csv?
format == self.class.formats.fetch(:csv)
end
def zip?
format == self.class.formats.fetch(:zip)
end
def self.find_or_create_export(format, groupe_instructeurs, time_span_type: time_span_types.fetch(:everything), statut: statuts.fetch(:tous), procedure_presentation: nil) def self.find_or_create_export(format, groupe_instructeurs, time_span_type: time_span_types.fetch(:everything), statut: statuts.fetch(:tous), procedure_presentation: nil)
create_with(groupe_instructeurs: groupe_instructeurs, procedure_presentation: procedure_presentation, procedure_presentation_snapshot: procedure_presentation&.snapshot) create_with(groupe_instructeurs: groupe_instructeurs, procedure_presentation: procedure_presentation, procedure_presentation_snapshot: procedure_presentation&.snapshot)
.includes(:procedure_presentation) .includes(:procedure_presentation)
@ -123,20 +107,20 @@ class Export < ApplicationRecord
{ {
xlsx: { xlsx: {
time_span_type: not_filtered.filter(&:xlsx?).index_by(&:time_span_type), time_span_type: not_filtered.filter(&:format_xlsx?).index_by(&:time_span_type),
statut: filtered.filter(&:xlsx?).index_by(&:statut) statut: filtered.filter(&:format_xlsx?).index_by(&:statut)
}, },
ods: { ods: {
time_span_type: not_filtered.filter(&:ods?).index_by(&:time_span_type), time_span_type: not_filtered.filter(&:format_ods?).index_by(&:time_span_type),
statut: filtered.filter(&:ods?).index_by(&:statut) statut: filtered.filter(&:format_ods?).index_by(&:statut)
}, },
csv: { csv: {
time_span_type: not_filtered.filter(&:csv?).index_by(&:time_span_type), time_span_type: not_filtered.filter(&:format_csv?).index_by(&:time_span_type),
statut: filtered.filter(&:csv?).index_by(&:statut) statut: filtered.filter(&:format_csv?).index_by(&:statut)
}, },
zip: { zip: {
time_span_type: {}, time_span_type: {},
statut: filtered.filter(&:zip?).index_by(&:statut) statut: filtered.filter(&:format_zip?).index_by(&:statut)
} }
} }
end end