Merge pull request #1025 from sgmap/fix_872_api_entreprise_v2

[fix #872] apientrpise: use v2 endpoints
demarches-simplifiees · Dec 1, 2017 · 968576c · 968576c
2 parents f279341 + fe9ac72
commit 968576c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/app/lib/siade/api.rb b/app/lib/siade/api.rb
@@ -17,12 +17,12 @@ def self.etablissement(siret)
   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
@@ -10,14 +10,14 @@ def data_source
   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
@@ -187,10 +187,10 @@
       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
@@ -35,9 +35,9 @@
           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
@@ -50,9 +50,9 @@
           .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
@@ -30,9 +30,9 @@
               .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
@@ -57,7 +57,7 @@
 
   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 '.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
@@ -5,7 +5,7 @@
   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
@@ -8,7 +8,7 @@
   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
@@ -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
     }
   ]
-}
+}