diff --git a/app/serializers/dossier_procedure_serializer.rb b/app/serializers/dossier_procedure_serializer.rb index c0d694d59..02ebc4815 100644 --- a/app/serializers/dossier_procedure_serializer.rb +++ b/app/serializers/dossier_procedure_serializer.rb @@ -4,7 +4,10 @@ class DossierProcedureSerializer < ActiveModel::Serializer :updated_at, :archived, :mandataire_social, - :state + :state, + :initiated_at, + :received_at, + :processed_at attribute :followers_gestionnaires_emails, key: :emails_accompagnateurs end diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb index d211e1542..182b8c60b 100644 --- a/spec/models/dossier_spec.rb +++ b/spec/models/dossier_spec.rb @@ -597,7 +597,10 @@ describe Dossier do let(:procedure) { create(:procedure, :with_type_de_champ) } let(:gestionnaire) { create(:gestionnaire) } let(:follow) { create(:follow, gestionnaire: gestionnaire) } - let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure, follows: [follow]) } + let(:date1) { 1.day.ago } + let(:date2) { 1.hour.ago } + let(:date3) { 1.minute.ago } + let(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure, follows: [follow], initiated_at: date1, received_at: date2, processed_at: date3) } describe '#export_headers' do @@ -608,6 +611,7 @@ describe Dossier do end describe '#data_with_champs' do + subject { dossier.data_with_champs } it { expect(subject[0]).to be_a_kind_of(Integer) } @@ -616,14 +620,17 @@ describe Dossier do it { expect(subject[3]).to be_in([true, false]) } it { expect(subject[4]).to be_in([true, false]) } it { expect(subject[5]).to eq("draft") } - it { expect(subject[6]).to eq(dossier.followers_gestionnaires_emails) } + it { expect(subject[6]).to eq(date1) } + it { expect(subject[7]).to eq(date2) } + it { expect(subject[8]).to eq(date3) } + it { expect(subject[9]).to eq(dossier.followers_gestionnaires_emails) } it { expect(subject.count).to eq(DossierProcedureSerializer.new(dossier).attributes.count + dossier.procedure.types_de_champ.count + dossier.export_entreprise_data.count) } end end describe '#Dossier.to_csv' do let!(:procedure) { create(:procedure) } - let!(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure) } + let!(:dossier) { create(:dossier, :with_entreprise, user: user, procedure: procedure, ) } subject do dossier_hash = {}