toulouse-maelis: remove nature codes parameter on loisir catalog (#75752)
This commit is contained in:
parent
940979b2f3
commit
d0b5c579b9
|
@ -2302,18 +2302,10 @@ class ToulouseMaelis(BaseResource, HTTPResource):
|
||||||
'description': "Date de référence, utilisée pour déduire l'année scolaire",
|
'description': "Date de référence, utilisée pour déduire l'année scolaire",
|
||||||
'type': 'date',
|
'type': 'date',
|
||||||
},
|
},
|
||||||
'nature_ids': {
|
|
||||||
'description': "Codes des natures des activités (par défaut les activités loisirs), séparées par des virgules",
|
|
||||||
'example_value': 'P,1,2',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
def read_activity_list(self, request, ref_date, nature_ids=None):
|
def read_activity_list(self, request, ref_date):
|
||||||
reference_year = utils.get_reference_year_from_date(ref_date)
|
reference_year = utils.get_reference_year_from_date(ref_date)
|
||||||
if not nature_ids:
|
|
||||||
nature_filter_codes = self.get_loisir_nature_codes()
|
|
||||||
else:
|
|
||||||
nature_filter_codes = [x.strip() for x in nature_ids.split(',') if x.strip()]
|
|
||||||
labels = {
|
labels = {
|
||||||
'nature': "Nature de l'activité",
|
'nature': "Nature de l'activité",
|
||||||
'type': "Type de l'activité",
|
'type': "Type de l'activité",
|
||||||
|
@ -2347,7 +2339,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
|
||||||
for activity in activities:
|
for activity in activities:
|
||||||
activity_type = activity['activityPortail'].get('activityType')
|
activity_type = activity['activityPortail'].get('activityType')
|
||||||
activity_nature = activity_type.get('natureSpec') if activity_type else None
|
activity_nature = activity_type.get('natureSpec') if activity_type else None
|
||||||
if not activity_nature or activity_nature['code'] not in nature_filter_codes:
|
if not activity_nature or activity_nature['code'] not in self.get_loisir_nature_codes():
|
||||||
continue
|
continue
|
||||||
activity['id'] = activity['activityPortail']['idAct']
|
activity['id'] = activity['activityPortail']['idAct']
|
||||||
activity['text'] = activity['activityPortail']['libelle']
|
activity['text'] = activity['activityPortail']['libelle']
|
||||||
|
|
|
@ -5142,9 +5142,10 @@ def test_read_activity_list(con, app, freezer):
|
||||||
freezer.move_to('2023-01-01 12:00')
|
freezer.move_to('2023-01-01 12:00')
|
||||||
url = get_endpoint('read-activity-list')
|
url = get_endpoint('read-activity-list')
|
||||||
|
|
||||||
|
con.loisir_nature_codes = '4,L,, S '
|
||||||
|
con.save()
|
||||||
params = {
|
params = {
|
||||||
'ref_date': datetime.date.today().strftime(json_date_format),
|
'ref_date': datetime.date.today().strftime(json_date_format),
|
||||||
'nature_ids': '4,L,, S ',
|
|
||||||
}
|
}
|
||||||
resp = app.get(url, params=params)
|
resp = app.get(url, params=params)
|
||||||
assert resp.json['err'] == 0
|
assert resp.json['err'] == 0
|
||||||
|
@ -5184,12 +5185,14 @@ def test_read_activity_list(con, app, freezer):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
params['nature_ids'] = 'X,L,S'
|
con.loisir_nature_codes = 'X,L,S'
|
||||||
|
con.save()
|
||||||
resp = app.get(url, params=params)
|
resp = app.get(url, params=params)
|
||||||
assert resp.json['err'] == 0
|
assert resp.json['err'] == 0
|
||||||
assert len(resp.json['data']) == 0
|
assert len(resp.json['data']) == 0
|
||||||
|
|
||||||
params['nature_ids'] = ''
|
con.loisir_nature_codes = '4,L,, S '
|
||||||
|
con.save()
|
||||||
resp = app.get(url, params=params)
|
resp = app.get(url, params=params)
|
||||||
assert resp.json['err'] == 0
|
assert resp.json['err'] == 0
|
||||||
assert len(resp.json['data']) == 4
|
assert len(resp.json['data']) == 4
|
||||||
|
|
Loading…
Reference in New Issue