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

Merge pull request #1671 from betagouv/remove-mandataire-social

Browse source 
Remove the mandataire_social guess
This commit is contained in:
gregoirenovel 2018-03-20 16:18:59 +01:00 committed by GitHub
commit 2f6f6e27c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 11 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/users/dossiers_controller.rb
View file

@ -113,7 +113,6 @@ class Users::DossiersController < UsersController
etablissement = @facade.dossier.build_etablissement(etablissement_attributes)
if etablissement.save
Rails.logger.info("etablissement saved, siret: #{siret}, id: #{etablissement.id}")
@facade.dossier.mandataire_social!(current_user.france_connect_information)
else
Rails.logger.info("etablissement not saved, siret: #{siret}, errors: #{etablissement.errors.full_messages}")
return errors_valid_siret

1
app/lib/api_entreprise/entreprise_adapter.rb
View file

@ -33,7 +33,6 @@ class ApiEntreprise::EntrepriseAdapter
:numero_tva_intracommunautaire,
:forme_juridique,
:forme_juridique_code,
:mandataires_sociaux,
:nom_commercial,
:raison_sociale,
:siret_siege_social,

6
app/models/dossier.rb
View file

@ -292,12 +292,6 @@ class Dossier < ApplicationRecord
end
end
def mandataire_social!(france_connect_information)
if etablissement.mandataire_social?(france_connect_information)
update_column(:mandataire_social, true)
end
end
private
def update_state_dates

2
app/models/entreprise.rb
View file

@ -13,6 +13,4 @@ class Entreprise < ApplicationRecord
def default_values
self.raison_sociale ||= ''
end
attr_writer :mandataires_sociaux
end

10
app/models/etablissement.rb
View file

@ -17,14 +17,4 @@ class Etablissement < ApplicationRecord
# squeeze needed because of space in excess in the data
"#{numero_voie} #{type_voie} #{nom_voie}, #{complement_adresse}, #{code_postal} #{localite}".squeeze(' ')
end
attr_accessor :entreprise_mandataires_sociaux
def mandataire_social?(france_connect_information)
if france_connect_information.present?
entreprise_mandataires_sociaux&.find do |mandataire|
france_connect_information.mandataire_social?(mandataire)
end
end
end
end

6
app/models/france_connect_information.rb
View file

@ -2,10 +2,4 @@ class FranceConnectInformation < ApplicationRecord
belongs_to :user
validates :france_connect_particulier_id, presence: true, allow_blank: false, allow_nil: false
def mandataire_social?(params)
params[:nom].casecmp(family_name).zero? &&
params[:prenom].casecmp(given_name).zero? &&
params[:date_naissance_timestamp] == birthdate.to_time.to_i
end
end

1
app/serializers/dossier_serializer.rb
View file

@ -4,7 +4,6 @@ class DossierSerializer < ActiveModel::Serializer
:updated_at,
:archived,
:email,
:mandataire_social,
:state,
:simplified_state,
:initiated_at,

1
app/serializers/dossier_table_export_serializer.rb
View file

@ -4,7 +4,6 @@ class DossierTableExportSerializer < ActiveModel::Serializer
:updated_at,
:archived,
:email,
:mandataire_social,
:state,
:initiated_at,
:received_at,

7
app/views/dossiers/_infos_dossier.html.haml
View file

@ -55,13 +55,6 @@
- else
= sanitize(champ.decorate.value)
- if @facade.dossier.mandataire_social && gestionnaire_signed_in?
.mandataire_social.text-success.center
%br
Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise (
%b
= "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
)
.row
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
.col-xs-12

1
doc/apipie_examples.json
View file

@ -45,7 +45,6 @@
"created_at": "2008-09-01T08:05:00.000Z",
"updated_at": "2008-09-01T08:05:00.000Z",
"archived": false,
"mandataire_social": false,
"state": "initiated",
"simplified_state": "En construction",
"initiated_at": "2017-04-11T12:00:12.000Z",

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

@ -130,7 +130,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, :individual, :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] }
let(:field_list) { [:id, :created_at, :updated_at, :archived, :individual, :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
@ -142,7 +142,6 @@ describe API::V1::DossiersController do
it { expect(subject[:created_at]).to eq('2008-09-01T10:05:00.000Z') }
it { expect(subject[:updated_at]).to eq('2008-09-01T10:05:00.000Z') }
it { expect(subject[:archived]).to eq(dossier.archived) }
it { expect(subject[:mandataire_social]).to eq(dossier.mandataire_social) }
it { expect(subject.keys).to match_array(field_list) }

25
spec/controllers/users/dossiers_controller_spec.rb
View file

@ -259,31 +259,6 @@ describe Users::DossiersController, type: :controller do
expect(Dossier.last.state).to eq('brouillon')
end
describe 'Mandataires Sociaux' do
let(:france_connect_information) { create(:france_connect_information, given_name: given_name, family_name: family_name, birthdate: birthdate, france_connect_particulier_id: '1234567') }
let(:user) { create(:user, france_connect_information: france_connect_information) }
before do
subject
end
context 'when user is present in mandataires sociaux' do
let(:given_name) { 'GERARD' }
let(:family_name) { 'DEGONSE' }
let(:birthdate) { '1947-07-03' }
it { expect(Dossier.last.mandataire_social).to be_truthy }
end
context 'when user is not present in mandataires sociaux' do
let(:given_name) { 'plop' }
let(:family_name) { 'plip' }
let(:birthdate) { '1965-01-27' }
it { expect(Dossier.last.mandataire_social).to be_falsey }
end
end
describe 'get rna informations' do
context 'when siren have not rna informations' do
let(:rna_status) { 404 }

35
spec/lib/api_entreprise/entreprise_adapter_spec.rb
View file

@ -63,40 +63,5 @@ describe ApiEntreprise::EntrepriseAdapter do
it 'L\'entreprise contient bien un prenom' do
expect(subject[:prenom]).to eq('test_prenom')
end
it 'L\'entreprise contient bien les mandataires_sociaux' do
expect(subject[:mandataires_sociaux]).to be_an_instance_of(Array)
end
end
context 'Mandataire sociaux' do
subject { described_class.new(siren, procedure_id).to_params[:mandataires_sociaux] }
it '#to_params class est une Hash ?' do
expect(subject).to be_an_instance_of(Array)
end
it { expect(subject.size).to eq(8) }
describe 'Attributs' do
it 'Un mandataire social possède bien un nom' do
expect(subject[0][:nom]).to eq('HISQUIN')
end
it 'Un mandataire social possède bien un prenom' do
expect(subject[0][:prenom]).to eq('FRANCOIS')
end
it 'Un mandataire social possède bien une fonction' do
expect(subject[0][:fonction]).to eq('PRESIDENT DU DIRECTOIRE')
end
it 'Un mandataire social possède bien une date de naissance' do
expect(subject[0][:date_naissance]).to eq('1965-01-27')
end
it 'Un mandataire social possède bien une date de naissance au format timestamp' do
expect(subject[0][:date_naissance_timestamp]).to eq(-155523600)
end
end
end
end

24
spec/models/dossier_spec.rb
View file

@ -149,14 +149,12 @@ describe Dossier do
it { expect(dossier_serialized_attributes[:created_at]).to be_a(Time) }
it { expect(dossier_serialized_attributes[:updated_at]).to be_a(Time) }
it { expect(dossier_serialized_attributes[:archived]).to be_in([true, false]) }
it { expect(dossier_serialized_attributes[:mandataire_social]).to be_in([true, false]) }
it { expect(dossier_serialized_attributes[:state]).to be_a(String) }
it { expect(subject[:id]).to be_a(String) }
it { expect(subject[:created_at]).to be_a(Time) }
it { expect(subject[:updated_at]).to be_a(Time) }
it { expect(subject[:archived]).to be_a(String) }
it { expect(subject[:mandataire_social]).to be_a(String) }
it { expect(subject[:state]).to be_a(String) }
end
@ -227,18 +225,17 @@ describe Dossier do
it { expect(subject[2]).to be_a_kind_of(Time) }
it { expect(subject[3]).to be_in([true, false]) }
it { expect(subject[4]).to eq(dossier.user.email) }
it { expect(subject[5]).to be_in([true, false]) }
it { expect(subject[6]).to eq("brouillon") }
it { expect(subject[7]).to eq(date1) }
it { expect(subject[8]).to eq(date2) }
it { expect(subject[9]).to eq(date3) }
it { expect(subject[5]).to eq("brouillon") }
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[10]).to be_a_kind_of(String) }
it { expect(subject[11]).to be_a_kind_of(String) }
it { expect(subject[11]).to be_nil }
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 do
expect(subject.count).to eq(DossierTableExportSerializer.new(dossier).attributes.count +
dossier.procedure.types_de_champ.count +
@ -251,10 +248,10 @@ describe Dossier do
subject { dossier_with_individual.to_sorted_values }
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) }
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) }
end
end
@ -266,7 +263,6 @@ describe Dossier do
dossier.updated_at,
"false",
dossier.user.email,
"false",
"brouillon",
dossier.en_construction_at,
dossier.en_instruction_at,