entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

toulouse_axel: add id, text to each children (#39796)

This commit is contained in:
Lauréline Guérin 2020-02-13 10:53:00 +01:00
parent d2989056e4
commit c65bb85025
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functests/toulouse_axel/test_toulouse_axel.py
View File

@ -55,7 +55,7 @@ def test_link(conn, user):
for key in ['MONTANTTOTAL', 'DATEVALIDITE', 'SFI', 'IREVENUS', 'RNF', 'NBENFANTSACHARGE']:
payload['REVENUS'].pop(key, None)
for enfant in payload['ENFANT']:
for key in ['NOM', 'DATENAISSANCE', 'SEXE', 'PRENOMPERE', 'PRENOMMERE', 'NOMPERE', 'NOMMERE', 'RATTACHEAUTREDUI', 'PRENOM',
for key in ['id', 'text', 'NOM', 'DATENAISSANCE', 'SEXE', 'PRENOMPERE', 'PRENOMMERE', 'NOMPERE', 'NOMMERE', 'RATTACHEAUTREDUI', 'PRENOM',
'clae_cantine_current', 'clae_cantine_next']:
enfant.pop(key)
enfant['AUTORISATIONURGENCEMEDICALE'] = 'OUI'

4
passerelle/contrib/toulouse_axel/models.py
View File

@ -461,6 +461,7 @@ class ToulouseAxel(BaseResource):
err_code='error',
data={'xml_request': e.xml_request,
'xml_response': e.xml_response})
family_data = result.json_response['DATA']['PORTAIL']['DUI']
if check_registrations:
@ -479,6 +480,9 @@ class ToulouseAxel(BaseResource):
child['clae_cantine_current'] = children_registred_for_current_year.get(child['IDPERSONNE'])
child['clae_cantine_next'] = children_registred_for_next_year.get(child['IDPERSONNE'])
for child in family_data.get('ENFANT', []):
child['id'] = child['IDPERSONNE']
child['text'] = '{} {}'.format(child['PRENOM'], child['NOM']).strip()
return family_data
@endpoint(

8
tests/test_toulouse_axel.py
View File

@ -663,6 +663,10 @@ def test_family_info_endpoint(app, resource):
'SITUATIONFAMILIALE',
'TELFIXE',
])
assert resp.json['data']['ENFANT'][0]['id'] == '4242'
assert resp.json['data']['ENFANT'][0]['text'] == 'foo foo'
assert resp.json['data']['ENFANT'][1]['id'] == '3535'
assert resp.json['data']['ENFANT'][1]['text'] == 'foo foo'
with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.are_children_registered') as registered:
registered.side_effect = [{'4242': True}, {}]
@ -718,6 +722,8 @@ def test_child_info_endpoint(app, resource):
resp = app.get('/toulouse-axel/test/child_info?NameID=yyy&idpersonne=4242')
assert resp.json['err'] == 0
assert set(resp.json['data'].keys()) == set([
'id',
'text',
'ASSURANCE',
'CONTACT',
'DATENAISSANCE',
@ -734,6 +740,8 @@ def test_child_info_endpoint(app, resource):
'clae_cantine_current',
'clae_cantine_next',
])
assert resp.json['data']['id'] == '4242'
assert resp.json['data']['text'] == 'foo foo'
with mock.patch('passerelle.contrib.toulouse_axel.models.ToulouseAxel.are_children_registered') as registered:
registered.side_effect = [{'4242': True}, {}]