toulouse-maelis: remove unused ref_date on catalog endpoint (#82966)

passerelle/contrib/toulouse_maelis/models.py

@@ -2697,16 +2697,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         display_category='Inscriptions',
         description='Obtenir le catalogue des activités loisir, avec leurs critères de recherche',
         name='read-activity-list',
-        parameters={
-            'ref_date': {
-                'description': "Date de référence, utilisée pour déduire l'année scolaire",
-                'type': 'date',
-            },
-        },
     )
-    def read_activity_list(self, request, ref_date=None):
-        if not ref_date:
-            ref_date = now().date()
+    def read_activity_list(self, request):
+        ref_date = now().date()
         labels = {
             'service': 'Service',
             'nature': "Nature de l'activité",
@@ -2810,7 +2803,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         return {
             'data': data,
             'meta': {
-                'ref_date': ref_date.isoformat(),
                 'all_criterias': all_criterias,
                 'all_criterias_order': ['service', 'nature', 'type', 'public', 'day', 'place'],
             },

passerelle/contrib/toulouse_maelis/tools/connector_bench.py

@@ -13,7 +13,7 @@ from multiprocessing.sharedctypes import Value
 import requests
 
 # CONN = 'https://parsifal-passerelle.dev.publik.love/toulouse-maelis/integ-toulouse'
-CONN = 'https://passerelle-parsifal.test.entrouvert.org/toulouse-maelis/test'
+CONN = 'https://passerelle-parsifal.test.entrouvert.org/toulouse-maelis/maelis'
 APIKEY = 'nicolas'
 FAMILY_ID = '322423'  # NICO TEST / UDAVE INTEG
 PERSON_ID = '176658'  # INTEG
@@ -46,10 +46,10 @@ def get_endpoint(args):
             )
         )
     elif args.test == 'global-catalog':
-        url = args.conn + '/read-activity-list?ref_date=2023-01-01'
+        url = args.conn + '/read-activity-list'
     else:
         raise Exception('unknown test')
-    url += '&apikey=%s' % APIKEY
+    url += '?apikey=%s' % APIKEY
     return url, payload
 
 

tests/test_toulouse_maelis.py

@@ -6305,7 +6305,7 @@ def test_get_public_criterias(start_dob, end_dob, expected):
     assert expected == [x[1] for x in result]
 
 
-def test_read_activity_list(activity_service, con, app):
+def test_read_activity_list(activity_service, con, app, freezer):
     def request_check(request):
         assert request.schoolyear == 1970
         assert request.dateStartCalend == datetime.datetime(2023, 3, 1, 0, 0)
@@ -6320,8 +6320,8 @@ def test_read_activity_list(activity_service, con, app):
 
     con.loisir_nature_codes = '1,4,L,, S '
     con.save()
-    params = {'ref_date': '2024-02-29'}
-    resp = app.get(url, params=params)
+    freezer.move_to('2024-02-29')
+    resp = app.get(url)
     assert resp.json['err'] == 0
     assert len(resp.json['data']) == 8
     assert [
@@ -6386,7 +6386,6 @@ def test_read_activity_list(activity_service, con, app):
         },
     }
     assert resp.json['meta'] == {
-        'ref_date': '2024-02-29',
         'all_criterias': {
             'service': {'text': 'Service', 'data': {'sorties': 'Sorties'}, 'order': ['sorties']},
             'nature': {
@@ -6445,13 +6444,12 @@ def test_read_activity_list(activity_service, con, app):
 
     con.loisir_nature_codes = 'X,L,S'
     con.save()
-    resp = app.get(url, params=params)
+    resp = app.get(url)
     assert resp.json['err'] == 0
     assert len(resp.json['data']) == 0
     assert resp.json == {
         'data': [],
         'meta': {
-            'ref_date': '2024-02-29',
             'all_criterias': {
                 'service': {'text': 'Service', 'data': {}, 'order': []},
                 'nature': {'text': "Nature de l'activité", 'data': {}, 'order': []},
@@ -6466,21 +6464,11 @@ def test_read_activity_list(activity_service, con, app):
     }
 
 
-def test_read_activity_list_without_date(activity_service, con, app, freezer):
-    activity_service.add_soap_response('readActivityList', get_xml_file('R_read_activity_list.xml'))
-    url = get_endpoint('read-activity-list')
-
-    freezer.move_to('2024-02-29')
-    resp = app.get(url)
-    assert resp.json['err'] == 0
-    assert resp.json['meta']['ref_date'] == '2024-02-29'
-
-
-def test_read_activity_list_no_nature(activity_service, con, app):
+def test_read_activity_list_no_nature(activity_service, con, app, freezer):
     activity_service.add_soap_response('readActivityList', get_xml_file('R_read_activity_list_no_nature.xml'))
     url = get_endpoint('read-activity-list')
-    params = {'ref_date': '2023-01-01'}
-    resp = app.get(url, params=params)
+    freezer.move_to('2024-02-29')
+    resp = app.get(url)
     assert resp.json['err'] == 0
     assert len(resp.json['data']) == 0