From fe9ac727de0d0fe66bb95e05b0555d8e58c42d77 Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Fri, 1 Dec 2017 10:56:29 +0100 Subject: [PATCH] [fix #872] apientrepise: use v2 endpoints --- app/lib/siade/api.rb | 4 ++-- app/lib/siade/exercices_adapter.rb | 14 +++++++------- spec/controllers/users/dossiers_controller_spec.rb | 4 ++-- spec/features/users/complete_demande_spec.rb | 4 ++-- spec/features/users/dossier_creation_spec.rb | 4 ++-- spec/features/users/start_demande_spec.rb | 4 ++-- spec/lib/siade/api_spec.rb | 4 ++-- spec/lib/siade/exercices_adapter_spec.rb | 2 +- spec/lib/siade/rna_adapter_spec.rb | 2 +- spec/support/files/exercices.json | 8 ++++---- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/lib/siade/api.rb b/app/lib/siade/api.rb index 1e36c44fb..a007d2fc1 100644 --- a/app/lib/siade/api.rb +++ b/app/lib/siade/api.rb @@ -17,12 +17,12 @@ class SIADE::API end def self.exercices(siret) - endpoint = "/v1/etablissements/exercices/#{siret}" + endpoint = "/v2/exercices/#{siret}" call(base_url + endpoint) end def self.rna(siret) - endpoint = "/v1/associations/#{siret}" + endpoint = "/v2/associations/#{siret}" call(base_url + endpoint) end diff --git a/app/lib/siade/exercices_adapter.rb b/app/lib/siade/exercices_adapter.rb index 866e2e317..59e2af174 100644 --- a/app/lib/siade/exercices_adapter.rb +++ b/app/lib/siade/exercices_adapter.rb @@ -10,14 +10,14 @@ class SIADE::ExercicesAdapter end def to_params - data_source[:exercices] + data_source[:exercices].map do |exercice| + { + ca: exercice[:ca], + dateFinExercice: exercice[:date_fin_exercice], + date_fin_exercice_timestamp: exercice[:date_fin_exercice_timestamp] + } + end rescue nil end - - def attr_to_fetch - [:ca, - :dateFinExercice, - :date_fin_exercice_timestamp] - end end diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb index 764fc846b..1165bd7a9 100644 --- a/spec/controllers/users/dossiers_controller_spec.rb +++ b/spec/controllers/users/dossiers_controller_spec.rb @@ -187,10 +187,10 @@ describe Users::DossiersController, type: :controller do stub_request(:get, "https://api-dev.apientreprise.fr/v2/entreprises/#{siren}?token=#{SIADETOKEN}") .to_return(status: status_entreprise_call, body: File.read('spec/support/files/entreprise.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/etablissements/exercices/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/exercices/#{siret}?token=#{SIADETOKEN}") .to_return(status: exercices_status, body: exercices_body) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/associations/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/associations/#{siret}?token=#{SIADETOKEN}") .to_return(status: rna_status, body: rna_body) dossier diff --git a/spec/features/users/complete_demande_spec.rb b/spec/features/users/complete_demande_spec.rb index 26254c31b..251719434 100644 --- a/spec/features/users/complete_demande_spec.rb +++ b/spec/features/users/complete_demande_spec.rb @@ -35,9 +35,9 @@ feature 'user path for dossier creation' do stub_request(:get, "https://api-dev.apientreprise.fr/v2/entreprises/#{siren}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/entreprise.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/etablissements/exercices/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/exercices/#{siret}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/exercices.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/associations/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/associations/#{siret}?token=#{SIADETOKEN}") .to_return(status: 404, body: '') page.find_by_id('dossier-siret').set siret diff --git a/spec/features/users/dossier_creation_spec.rb b/spec/features/users/dossier_creation_spec.rb index ed4dc6f9a..ec53ac7f7 100644 --- a/spec/features/users/dossier_creation_spec.rb +++ b/spec/features/users/dossier_creation_spec.rb @@ -50,9 +50,9 @@ feature 'As a User I wanna create a dossier' do .to_return(status: 200, body: File.read('spec/support/files/etablissement.json')) stub_request(:get, "https://api-dev.apientreprise.fr/v2/entreprises/#{siren}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/entreprise.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/etablissements/exercices/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/exercices/#{siret}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/exercices.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/associations/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/associations/#{siret}?token=#{SIADETOKEN}") .to_return(status: 404, body: '') page.find_by_id('dossier-siret').set siret page.find_by_id('submit-siret').trigger('click') diff --git a/spec/features/users/start_demande_spec.rb b/spec/features/users/start_demande_spec.rb index f91c44214..5e8be6375 100644 --- a/spec/features/users/start_demande_spec.rb +++ b/spec/features/users/start_demande_spec.rb @@ -30,9 +30,9 @@ feature 'user arrive on siret page' do .to_return(status: 200, body: File.read('spec/support/files/etablissement.json')) stub_request(:get, "https://api-dev.apientreprise.fr/v2/entreprises/#{siren}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/entreprise.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/etablissements/exercices/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/exercices/#{siret}?token=#{SIADETOKEN}") .to_return(status: 200, body: File.read('spec/support/files/exercices.json')) - stub_request(:get, "https://api-dev.apientreprise.fr/v1/associations/#{siret}?token=#{SIADETOKEN}") + stub_request(:get, "https://api-dev.apientreprise.fr/v2/associations/#{siret}?token=#{SIADETOKEN}") .to_return(status: 404, body: '') page.find_by_id('dossier-siret').set siret diff --git a/spec/lib/siade/api_spec.rb b/spec/lib/siade/api_spec.rb index a82a3e4d7..617e3db48 100644 --- a/spec/lib/siade/api_spec.rb +++ b/spec/lib/siade/api_spec.rb @@ -57,7 +57,7 @@ describe SIADE::API do describe '.exercices' do before do - stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v1\/etablissements\/exercices\/.*token=/) + stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v2\/exercices\/.*token=/) .to_return(status: status, body: body) end @@ -88,7 +88,7 @@ describe SIADE::API do describe '.rna' do before do - stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v1\/associations\/.*token=/) + stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v2\/associations\/.*token=/) .to_return(status: status, body: body) end diff --git a/spec/lib/siade/exercices_adapter_spec.rb b/spec/lib/siade/exercices_adapter_spec.rb index b6735b4c3..74f12a78a 100644 --- a/spec/lib/siade/exercices_adapter_spec.rb +++ b/spec/lib/siade/exercices_adapter_spec.rb @@ -5,7 +5,7 @@ describe SIADE::ExercicesAdapter do subject { described_class.new(siret).to_params } before do - stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v1\/etablissements\/exercices\/.*token=/) + stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v2\/exercices\/.*token=/) .to_return(body: File.read('spec/support/files/exercices.json', status: 200)) end diff --git a/spec/lib/siade/rna_adapter_spec.rb b/spec/lib/siade/rna_adapter_spec.rb index 719049aa0..5522ef9c2 100644 --- a/spec/lib/siade/rna_adapter_spec.rb +++ b/spec/lib/siade/rna_adapter_spec.rb @@ -8,7 +8,7 @@ describe SIADE::RNAAdapter do subject { described_class.new(siret).to_params } before do - stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v1\/associations\/.*token=/) + stub_request(:get, /https:\/\/api-dev.apientreprise.fr\/v2\/associations\/.*token=/) .to_return(body: body, status: status) end diff --git a/spec/support/files/exercices.json b/spec/support/files/exercices.json index 51b5064d5..f6bc58504 100644 --- a/spec/support/files/exercices.json +++ b/spec/support/files/exercices.json @@ -2,18 +2,18 @@ "exercices":[ { "ca":"21009417", - "dateFinExercice":"2013-12-31T00:00:00+01:00", + "date_fin_exercice":"2013-12-31T00:00:00+01:00", "date_fin_exercice_timestamp": 1388444400 }, { "ca":"18968298", - "dateFinExercice":"2012-12-31T00:00:00+01:00", + "date_fin_exercice":"2012-12-31T00:00:00+01:00", "date_fin_exercice_timestamp": 1356908400 }, { "ca":"17768838", - "dateFinExercice":"2011-12-31T00:00:00+01:00", + "date_fin_exercice":"2011-12-31T00:00:00+01:00", "date_fin_exercice_timestamp": 1325286000 } ] -} \ No newline at end of file +}