0001-axel-handle-transport-errors-58925.patch

Nicolas Roche, 13 janvier 2022 15:53

Voir les différences: en ligne côte à côte

Subject: [PATCH] axel: handle transport errors (#58925)

 passerelle/contrib/utils/axel.py | 10 +++++++---
 tests/test_caluire_axel.py       | 20 ++++++++++++++++++++
 tests/test_toulouse_axel.py      | 21 +++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

     import os
     import re
     import xml.etree.ElementTree as ET
     from collections import namedtuple
     import pytz
     import xmlschema
     from django.utils.encoding import force_text
     from zeep.exceptions import TransportError
     from passerelle.utils.xml import JSONSchemaFromXMLSchema
     boolean_type = {
         'oneOf': [
             {'type': 'boolean'},
+            {
                 'type': 'string',
-...
                     raise AxelError('invalid request %s' % str(e))
                 indent(serialized_request)
                 serialized_request = force_text(ET.tostring(serialized_request))
                 try:
                     self.request_converter.xml_schema.validate(serialized_request)
                 except xmlschema.XMLSchemaValidationError as e:
                     raise AxelError('invalid request %s' % str(e), xml_request=serialized_request)
             result = getattr(client.service, self.data_method)(
                 self.operation, serialized_request, ''
             )  # FIXME: What is the user parameter for ?
             try:
                 result = getattr(client.service, self.data_method)(
                     self.operation, serialized_request, ''
                 )  # FIXME: What is the user parameter for ?
             except TransportError as e:
                 raise AxelError('invalid response %s' % str(e), xml_request=serialized_request)
             xml_result = ET.fromstring(result.encode('utf-8'))
             indent(xml_result)
             pretty_result = force_text(ET.tostring(xml_result))
             if xml_result.find('RESULTAT/STATUS').text != 'OK':
                 msg = xml_result.find('RESULTAT/COMMENTAIRES').text
                 raise AxelError(msg, xml_request=serialized_request, xml_response=pretty_result)

     import xml.etree.ElementTree as ET
     from contextlib import contextmanager
     import freezegun
     import mock
     import pytest
     import utils
     import xmlschema
     from zeep.exceptions import TransportError
     from passerelle.contrib.caluire_axel import schemas
     from passerelle.contrib.caluire_axel.models import CaluireAxel, Link
     from passerelle.contrib.utils.axel import AxelError, OperationResult, json_date_format, xml_date_format
     from passerelle.utils.soap import SOAPError
     XML_RESPONSE_TEMPLATE = '''<?xml version="1.0"?>
     <PORTAILSERVICE>
-...
                                 'TEL': None,
                                 'MAIL': None,
+                            }
+                        }
                     },
+                )
     def test_operation_transport_error(resource):
         with mock.patch('passerelle.contrib.caluire_axel.models.CaluireAxel.soap_client') as client:
             client.return_value.service.setData.side_effect = TransportError('Foo reason')
             with pytest.raises(AxelError, match='Foo reason'):
                 schemas.set_paiement(
                     resource,
+                    {
                         'PORTAIL': {
                             'SETPAIEMENT': {
                                 'IDFACTURE': 42,
                                 'IDENTREGIEENC': 'MAREGIE',
                                 'MONTANT': '4.94',
                                 'IDENTMODEREGLEMENT': 'INCB',
+                            }
+                        }
                     },
+                )
     def test_link_endpoint_nameid_empty(app, resource, link_params):
         resp = app.post_json('/caluire-axel/test/link?NameID=', params=link_params, status=400)
         assert resp.json['err_desc'] == "NameID is empty"
         assert resp.json['err'] == 'bad-request'
     def test_link_endpoint_axel_error(app, resource, link_params):
         with mock.patch('passerelle.contrib.caluire_axel.schemas.find_individus') as operation:

     import freezegun
     import jsonschema
     import mock
     import pytest
     import utils
     import xmlschema
     from django.core.cache import cache
     from zeep.exceptions import TransportError
     from passerelle.contrib.toulouse_axel import schemas
     from passerelle.contrib.toulouse_axel.models import Link, Lock, ToulouseAxel
     from passerelle.contrib.toulouse_axel.utils import (
         csp_mapping,
         lien_parente_mapping,
         regime_mapping,
         situation_familiale_mapping,
-...
                                 'NOM': 'Doe',
                                 'NAISSANCE': '2010-10-10',
+                            }
+                        }
                     },
+                )
     def test_operation_transport_error(resource):
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.soap_client') as client:
             client.return_value.service.getData.side_effect = TransportError('Foo reason')
             with pytest.raises(AxelError, match='Foo reason'):
                 schemas.form_paiement_dui(
                     resource,
+                    {
                         'PORTAIL': {
                             'DUI': {
                                 'DATEPAIEMENT': '01/01/2020 13:00:00',
                                 'IDFACTURE': 42,
                                 'IDREGIEENCAISSEMENT': '',
                                 'MONTANTPAYE': decimal.Decimal('4.94'),
                                 'REFERENCE': 'foo',
+                            }
+                        }
                     },
+                )
     @contextmanager
     def mock_getdata(content, operation):
         with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.soap_client') as client:
             resp = '''
             <?xml version="1.0"?>
             <PORTAILSERVICE>
               <RESULTAT>
                 <TYPE>%s</TYPE>
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-axel-handle-transport-errors-58925.patch