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

toulouse-maelis: change activities sort on global catalog (#89096)
gitea/passerelle/pipeline/head This commit looks good Details

This commit is contained in:
Nicolas Roche 2024-04-04 11:19:37 +02:00
parent d4bb8059e0
commit a565716db2
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passerelle/contrib/toulouse_maelis/models.py
View File

@ -3065,7 +3065,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
update_criterias_order_field(all_criterias)
data.sort(key=lambda x: (x['unit']['dateStart'], x['unit']['dateEnd'], x['text']))
data.sort(key=lambda x: (x['unit']['dateStart'], x['text'], x['unit']['dateEnd']))
return {
'data': data,
'meta': {

2
tests/data/toulouse_maelis/R_read_activity_list.xml
View File

@ -401,7 +401,7 @@
<idUnit>A10051141970</idUnit>
<libelle>Inscription 2ème semestre</libelle>
<dateStart>2023-02-01T00:00:00+01:00</dateStart>
<dateEnd>2023-06-30T00:00:00+02:00</dateEnd>
<dateEnd>2023-06-29T00:00:00+02:00</dateEnd>
<calendarLetter>C</calendarLetter>
<subscribePublication>E</subscribePublication>
<numOrder>0</numOrder>

6
tests/test_toulouse_maelis.py
View File

@ -6753,10 +6753,8 @@ def test_read_activity_list(con, app, freezer):
assert resp.json['err'] == 0
assert len(resp.json['data']) == 9
# activities are sorted by dates
activities = [
(x['unit']['dateStart'], x['unit']['dateEnd'], x['activity']['text']) for x in resp.json['data']
]
# activities are sorted by start date, text and next by end date
activities = [(x['unit']['dateStart'], x['text'], x['unit']['dateEnd']) for x in resp.json['data']]
assert activities == sorted(activities)
# services label is added to activities if a service id is provided