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

remove procedure_presentation from export

Browse source
This commit is contained in:
simon lehericey 2024-10-14 22:23:59 +02:00
parent 71bcbbc440
commit f850924dc0
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/dossiers/export_link_component.rb
View file

@ -30,7 +30,7 @@ class Dossiers::ExportLinkComponent < ApplicationComponent
end end
def export_title(export) def export_title(export)
if export.procedure_presentation_id.nil? if !export.built_from_procedure_presentation?
t(".export_title_everything", export_format: export.format) t(".export_title_everything", export_format: export.format)
elsif export.tous? elsif export.tous?
t(".export_title", export_format: export.format, count: export.count) t(".export_title", export_format: export.format, count: export.count)

7
app/models/export.rb
View file

@ -94,7 +94,6 @@ class Export < ApplicationRecord
create!(**attributes, groupe_instructeurs:, create!(**attributes, groupe_instructeurs:,
user_profile:, user_profile:,
procedure_presentation:,
filtered_columns:, filtered_columns:,
sorted_column:) sorted_column:)
end end
@ -118,7 +117,7 @@ class Export < ApplicationRecord
def count def count
return dossiers_count if !dossiers_count.nil? # export generated return dossiers_count if !dossiers_count.nil? # export generated
return dossiers_for_export.count if procedure_presentation_id.present? return dossiers_for_export.count if built_from_procedure_presentation?
nil nil
end end
@ -127,6 +126,10 @@ class Export < ApplicationRecord
groupe_instructeurs.first.procedure groupe_instructeurs.first.procedure
end end
def built_from_procedure_presentation?
sorted_column.present? # hack has we know that procedure_presentation always has a sorted_column
end
private private
def dossiers_for_export def dossiers_for_export

6
spec/components/dossiers/export_link_component_spec.rb
View file

@ -36,9 +36,9 @@ RSpec.describe Dossiers::ExportLinkComponent, type: :component do
end end
end end
context 'when export is for a presentation' do context 'when export is from a presentation' do
before do before do
export.update!(procedure_presentation: procedure_presentation) export.update!(sorted_column: procedure.default_sorted_column)
end end
it 'display the persisted dossiers count' do it 'display the persisted dossiers count' do
@ -48,7 +48,7 @@ RSpec.describe Dossiers::ExportLinkComponent, type: :component do
end end
context "when the export is not available" do context "when the export is not available" do
let(:export) { create(:export, :pending, groupe_instructeurs: [groupe_instructeur], procedure_presentation: procedure_presentation, created_at: 10.minutes.ago) } let(:export) { create(:export, :pending, groupe_instructeurs: [groupe_instructeur], sorted_column: procedure.default_sorted_column, created_at: 10.minutes.ago) }
before do before do
create_list(:dossier, 3, :en_construction, procedure: procedure, groupe_instructeur: groupe_instructeur) create_list(:dossier, 3, :en_construction, procedure: procedure, groupe_instructeur: groupe_instructeur)