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

cartads cs: add reference number and access code to status response (#36940)

This commit is contained in:
Frédéric Péters 2019-10-15 14:50:25 +02:00
parent cd894de1d2
commit 676229752a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
passerelle/apps/cartads_cs/models.py
View File

@ -944,6 +944,7 @@ class AbstractCartaDSCS(BaseResource):
def get_file_status(self, dossier):
extra = None
response = {}
if dossier.cartads_id_dossier:
if dossier.cartads_steps_cache:
steps = dossier.cartads_steps_cache['steps']
@ -955,9 +956,11 @@ class AbstractCartaDSCS(BaseResource):
steps.sort(key=lambda x: x['DateReference'])
status_id = 'cartads-%s' % steps[-1]['IdEtape']
status_label = steps[-1]['LibelleEtape']
extra = {}
response['extra'] = {}
for key in steps[-1]:
extra[key] = steps[-1][key]
response['extra'][key] = steps[-1][key]
response['cartads_reference_dossier'] = dossier.cartads_numero_dossier
response['cartads_code_acces'] = dossier.cartads_cache_code_acces
elif dossier.notification_message: # but not dossier id -> error
status_id = 'refused'
notification = etree.fromstring(dossier.notification_message.encode('utf-8'))
@ -975,8 +978,8 @@ class AbstractCartaDSCS(BaseResource):
else:
status_id = 'pending'
status_label = _('Pending')
return {'status_id': status_id, 'status_label': status_label, 'extra': extra}
response.update({'status_id': status_id, 'status_label': status_label})
return response
@endpoint(perm='can_access',
description=_('Get status of file'),

1
tests/test_cartads_cs.py
View File

@ -390,6 +390,7 @@ def test_status(connector, app, cached_data):
client.return_value = mock.Mock(service=FakeService())
resp = app.get('/cartads-cs/test/status?dossier_id=%s' % dossier.id)
assert resp.json['status_label'] == 'En cours de saisie'
assert resp.json['cartads_reference_dossier'] == 'CU 044 043 19 A0006'
# test it got cached
resp = app.get('/cartads-cs/test/status?dossier_id=%s' % dossier.id)