toulouse-maelis: rewrite filtering in personnal catalog (#75752)
gitea/passerelle/pipeline/head This commit looks good
Details
gitea/passerelle/pipeline/head This commit looks good
Details
This commit is contained in:
parent
9f2457400d
commit
391e863380
|
@ -579,6 +579,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
|
||||||
nature_filter_codes = self.get_loisir_nature_codes()
|
nature_filter_codes = self.get_loisir_nature_codes()
|
||||||
else:
|
else:
|
||||||
nature_filter_codes = None
|
nature_filter_codes = None
|
||||||
|
type_filter_codes = [x.strip() for x in str(type_ids or '').split(',') if x.strip()]
|
||||||
|
|
||||||
params = {
|
params = {
|
||||||
'numDossier': family_id,
|
'numDossier': family_id,
|
||||||
|
@ -590,20 +591,19 @@ class ToulouseMaelis(BaseResource, HTTPResource):
|
||||||
data = self.call(
|
data = self.call(
|
||||||
'Activity', 'getPersonCatalogueActivity', getPersonCatalogueActivityRequestBean=params
|
'Activity', 'getPersonCatalogueActivity', getPersonCatalogueActivityRequestBean=params
|
||||||
)
|
)
|
||||||
if type_ids:
|
|
||||||
codes = [x.strip() for x in type_ids.split(',') if x.strip()]
|
activities = []
|
||||||
data['catalogueActivityList'] = [
|
for item in data['catalogueActivityList']:
|
||||||
a for a in data['catalogueActivityList'] if a['activity']['activityType']['code'] in codes
|
activity_type = item['activity'].get('activityType')
|
||||||
]
|
activity_nature = activity_type.get('natureSpec') if activity_type else None
|
||||||
if nature_filter_codes:
|
if type_filter_codes:
|
||||||
activities = []
|
if not activity_type or activity_type['code'] not in type_filter_codes:
|
||||||
for activity in data['catalogueActivityList']:
|
continue
|
||||||
activity_type = activity['activity'].get('activityType')
|
if nature_filter_codes:
|
||||||
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 nature_filter_codes:
|
||||||
continue
|
continue
|
||||||
activities.append(activity)
|
activities.append(item)
|
||||||
data['catalogueActivityList'] = activities
|
data['catalogueActivityList'] = activities
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def get_baskets_raw(self, family_id):
|
def get_baskets_raw(self, family_id):
|
||||||
|
|
Loading…
Reference in New Issue