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

Merge pull request #641 from sgmap/395_export_user_email

Browse source 
395 export user email
This commit is contained in:
Mathieu Magnin 2017-08-25 12:06:51 +02:00 committed by GitHub
commit 348d6210a8
4 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/serializers/dossier_serializer.rb
View file

@ -3,6 +3,7 @@ class DossierSerializer < ActiveModel::Serializer
:created_at,
:updated_at,
:archived,
:email,
:mandataire_social,
:state,
:simplified_state,
@ -22,6 +23,10 @@ class DossierSerializer < ActiveModel::Serializer
has_many :pieces_justificatives
has_many :types_de_piece_justificative
def email
object.user.try(:email)
end
def simplified_state
object.decorate.display_state
end

5
app/serializers/dossier_table_export_serializer.rb
View file

@ -3,6 +3,7 @@ class DossierTableExportSerializer < ActiveModel::Serializer
:created_at,
:updated_at,
:archived,
:email,
:mandataire_social,
:state,
:initiated_at,
@ -17,6 +18,10 @@ class DossierTableExportSerializer < ActiveModel::Serializer
:individual_nom,
:individual_birthdate
def email
object.user.try(:email)
end
def individual_prenom
object.individual.try(:prenom)
end

2
spec/controllers/api/v1/dossiers_controller_spec.rb
View file

@ -114,7 +114,7 @@ describe API::V1::DossiersController do
let!(:dossier) { Timecop.freeze(date_creation) { create(:dossier, :with_entreprise, procedure: procedure, motivation: "Motivation") } }
let(:dossier_id) { dossier.id }
let(:body) { JSON.parse(retour.body, symbolize_names: true) }
let(:field_list) { [:id, :created_at, :updated_at, :archived, :mandataire_social, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state, :simplified_state, :initiated_at, :processed_at, :received_at, :motivation, :accompagnateurs, :invites] }
let(:field_list) { [:id, :created_at, :updated_at, :archived, :mandataire_social, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state, :simplified_state, :initiated_at, :processed_at, :received_at, :motivation, :email, :accompagnateurs, :invites] }
subject { body[:dossier] }
it 'return REST code 200', :show_in_doc do

24
spec/models/dossier_spec.rb
View file

@ -482,18 +482,19 @@ describe Dossier do
it { expect(subject[1]).to be_a_kind_of(Time) }
it { expect(subject[2]).to be_a_kind_of(Time) }
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(date1) }
it { expect(subject[7]).to eq(date2) }
it { expect(subject[8]).to eq(date3) }
it { expect(subject[9]).to be_a_kind_of(String) }
it { expect(subject[4]).to eq(dossier.user.email) }
it { expect(subject[5]).to be_in([true, false]) }
it { expect(subject[6]).to eq("draft") }
it { expect(subject[7]).to eq(date1) }
it { expect(subject[8]).to eq(date2) }
it { expect(subject[9]).to eq(date3) }
it { expect(subject[10]).to be_a_kind_of(String) }
it { expect(subject[11]).to be_nil }
it { expect(subject[11]).to be_a_kind_of(String) }
it { expect(subject[12]).to be_nil }
it { expect(subject[13]).to be_nil }
it { expect(subject[14]).to be_nil }
it { expect(subject[15]).to be_nil }
it { expect(subject[16]).to be_nil }
it { expect(subject.count).to eq(DossierTableExportSerializer.new(dossier).attributes.count +
dossier.procedure.types_de_champ.count +
dossier.procedure.types_de_champ_private.count +
@ -505,10 +506,10 @@ describe Dossier do
subject { dossier_with_individual.data_with_champs }
it { expect(subject[11]).to eq(dossier_with_individual.individual.gender) }
it { expect(subject[12]).to eq(dossier_with_individual.individual.prenom) }
it { expect(subject[13]).to eq(dossier_with_individual.individual.nom) }
it { expect(subject[14]).to eq(dossier_with_individual.individual.birthdate) }
it { expect(subject[12]).to eq(dossier_with_individual.individual.gender) }
it { expect(subject[13]).to eq(dossier_with_individual.individual.prenom) }
it { expect(subject[14]).to eq(dossier_with_individual.individual.nom) }
it { expect(subject[15]).to eq(dossier_with_individual.individual.birthdate) }
end
end
@ -519,6 +520,7 @@ describe Dossier do
dossier.created_at,
dossier.updated_at,
"false",
dossier.user.email,
"false",
"draft",
dossier.initiated_at,