0001-caluire-axel-fix-register_activity-endpoint-54400.patch

Lauréline Guérin, 28 mai 2021 18:39

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

Subject: [PATCH] caluire-axel: fix register_activity endpoint (#54400)

 passerelle/contrib/caluire_axel/models.py     |  1 +
 passerelle/contrib/caluire_axel/schemas.py    |  2 +-
 .../xsd/R_CreateInscriptionActivite.xsd       |  2 +-
 passerelle/contrib/utils/axel.py              |  5 +-
 tests/test_caluire_axel.py                    | 49 +++++++++----------
 5 files changed, 30 insertions(+), 29 deletions(-)

passerelle/contrib/caluire_axel/models.py
367	367	raise APIError('Child not found', err_code='not-found')
368	368	child_data.pop('id', None)
369	369	child_data.pop('text', None)
	370	child_data.pop('FAMILLE', None)
370	371
371	372	start_date = datetime.datetime.strptime(
372	373	post_data['registration_start_date'], axel.json_date_format

     get_individu = Operation('GetIndividu')
     get_list_ecole = Operation('GetListEcole')
     get_list_activites = Operation('GetListActivites')
     create_inscription_activite = Operation('CreateInscriptionActivite')
     create_inscription_activite = Operation('CreateInscriptionActivite', data_method='setData')
     LINK_SCHEMA = copy.deepcopy(

     	<xsd:complexType name="CREATEINSCRIPTIONACTIVITEType">
     		<xsd:sequence>
     			<xsd:element ref="CODE" />
     			<xsd:element ref="IDENTINDIVIDU"/>
     			<xsd:element ref="IDENTINDIVIDU" minOccurs="0" maxOccurs="1"/>
     		</xsd:sequence>
     	</xsd:complexType>

         default_prefix = ''
         axel_schema = AxelSchema
         def __init__(self, operation, prefix=None, request_root_element='PORTAIL'):
         def __init__(self, operation, prefix=None, request_root_element='PORTAIL', data_method='getData'):
             if prefix is None:
                 prefix = self.default_prefix
             self.operation = operation
-...
                 '(.?)([A-Z])', lambda s: s.group(1) + ('-' if s.group(1) else '') + s.group(2).lower(), operation
+            )
             self.snake_name = self.name.replace('-', '_')
             self.data_method = data_method
         @property
         def request_schema(self):
-...
                 except xmlschema.XMLSchemaValidationError as e:
                     raise AxelError('invalid request %s' % str(e), xml_request=serialized_request)
             result = client.service.getData(
             result = getattr(client.service, self.data_method)(
                 self.operation, serialized_request, ''
             )  # FIXME: What is the user parameter for ?

     @contextmanager
     def mock_getdata(content, operation):
     def mock_data(content, operation, data_method='getData'):
         with mock.patch('passerelle.contrib.caluire_axel.models.CaluireAxel.soap_client') as client:
             resp = '''
             <?xml version="1.0"?>
-...
                 operation,
                 content,
+            )
             client.return_value.service.getData.return_value = resp
             getattr(client.return_value.service, data_method).return_value = resp
             yield
-...
     </PORTAIL>
     """
         with mock_getdata('', 'FindIndividus'):
         with mock_data('', 'FindIndividus'):
             with mock.patch('xmlschema.XMLSchema.validate') as xml_validate:
                 xml_validate.side_effect = xmlschema.XMLSchemaValidationError(None, None)
                 resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
-...
     </PORTAILSERVICE>"""
             % content
+        )
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             with mock.patch('passerelle.contrib.utils.axel.AxelSchema.decode') as decode:
                 decode.side_effect = xmlschema.XMLSchemaValidationError(None, None)
                 resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
-...
     </PORTAIL>'''
             % xml_response
+        )
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
         assert resp.json['err_desc'] == "Person not found"
         assert resp.json['err'] == 'not-found'
-...
     </FINDINDIVIDUS></PORTAIL>"""
         # existing link but family_id is wrong
         link = Link.objects.create(resource=resource, name_id='yyy', family_id='YYY', person_id='42')
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
         assert resp.json['err_desc'] == "Data conflict"
         assert resp.json['err'] == 'conflict'
-...
         link.family_id = '12345'
         link.person_id = '35'
         link.save()
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
         assert resp.json['err_desc'] == "Data conflict"
         assert resp.json['err'] == 'conflict'
-...
     </FINDINDIVIDUS></PORTAIL>"""
             % place
+        )
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
         assert set(resp.json.keys()) == set(['err', 'link', 'created', 'family_id', 'data'])
         assert resp.json['err'] == 0
-...
         assert 'xml_response' in resp.json['data']
         # again
         with mock_getdata(content, 'FindIndividus'):
         with mock_data(content, 'FindIndividus'):
             resp = app.post_json('/caluire-axel/test/link?NameID=yyy', params=link_params)
         assert set(resp.json.keys()) == set(['err', 'link', 'created', 'family_id', 'data'])
         assert resp.json['err'] == 0
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get('/caluire-axel/test/family_info?NameID=yyy')
         assert resp.json['err'] == 0
         assert set(resp.json['data'].keys()) == set(
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get('/caluire-axel/test/children_info?NameID=yyy')
         assert resp.json['err'] == 0
         assert len(resp.json['data']) == 4
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get('/caluire-axel/test/child_info?NameID=yyy&idpersonne=zzz')
         assert resp.json['err_desc'] == "Child not found"
         assert resp.json['err'] == 'not-found'
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get('/caluire-axel/test/child_info?NameID=yyy&idpersonne=50632')
         assert resp.json['err'] == 0
         assert set(resp.json['data'].keys()) == set(
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/school_list.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetListEcole'):
         with mock_data(content, 'GetListEcole'):
             resp = app.get(
                 '/caluire-axel/test/school_list?num=42&street=street=rue%20Pasteur&zipcode=69300&city=Caluire%20et%20Cuire&schooling_date=2021-05-10'
+            )
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             with mock.patch('passerelle.contrib.caluire_axel.schemas.get_individu') as operation:
                 operation.side_effect = AxelError('FooBar')
                 resp = app.get(
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get(
                 '/caluire-axel/test/child_schooling_info?NameID=yyy&idpersonne=zzz&schooling_date=2021-05-10'
+            )
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/schooling_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetIndividu'):
         with mock_data(content, 'GetIndividu'):
             with mock.patch(
                 'passerelle.contrib.caluire_axel.models.CaluireAxel.get_family_data',
                 return_value=family_data,
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             with mock.patch('passerelle.contrib.caluire_axel.schemas.get_list_activites') as operation:
                 operation.side_effect = AxelError('FooBar')
                 resp = app.get(
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.get(
                 '/caluire-axel/test/child_activities_info?NameID=yyy&idpersonne=zzz&schooling_date=2021-05-10'
+            )
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/activities_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetListActivites'):
         with mock_data(content, 'GetListActivites'):
             with mock.patch(
                 'passerelle.contrib.caluire_axel.models.CaluireAxel.get_family_data',
                 return_value=family_data,
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             with mock.patch('passerelle.contrib.caluire_axel.schemas.create_inscription_activite') as operation:
                 operation.side_effect = AxelError('FooBar')
                 resp = app.post_json(
-...
         filepath = os.path.join(os.path.dirname(__file__), 'data/caluire_axel/family_info.xml')
         with open(filepath) as xml:
             content = xml.read()
         with mock_getdata(content, 'GetFamilleIndividus'):
         with mock_data(content, 'GetFamilleIndividus'):
             resp = app.post_json('/caluire-axel/test/register_activity?NameID=yyy', params=params)
         assert resp.json['err_desc'] == "Child not found"
         assert resp.json['err'] == 'not-found'
-...
             <IDENTINDIVIDU>50632</IDENTINDIVIDU>
         </CREATEINSCRIPTIONACTIVITE>
     </PORTAIL>'''
         with mock_getdata(content, 'CreateInscriptionActivite'):
         with mock_data(content, 'CreateInscriptionActivite', data_method='setData'):
             with mock.patch(
                 'passerelle.contrib.caluire_axel.models.CaluireAxel.get_family_data',
                 return_value=family_data,
-...
             '''<PORTAIL>
         <CREATEINSCRIPTIONACTIVITE>
             <CODE>%s</CODE>
             <IDENTINDIVIDU>50632</IDENTINDIVIDU>
         </CREATEINSCRIPTIONACTIVITE>
     </PORTAIL>'''
             % code
+        )
         with mock_getdata(content, 'CreateInscriptionActivite'):
         with mock_data(content, 'CreateInscriptionActivite', data_method='setData'):
             with mock.patch(
                 'passerelle.contrib.caluire_axel.models.CaluireAxel.get_family_data',
                 return_value=family_data,
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-caluire-axel-fix-register_activity-endpoint-54400.patch