toulouse-maelis: add a type filter on personal catalog (#74396)

passerelle/contrib/toulouse_maelis/models.py

@@ -538,7 +538,14 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                 dico[key] = ''
 
     def get_person_activity_list_raw(
-        self, family_id, person_id, nature_id=None, reference_year=None, start_date=None, end_date=None
+        self,
+        family_id,
+        person_id,
+        nature_id=None,
+        type_ids=None,
+        reference_year=None,
+        start_date=None,
+        end_date=None,
     ):
         params = {
             'numDossier': family_id,
@@ -548,9 +555,15 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'dateStartActivity': start_date,
             'dateEndActivity': end_date,
         }
-        return self.call(
+        data = self.call(
             'Activity', 'getPersonCatalogueActivity', getPersonCatalogueActivityRequestBean=params
         )
+        if type_ids:
+            codes = [x.strip() for x in type_ids.split(',') if x.strip()]
+            data['catalogueActivityList'] = [
+                a for a in data['catalogueActivityList'] if a['activity']['activityType']['code'] in codes
+            ]
+        return data
 
     def get_basket_raw(self, family_id):
         return self.call(
@@ -2318,6 +2331,10 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         parameters={
             'person_id': {'description': "Numéro du responsale légal ou de l'enfant"},
             'nature_id': {'description': "Numéro de la nature des activités"},
+            'type_ids': {
+                'description': "Codes des types d'activités, séparées par des virgules",
+                'example_value': 'EXTMERC,EXTVAC',
+            },
             'start_date': {'description': 'Début de la période'},
             'end_date': {'description': 'Fin de la période'},
             'text_template': {
@@ -2333,6 +2350,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         NameID=None,
         family_id=None,
         nature_id=None,
+        type_ids=None,
         start_date=None,
         end_date=None,
         text_template=None,
@@ -2348,6 +2366,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             family_id,
             person_id,
             nature_id=nature_id,
+            type_ids=type_ids,
             reference_year=reference_year,
             start_date=start_date and start_date.strftime(utils.json_date_format),
             end_date=start_date and end_date.strftime(utils.json_date_format),
@@ -2489,6 +2508,10 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'person_id': {'description': "Numéro du responsale légal ou de l'enfant"},
             'nature_id': {'description': "Numéro de la nature des activités"},
+            'type_ids': {
+                'description': "Codes des types d'activités, séparées par des virgules",
+                'example_value': 'EXTMERC,EXTVAC',
+            },
             'start_date': {'description': 'Début de la période'},
             'end_date': {'description': 'Fin de la période'},
             'activity_id': {'description': "Numéro de l'activité"},
@@ -2505,6 +2528,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         start_date=None,
         end_date=None,
         nature_id=None,
+        type_ids=None,
         activity_id=None,
         unit_id=None,
         place_id=None,
@@ -2518,6 +2542,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             family_id,
             person_id,
             nature_id=nature_id,
+            type_ids=type_ids,
             reference_year=reference_year,
             start_date=start_date and start_date.strftime(utils.json_date_format),
             end_date=start_date and end_date.strftime(utils.json_date_format),

tests/test_toulouse_maelis.py

@@ -5077,6 +5077,15 @@ def test_get_person_activity_list(activity_service, con, app):
         ('A10053187065', 'Semaine 2'),
     ]
 
+    params['text_template'] = ''
+    params['type_ids'] = 'LOI_VAC,,'
+    resp = app.get(url, params=params)
+    assert resp.json['err'] == 0
+    assert [(x['id'], x['text']) for x in resp.json['data']] == [
+        ('A10053187087', 'Vacances Ete 2023'),
+        ('A10053187065', 'Vacances Hivers 2023'),
+    ]
+
 
 def test_get_person_activity_list_not_linked_error(con, app):
     url = get_endpoint('get-person-activity-list')
@@ -5533,6 +5542,14 @@ def test_get_person_catalog_geojson(activity_service, con, app):
     resp = app.get(url, params=params)
     assert len(resp.json['features']) == 4
 
+    params['type_ids'] = 'LOI_VAC,LOI_ADU'
+    resp = app.get(url, params=params)
+    assert len(resp.json['features']) == 4
+
+    params['type_ids'] = 'plop'
+    resp = app.get(url, params=params)
+    assert len(resp.json['features']) == 0
+
 
 def test_get_person_catalog_geojson_not_linked_error(con, app):
     url = get_endpoint('get-person-catalog-geojson')