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

caluire-axel: add activity_id in set_agenda changes result (#67280)

This commit is contained in:
Lauréline Guérin 2022-07-12 15:45:56 +02:00
parent 41dd355721
commit a02ffc773d
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
passerelle/contrib/caluire_axel/models.py
View File

@ -908,7 +908,13 @@ class CaluireAxel(BaseResource):
updated = sorted(updated, key=itemgetter(0, 1, 2))
updated = [u for b, a, d, u in updated]
updated = [
{'booked': u['booked'], 'activity_label': u['activity_label'], 'day': u['day']} for u in updated
{
'booked': u['booked'],
'activity_id': u['activity_id'],
'activity_label': u['activity_label'],
'day': u['day'],
}
for u in updated
]
return {

12
tests/test_caluire_axel.py
View File

@ -2028,12 +2028,12 @@ def test_set_agenda_endpoint_multi(app, resource, family_data, booking_params):
assert resp.json['updated'] is True
assert resp.json['count'] == 6
assert resp.json['changes'] == [
{'activity_label': 'Matin', 'day': '2020-09-07', 'booked': True},
{'activity_label': 'Matin', 'day': '2020-09-08', 'booked': True},
{'activity_label': 'Cantine', 'day': '2020-09-07', 'booked': True},
{'activity_label': 'Matin', 'day': '2020-09-10', 'booked': False},
{'activity_label': 'Matin', 'day': '2020-09-11', 'booked': False},
{'activity_label': 'Cantine', 'day': '2020-09-11', 'booked': False},
{'activity_id': 'ACCMAT', 'activity_label': 'Matin', 'day': '2020-09-07', 'booked': True},
{'activity_id': 'ACCMAT', 'activity_label': 'Matin', 'day': '2020-09-08', 'booked': True},
{'activity_id': 'ECOLELEM', 'activity_label': 'Cantine', 'day': '2020-09-07', 'booked': True},
{'activity_id': 'ACCMAT', 'activity_label': 'Matin', 'day': '2020-09-10', 'booked': False},
{'activity_id': 'ACCMAT', 'activity_label': 'Matin', 'day': '2020-09-11', 'booked': False},
{'activity_id': 'ECOLELEM', 'activity_label': 'Cantine', 'day': '2020-09-11', 'booked': False},
]
assert len(operation.call_args_list) == 2