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

Merge pull request #3506 from betagouv/dev

Browse source 
MEP 2019-02-25-02
This commit is contained in:
Mathieu Magnin 2019-02-25 19:05:00 +01:00 committed by GitHub
commit 8d11c50115
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -3,7 +3,7 @@ version: 2
defaults: &defaults defaults: &defaults
working_directory: ~/tps working_directory: ~/tps
docker: docker:
- image: circleci/ruby:2.5.0-node-browsers - image: circleci/ruby:2.6.1-node-browsers
- image: circleci/postgres:9.5 - image: circleci/postgres:9.5
environment: environment:
POSTGRES_USER: tps_test POSTGRES_USER: tps_test

2
.ruby-version
View file

@ -1 +1 @@
2.5.0 2.6.1

2
Gemfile.lock
View file

@ -740,4 +740,4 @@ DEPENDENCIES
zxcvbn-ruby zxcvbn-ruby
BUNDLED WITH BUNDLED WITH
1.17.1 1.17.2

9
app/services/api_entreprise_service.rb
View file

@ -7,10 +7,11 @@ class ApiEntrepriseService
association_params = ApiEntreprise::RNAAdapter.new(siret, procedure_id).to_params association_params = ApiEntreprise::RNAAdapter.new(siret, procedure_id).to_params
exercices_params = ApiEntreprise::ExercicesAdapter.new(siret, procedure_id).to_params exercices_params = ApiEntreprise::ExercicesAdapter.new(siret, procedure_id).to_params
etablissement_params etablissement_params.merge(
.merge(entreprise_params) entreprise_params,
.merge(association_params) association_params,
.merge(exercices_params) exercices_params
)
end end
end end
end end