From d0b5c579b9c9b0b7884d86760f60b0172e026f0a Mon Sep 17 00:00:00 2001
From: Nicolas ROCHE <nroche@entrouvert.com>
Date: Sat, 25 Mar 2023 02:54:33 +0100
Subject: [PATCH] toulouse-maelis: remove nature codes parameter on loisir
 catalog (#75752)

---
 passerelle/contrib/toulouse_maelis/models.py | 12 ++----------
 tests/test_toulouse_maelis.py                |  9 ++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/passerelle/contrib/toulouse_maelis/models.py b/passerelle/contrib/toulouse_maelis/models.py
index 128e99b9..434e1f6f 100644
--- a/passerelle/contrib/toulouse_maelis/models.py
+++ b/passerelle/contrib/toulouse_maelis/models.py
@@ -2302,18 +2302,10 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                 'description': "Date de référence, utilisée pour déduire l'année scolaire",
                 '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)
-        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 = {
             'nature': "Nature de l'activité",
             'type': "Type de l'activité",
@@ -2347,7 +2339,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         for activity in activities:
             activity_type = activity['activityPortail'].get('activityType')
             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
             activity['id'] = activity['activityPortail']['idAct']
             activity['text'] = activity['activityPortail']['libelle']
diff --git a/tests/test_toulouse_maelis.py b/tests/test_toulouse_maelis.py
index 4fcf6742..8b4d3b6e 100644
--- a/tests/test_toulouse_maelis.py
+++ b/tests/test_toulouse_maelis.py
@@ -5142,9 +5142,10 @@ def test_read_activity_list(con, app, freezer):
     freezer.move_to('2023-01-01 12:00')
     url = get_endpoint('read-activity-list')
 
+    con.loisir_nature_codes = '4,L,, S '
+    con.save()
     params = {
         'ref_date': datetime.date.today().strftime(json_date_format),
-        'nature_ids': '4,L,, S ',
     }
     resp = app.get(url, params=params)
     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)
     assert resp.json['err'] == 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)
     assert resp.json['err'] == 0
     assert len(resp.json['data']) == 4