fix(api-entreprise): do not raise an error when the service is unavailable

This commit is contained in:
Paul Chavard 2024-10-09 12:47:26 +02:00
parent d51d3fd8ad
commit 668aba8986
No known key found for this signature in database
6 changed files with 55 additions and 3 deletions

View file

@ -189,7 +189,7 @@ module Users
etablissement = begin etablissement = begin
APIEntrepriseService.create_etablissement(@dossier, sanitized_siret, current_user.id) APIEntrepriseService.create_etablissement(@dossier, sanitized_siret, current_user.id)
rescue => error rescue => error
if error.try(:network_error?) && !APIEntrepriseService.api_insee_up? if error.is_a?(APIEntreprise::API::Error::ServiceUnavailable) || (error.try(:network_error?) && !APIEntrepriseService.api_insee_up?)
# TODO: notify ops # TODO: notify ops
APIEntrepriseService.create_etablissement_as_degraded_mode(@dossier, sanitized_siret, current_user.id) APIEntrepriseService.create_etablissement_as_degraded_mode(@dossier, sanitized_siret, current_user.id)
else else

View file

@ -127,10 +127,10 @@ class APIEntreprise::API
raise Error::ResourceNotFound.new(response) raise Error::ResourceNotFound.new(response)
elsif response.code == 400 elsif response.code == 400
raise Error::BadFormatRequest.new(response) raise Error::BadFormatRequest.new(response)
elsif service_unavailable?(response)
raise Error::ServiceUnavailable.new(response)
elsif response.code == 502 elsif response.code == 502
raise Error::BadGateway.new(response) raise Error::BadGateway.new(response)
elsif response.code == 503
raise Error::ServiceUnavailable.new(response)
elsif response.timed_out? elsif response.timed_out?
raise Error::TimedOut.new(response) raise Error::TimedOut.new(response)
else else
@ -138,6 +138,19 @@ class APIEntreprise::API
end end
end end
def service_unavailable?(response)
return true if response.code == 503
if response.code == 502 || response.code == 504
parse_response_errors(response).any? { _1.is_a?(Hash) && ["01000", "01001", "01002"].include?(_1[:code]) }
end
end
def parse_response_errors(response)
JSON.parse(response.body, symbolize_names: true).fetch(:errors, [])
rescue JSON::ParserError
[]
end
def make_url(resource_name, siret_or_siren = nil) def make_url(resource_name, siret_or_siren = nil)
[API_ENTREPRISE_URL, format(resource_name, id: siret_or_siren)].compact.join("/") [API_ENTREPRISE_URL, format(resource_name, id: siret_or_siren)].compact.join("/")
end end

View file

@ -0,0 +1,3 @@
{
"errors": [{ "code": "01000" }]
}

View file

@ -0,0 +1,3 @@
{
"errors": [{ "code": "01001" }]
}

View file

@ -0,0 +1,3 @@
{
"errors": [{ "code": "01002" }]
}

View file

@ -24,6 +24,36 @@ describe APIEntreprise::API do
end end
end end
context 'when the service reponds with 01000 code' do
let(:siren) { '111111111' }
let(:status) { 502 }
let(:body) { Rails.root.join('spec/fixtures/files/api_entreprise/error_code_01000.json').read }
it 'raises APIEntreprise::API::Error::RequestFailed' do
expect { subject }.to raise_error(APIEntreprise::API::Error::ServiceUnavailable)
end
end
context 'when the service reponds with 01001 code' do
let(:siren) { '111111111' }
let(:status) { 502 }
let(:body) { Rails.root.join('spec/fixtures/files/api_entreprise/error_code_01001.json').read }
it 'raises APIEntreprise::API::Error::RequestFailed' do
expect { subject }.to raise_error(APIEntreprise::API::Error::ServiceUnavailable)
end
end
context 'when the service reponds with 01002 code' do
let(:siren) { '111111111' }
let(:status) { 504 }
let(:body) { Rails.root.join('spec/fixtures/files/api_entreprise/error_code_01002.json').read }
it 'raises APIEntreprise::API::Error::RequestFailed' do
expect { subject }.to raise_error(APIEntreprise::API::Error::ServiceUnavailable)
end
end
context 'when siren does not exist' do context 'when siren does not exist' do
let(:siren) { '111111111' } let(:siren) { '111111111' }
let(:status) { 404 } let(:status) { 404 }