From e994738a2e32b2e1ae52b0cc48b4a0cad500aea1 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 5 Apr 2024 12:07:40 +0200 Subject: [PATCH] add and use api_insee_up? --- app/controllers/users/dossiers_controller.rb | 2 +- ...t_champ_etablissement_fetchable_concern.rb | 2 +- app/services/api_entreprise_service.rb | 10 ++++++ .../champs/siret_controller_spec.rb | 4 +-- .../users/dossiers_controller_spec.rb | 16 +++++----- spec/fixtures/files/api_entreprise/ping.json | 5 +++ ...mp_etablissement_fetchable_concern_spec.rb | 4 +-- spec/services/api_entreprise_service_spec.rb | 32 +++++++++++++++++++ 8 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 spec/fixtures/files/api_entreprise/ping.json diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb index e7e47374d..d00d049dd 100644 --- a/app/controllers/users/dossiers_controller.rb +++ b/app/controllers/users/dossiers_controller.rb @@ -175,7 +175,7 @@ module Users etablissement = begin APIEntrepriseService.create_etablissement(@dossier, sanitized_siret, current_user.id) rescue => error - if error.try(:network_error?) && !APIEntrepriseService.api_up? + if error.try(:network_error?) && !APIEntrepriseService.api_insee_up? # TODO: notify ops APIEntrepriseService.create_etablissement_as_degraded_mode(@dossier, sanitized_siret, current_user.id) else diff --git a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb index ccfe17e37..333d58ad8 100644 --- a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb +++ b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb @@ -11,7 +11,7 @@ module SiretChampEtablissementFetchableConcern update!(etablissement: etablissement) rescue => error - if error.try(:network_error?) && !APIEntrepriseService.api_up? + if error.try(:network_error?) && !APIEntrepriseService.api_insee_up? # TODO: notify ops update!( etablissement: APIEntrepriseService.create_etablissement_as_degraded_mode(self, siret, user.id) diff --git a/app/services/api_entreprise_service.rb b/app/services/api_entreprise_service.rb index 585c4f8db..82f77921f 100644 --- a/app/services/api_entreprise_service.rb +++ b/app/services/api_entreprise_service.rb @@ -64,5 +64,15 @@ class APIEntrepriseService Sentry.capture_exception(e) false end + + # See: https://entreprise.api.gouv.fr/developpeurs#surveillance-etat-fournisseurs + def api_insee_up? + response = Typhoeus.get("https://entreprise.api.gouv.fr/ping/insee/sirene", timeout: 1) + if response.success? + JSON.parse(response.body).fetch('status') == 'ok' + else + false + end + end end end diff --git a/spec/controllers/champs/siret_controller_spec.rb b/spec/controllers/champs/siret_controller_spec.rb index 6a1dedf18..67a1ac8de 100644 --- a/spec/controllers/champs/siret_controller_spec.rb +++ b/spec/controllers/champs/siret_controller_spec.rb @@ -83,7 +83,7 @@ describe Champs::SiretController, type: :controller do let(:api_etablissement_status) { 503 } before do - expect(APIEntrepriseService).to receive(:api_up?).and_return(true) + expect(APIEntrepriseService).to receive(:api_insee_up?).and_return(true) end subject! { get :show, params: params, format: :turbo_stream } @@ -102,7 +102,7 @@ describe Champs::SiretController, type: :controller do let(:api_etablissement_status) { 502 } before do - expect(APIEntrepriseService).to receive(:api_up?).and_return(false) + expect(APIEntrepriseService).to receive(:api_insee_up?).and_return(false) end subject! { get :show, params: params, format: :turbo_stream } diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb index b5ca8f810..5253ba54c 100644 --- a/spec/controllers/users/dossiers_controller_spec.rb +++ b/spec/controllers/users/dossiers_controller_spec.rb @@ -245,21 +245,21 @@ describe Users::DossiersController, type: :controller do let(:api_etablissement_status) { 200 } let(:api_etablissement_body) { Rails.root.join('spec/fixtures/files/api_entreprise/etablissements.json').read } let(:token_expired) { false } - let(:api_current_status_response) { nil } + let(:api_insee_status_response) { nil } before do sign_in(user) stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v3\/insee\/sirene\/etablissements\/#{siret}/) .to_return(status: api_etablissement_status, body: api_etablissement_body) stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v3\/insee\/sirene\/unites_legales\/#{siren}/) - .to_return(body: Rails.root.join('spec/fixtures/files/api_entreprise/status.json').read, status: 200) + .to_return(body: Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read, status: 200) allow_any_instance_of(APIEntrepriseToken).to receive(:roles) .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"]) allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(token_expired) - if api_current_status_response - stub_request(:get, "https://status.entreprise.api.gouv.fr/summary.json") - .to_return(body: api_current_status_response) + if api_insee_status_response + stub_request(:get, "https://entreprise.api.gouv.fr/ping/insee/sirene") + .to_return(body: api_insee_status_response) end end @@ -304,14 +304,14 @@ describe Users::DossiersController, type: :controller do context 'When API-Entreprise is ponctually down' do let(:api_etablissement_status) { 502 } - let(:api_current_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/status.json').read } + let(:api_insee_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read } it_behaves_like 'the request fails with an error', I18n.t('errors.messages.siret_network_error') end context 'When API-Entreprise is globally down' do let(:api_etablissement_status) { 502 } - let(:api_current_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/status.json').read.gsub('UP', 'HASISSUES') } + let(:api_insee_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read.gsub('ok', 'HASISSUES') } it "create an etablissement only with SIRET as degraded mode" do dossier.reload @@ -328,7 +328,7 @@ describe Users::DossiersController, type: :controller do context 'when default token has expired' do let(:api_etablissement_status) { 200 } - let(:api_current_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/status.json').read } + let(:api_insee_status_response) { Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read } let(:token_expired) { true } it_behaves_like 'the request fails with an error', I18n.t('errors.messages.siret_network_error') diff --git a/spec/fixtures/files/api_entreprise/ping.json b/spec/fixtures/files/api_entreprise/ping.json new file mode 100644 index 000000000..9d4af72b3 --- /dev/null +++ b/spec/fixtures/files/api_entreprise/ping.json @@ -0,0 +1,5 @@ +{ + "status": "ok", + "last_update": "2024-04-05T11:15:25.483+02:00", + "last_ok_status": "2024-04-05T11:15:25.483+02:00" +} diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb index dc803ad90..089099cb9 100644 --- a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb +++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb @@ -52,7 +52,7 @@ RSpec.describe SiretChampEtablissementFetchableConcern do let(:siret) { '82161143100015' } let(:api_etablissement_status) { 503 } - before { expect(APIEntrepriseService).to receive(:api_up?).and_return(true) } + before { expect(APIEntrepriseService).to receive(:api_insee_up?).and_return(true) } it_behaves_like 'an error occured', :network_error @@ -66,7 +66,7 @@ RSpec.describe SiretChampEtablissementFetchableConcern do let(:siret) { '82161143100015' } let(:api_etablissement_status) { 502 } - before { expect(APIEntrepriseService).to receive(:api_up?).and_return(false) } + before { expect(APIEntrepriseService).to receive(:api_insee_up?).and_return(false) } it { expect { fetch_etablissement! }.to change { champ.reload.etablissement } } diff --git a/spec/services/api_entreprise_service_spec.rb b/spec/services/api_entreprise_service_spec.rb index c35b7acd4..35d292ae8 100644 --- a/spec/services/api_entreprise_service_spec.rb +++ b/spec/services/api_entreprise_service_spec.rb @@ -116,4 +116,36 @@ describe APIEntrepriseService do end end end + + describe "#api_insee_up?" do + subject { described_class.api_insee_up? } + let(:body) { Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read } + let(:status) { 200 } + + before do + stub_request(:get, "https://entreprise.api.gouv.fr/ping/insee/sirene") + .to_return(body: body, status: status) + end + + it "returns true when api etablissement is up" do + expect(subject).to be_truthy + end + + context "when api entreprise is down" do + let(:body) { Rails.root.join('spec/fixtures/files/api_entreprise/ping.json').read.gsub('ok', 'HASISSUES') } + + it "returns false" do + expect(subject).to be_falsey + end + end + + context "when api entreprise status is unknown" do + let(:body) { "" } + let(:status) { 0 } + + it "returns nil" do + expect(subject).to be_falsey + end + end + end end