toulouse-maelis: get users linked to a family (#77295)

passerelle/apps/matrix42/models.py

@@ -36,6 +36,8 @@ DICT_SCHEMA = {
 class Matrix42(BaseResource, HTTPResource):
     category = _('Business Process Connectors')
 
+    log_requests_errors = False
+
     class Meta:
         verbose_name = _('Matrix42 Public API')
 
@@ -91,17 +93,21 @@ class Matrix42(BaseResource, HTTPResource):
 
     @endpoint(
         name='fragment',
+        pattern=r'^(?P<ddname>.+)$',
+        example_pattern='SPSUserClassBase',
         description=_('Fragment Query'),
         display_category=_('Fragments'),
         parameters={
             'ddname': {
                 'description': _('Technical name of the Data Definition'),
-                'example_value': 'SPSUserClassBase',
             },
             'columns': {
                 'description': _('Columns in the result set, separated by comma'),
                 'example_value': 'ID,[Expression-ObjectID] as EOID,LastName,FirstName,MailAddress',
             },
+            'filter': {
+                'description': _('Filter: "WHERE filter"'),
+            },
             'template': {
                 'description': _(
                     'Django template for text attribute - if none, use DisplayString|DisplayName|Name'
@@ -113,9 +119,9 @@ class Matrix42(BaseResource, HTTPResource):
                 'example_value': '{{ ID }}',
             },
             'search_column': {
-                'description': _('Column for "q" search'),
+                'description': _('Search column: "WHERE search_column LIKE \'%q%\' (AND filter)"'),
             },
-            'q': {'description': _('Search text in search column')},
+            'q': {'description': _('Search text (needs a search_column)')},
             'id': {'description': _('Get the whole fragment with this ID')},
         },
     )
@@ -124,6 +130,7 @@ class Matrix42(BaseResource, HTTPResource):
         request,
         ddname,
         columns=None,
+        filter=None,
         template=None,
         id_template=None,
         search_column=None,
@@ -157,6 +164,11 @@ class Matrix42(BaseResource, HTTPResource):
             params['columns'] = columns
         if q is not None:
             params['where'] = "%s LIKE '%%%s%%'" % (search_column, q.replace("'", "''"))
+            if filter:
+                params['where'] += ' AND %s' % filter
+        elif filter:
+            params['where'] = filter
+
         results = self.request(uri, params=params).get('Result') or []
         for result in results:
             add_id_and_text(result)

passerelle/contrib/toulouse_maelis/models.py

@@ -159,6 +159,39 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             # delete extraneous items
             self.referential.filter(referential_name=referential_name, updated__lt=last_update).delete()
 
+    def update_catalog_referential(self):
+        last_update = now()
+        ref_date = last_update.date()
+        try:
+            data = self.call(
+                'Activity',
+                'readActivityList',
+                # pass schoolyear as '1970', it's not actually used and activities will be
+                # returned according to dateStartCalend/dateEndCalend.
+                schoolyear='1970',
+                dateStartCalend=(ref_date - datetime.timedelta(days=365)).isoformat(),
+                dateEndCalend=(ref_date + datetime.timedelta(days=365)).isoformat(),
+            )
+        except Exception as e:
+            raise UpdateError('Service indisponible : %s' % str(e))
+
+        for item in data or []:
+            id_key = item['activityPortail']['idAct']
+            text = item['activityPortail'].get('libelle2') or item['activityPortail']['libelle'] or ''
+            text = text.strip()
+            self.referential.update_or_create(
+                resource_id=self.id,
+                referential_name='Activity',
+                item_id=id_key,
+                defaults={
+                    'item_text': text,
+                    'item_data': dict({'id': id_key, 'text': text}, **item),
+                    'updated': last_update,
+                },
+            )
+        # delete extraneous items
+        self.referential.filter(referential_name='Activity', updated__lt=last_update).delete()
+
     def get_referential_data(self, service_name, referential_name):
         try:
             return self.call(service_name, 'read' + referential_name + 'List')
@@ -226,6 +259,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             if referential_name in ['Direct', 'Service']:
                 id_key, text_key = 'id', 'lib1'
             self.update_referential(referential_name, data, id_key, text_key)
+        self.update_catalog_referential()
 
     def update_ape_referentials(self):
         indicators = self.call('Ape', 'readApeIndicatorList')
@@ -261,11 +295,13 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         super().daily()
         self.update_referentials()
 
+    def every5min(self):
+        self.update_activity_referentials()
+
     def update_referentials(self):
         try:
             self.update_family_referentials()
             self.update_site_referentials()
-            self.update_activity_referentials()
             self.update_ape_referentials()
             self.update_invoice_referentials()
             # merge zip codes from base adresse into town referential
@@ -714,10 +750,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             if value is None:
                 dico[key] = ''
 
-    def read_rl_list_raw(self, family_id, text_template=None, income_year=None):
+    def read_rl_list_raw(self, family_id, text_template, income_year=None):
         result = self.get_family_raw(family_id, incomeYear=income_year)
-        if not text_template:
-            text_template = '{{ lastname }} {{ firstname }}'
 
         for rlg in 'RL1', 'RL2':
             item = result.get(rlg)
@@ -729,10 +763,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             item['family_id'] = family_id
             yield item
 
-    def read_child_list_raw(self, family_id, text_template=None):
+    def read_child_list_raw(self, family_id, text_template):
         result = self.get_family_raw(family_id)
-        if not text_template:
-            text_template = '{{ lastname }} {{ firstname }}'
 
         for item in result['childList']:
             self.add_text_value_to_child(item)
@@ -1271,12 +1303,18 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ lastname }} {{ firstname }}',
             },
             'income_year': {'description': 'Année de revenu pour filtrer les quotients'},
         },
     )
-    def read_rl_list(self, request, NameID=None, family_id=None, text_template=None, income_year=None):
+    def read_rl_list(
+        self,
+        request,
+        NameID=None,
+        family_id=None,
+        text_template='{{ lastname }} {{ firstname }}',
+        income_year=None,
+    ):
         family_id = family_id or self.get_link(NameID).family_id
         return {'data': list(self.read_rl_list_raw(family_id, text_template))}
 
@@ -1289,16 +1327,14 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ lastname }} {{ firstname }}',
             },
         },
     )
-    def read_person_list(self, request, NameID=None, family_id=None, text_template=None):
+    def read_person_list(
+        self, request, NameID=None, family_id=None, text_template='{{ lastname }} {{ firstname }}'
+    ):
         family_id = family_id or self.get_link(NameID).family_id
         result = self.get_family_raw(family_id)
-        if not text_template:
-            text_template = '{{ lastname }} {{ firstname }}'
-
         data = []
         for item in result['emergencyPersonList']:
             self.add_text_value_to_person(item)
@@ -1317,11 +1353,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ lastname }} {{ firstname }}',
             },
         },
     )
-    def read_child_list(self, request, NameID=None, family_id=None, text_template=None):
+    def read_child_list(
+        self, request, NameID=None, family_id=None, text_template='{{ lastname }} {{ firstname }}'
+    ):
         family_id = family_id or self.get_link(NameID).family_id
         return {'data': list(self.read_child_list_raw(family_id, text_template))}
 
@@ -1334,16 +1371,19 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'rl_text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ lastname }} {{ firstname }}',
             },
             'child_text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ lastname }} {{ firstname }}',
             },
         },
     )
     def read_rl_and_child_list(
-        self, request, NameID=None, family_id=None, rl_text_template=None, child_text_template=None
+        self,
+        request,
+        NameID=None,
+        family_id=None,
+        rl_text_template='{{ lastname }} {{ firstname }}',
+        child_text_template='{{ lastname }} {{ firstname }}',
     ):
         family_id = family_id or self.get_link(NameID).family_id
         return {
@@ -1361,16 +1401,19 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'family_id': {'description': 'Numéro de DUI'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text',
-                'example_value': '{{ personInfo.lastname }} {{ personInfo.firstname }}',
             },
         },
     )
-    def read_child_person_list(self, request, child_id, NameID=None, family_id=None, text_template=None):
+    def read_child_person_list(
+        self,
+        request,
+        child_id,
+        NameID=None,
+        family_id=None,
+        text_template='{{ personInfo.lastname }} {{ personInfo.firstname }}',
+    ):
         family_id = family_id or self.get_link(NameID).family_id
         result = self.get_child_raw(family_id, child_id)
-        if not text_template:
-            text_template = '{{ personInfo.lastname }} {{ personInfo.firstname }}'
-
         data = []
         for item in result['authorizedPersonList']:
             self.add_text_value_to_child_person(item)
@@ -2718,6 +2761,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
     )
     def create_child_school_pre_registration(self, request, post_data):
         response = self.call('Family', 'preSubscribeSchoolPerim', **post_data)
+        if not response.get('subscribeSchoolBean'):
+            raise APIError(response.get('returnMessage') or 'no data returned')
         return {'data': response}
 
     @endpoint(
@@ -2752,20 +2797,12 @@ 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):
         labels = {
             'service': 'Service',
             'nature': "Nature de l'activité",
-            'type': "Type de l'activité",
+            'type': 'Discipline',
             'public': 'Public',
             'day': 'Jours',
             'place': 'Lieu',
@@ -2774,16 +2811,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         all_criterias = {key: {'text': value, 'data': {}} for key, value in labels.items()}
         criterias = {key: {'text': value, 'data': {}} for key, value in labels.items()}
 
-        activities = self.call(
-            'Activity',
-            'readActivityList',
-            # pass schoolyear as '1970', it's not actually used and activities will be
-            # returned according to dateStartCalend/dateEndCalend.
-            schoolyear='1970',
-            dateStartCalend=(ref_date - datetime.timedelta(days=365)).isoformat(),
-            dateEndCalend=(ref_date + datetime.timedelta(days=365)).isoformat(),
-        )
-
         def add_criteria(label_key, criteria_key, criteria_value):
             if not criteria_value:
                 return
@@ -2804,15 +2831,11 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                     ]
 
         data = []
-        for activity in activities:
+        for activity in self.get_referential('Activity'):
             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 self.get_loisir_nature_codes():
                 continue
-            activity['id'] = activity['activityPortail']['idAct']
-            activity['text'] = (
-                activity['activityPortail']['libelle2'] or activity['activityPortail']['libelle']
-            )
             service_id = activity['activityPortail']['idService']
             service_text = self.get_referential_value('Service', service_id, default=None)
             activity['activityPortail']['idService_text'] = service_text
@@ -2836,9 +2859,13 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                 unit['text'] = unit['libelle']
 
                 criterias['public']['data'] = {}
-                for key, value in utils.get_public_criterias(
-                    datetime.date.today(), unit['birthDateStart'], unit['birthDateEnd']
-                ):
+                start_dob = unit['birthDateStart']
+                end_dob = unit['birthDateEnd']
+                if start_dob:
+                    start_dob = parse_date(start_dob)
+                if end_dob:
+                    end_dob = parse_date(end_dob)
+                for key, value in utils.get_public_criterias(datetime.date.today(), start_dob, end_dob):
                     add_criteria('public', key, value)
 
                 update_criterias_order_field(criterias, ['public'])
@@ -2865,7 +2892,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'],
             },
@@ -2902,14 +2928,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         type_ids=None,
         start_date=None,
         end_date=None,
-        text_template=None,
+        text_template='{{ activity.libelle2|default:activity.libelle1 }}',
     ):
         family_id = family_id or self.get_link(NameID).family_id
         reference_year = None
         if start_date and end_date:
             start_date, end_date, reference_year = self.get_start_and_end_dates(start_date, end_date)
-        if not text_template:
-            text_template = '{{ activity.libelle2|default:activity.libelle1 }}'
 
         response = self.get_person_activity_list_raw(
             family_id,
@@ -2939,7 +2963,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'end_date': {'description': 'Fin de la période'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text (URL encoding)',
-                'example_value': '{{ libelle }}',
             },
         },
     )
@@ -2952,14 +2975,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         family_id=None,
         start_date=None,
         end_date=None,
-        text_template=None,
+        text_template='{{ libelle }}',
     ):
         family_id = family_id or self.get_link(NameID).family_id
         reference_year = None
         if start_date and end_date:
             start_date, end_date, reference_year = self.get_start_and_end_dates(start_date, end_date)
-        if not text_template:
-            text_template = '{{ libelle }}'
 
         response = self.get_person_activity_list_raw(
             family_id,
@@ -2996,7 +3017,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'end_date': {'description': 'Fin de la période'},
             'text_template': {
                 'description': 'Gabarit utilisé pour la valeur text (URL encoding)',
-                'example_value': '{{ libelle }}',
             },
         },
     )
@@ -3010,14 +3030,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         family_id=None,
         start_date=None,
         end_date=None,
-        text_template=None,
+        text_template='{{ place.lib2|default:place.lib1 }}',
     ):
         family_id = family_id or self.get_link(NameID).family_id
         reference_year = None
         if start_date and end_date:
             start_date, end_date, reference_year = self.get_start_and_end_dates(start_date, end_date)
-        if not text_template:
-            text_template = '{{ place.lib2|default:place.lib1 }}'
 
         response = self.get_person_activity_list_raw(
             family_id,
@@ -4096,16 +4114,16 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             pass
         else:
             for item in result:
-                try:
-                    invoice = self.invoice_set.get(regie_id=regie_id, invoice_id=item['numInvoice'])
-                except Invoice.DoesNotExist:
-                    invoice = self.invoice_set.create(
-                        regie_id=regie_id,
-                        invoice_id=item['numInvoice'],
-                        family_id=family_id,
-                        maelis_data=item,
-                        maelis_data_update_date=now(),
-                    )
+                invoice, created = self.invoice_set.get_or_create(
+                    regie_id=regie_id,
+                    invoice_id=item['numInvoice'],
+                    defaults={
+                        'family_id': family_id,
+                        'maelis_data': item,
+                        'maelis_data_update_date': now(),
+                    },
+                )
+                if created:
                     self.logger.info("Ajout de %s sur la famille '%s'", repr(invoice), family_id)
                 else:
                     if invoice.family_id != family_id:

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
 
 

passerelle/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Passerelle 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-02 16:59+0100\n"
+"POT-Creation-Date: 2023-11-03 15:33+0100\n"
 "PO-Revision-Date: 2023-07-06 18:06+0200\n"
 "Last-Translator: Frederic Peters <fpeters@entrouvert.com>\n"
 "Language: fr\n"
@@ -3082,6 +3082,10 @@ msgstr "Nom technique de la définition de donnée"
 msgid "Columns in the result set, separated by comma"
 msgstr "Colonnes dans le résultat, séparées par des virgules"
 
+#: apps/matrix42/models.py
+msgid "Filter: \"WHERE filter\""
+msgstr "Filtre : « WHERE filter »"
+
 #: apps/matrix42/models.py
 msgid ""
 "Django template for text attribute - if none, use DisplayString|DisplayName|"
@@ -3095,12 +3099,13 @@ msgid "Django template for id attribute - if none, use ID"
 msgstr "Gabarit Django pour l’attribut « id ». Si absent, utilise ID"
 
 #: apps/matrix42/models.py
-msgid "Column for \"q\" search"
-msgstr "Colonne à considérer pour la recherche « q »"
+msgid "Search column: \"WHERE search_column LIKE '%q%' (AND filter)\""
+msgstr ""
+"Colonne de recherche : « WHERE search_column LIKE '%q%' ( AND filter ) »"
 
 #: apps/matrix42/models.py
-msgid "Search text in search column"
-msgstr "Texte à chercher dans la colonne de recherche"
+msgid "Search text (needs a search_column)"
+msgstr "Texte à chercher (nécessite de préciser la colonne avec search_column)"
 
 #: apps/matrix42/models.py
 msgid "Get the whole fragment with this ID"

passerelle/settings.py

@@ -197,6 +197,7 @@ INSTALLED_APPS = (
 PASSERELLE_APP_BDP_ENABLED = False
 PASSERELLE_APP_GDC_ENABLED = False
 PASSERELLE_APP_STRASBOURG_EU_ENABLED = False
+PASSERELLE_APP_TOULOUSE_MAELIS_ENABLED = False
 
 # mark some apps as legacy
 PASSERELLE_APP_CLICRDV_LEGACY = True

tests/data/toulouse_maelis/R_create_child_school_pre_registration_maelis_error.xml

@@ -0,0 +1,9 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <ns2:preSubscribeSchoolPerimResponse xmlns:ns2="family.ws.maelis.sigec.com">
+      <resultSubscribeBean>
+	<returnMessage>E113 : Il existe déjà une inscription scolaire pour cet enfant</returnMessage>
+      </resultSubscribeBean>
+    </ns2:preSubscribeSchoolPerimResponse>
+  </soap:Body>
+</soap:Envelope>

tests/data/toulouse_maelis/R_create_child_school_pre_registration_soap_error.xml

@@ -0,0 +1,13 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Body>
+    <soap:Fault>
+      <faultcode>soap:Server</faultcode>
+      <faultstring>E25 : Cette personne nappartient pas à cette famille</faultstring>
+      <detail>
+        <ns1:MaelisFamilyException xmlns:ns1="family.ws.maelis.sigec.com">
+          <message xmlns:ns2="family.ws.maelis.sigec.com">E25 : Cette personne nappartient pas à cette famille</message>
+        </ns1:MaelisFamilyException>
+      </detail>
+    </soap:Fault>
+  </soap:Body>
+</soap:Envelope>

tests/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS += (  # noqa pylint: disable=undefined-variable
 PASSERELLE_APP_BDP_ENABLED = True
 PASSERELLE_APP_GDC_ENABLED = True
 PASSERELLE_APP_STRASBOURG_EU_ENABLED = True
+PASSERELLE_APP_TOULOUSE_MAELIS_ENABLED = True
 
 TCL_URL_TEMPLATE = 'http://tcl.example.net/%s'
 TCL_GEOJSON_URL_TEMPLATE = 'http://tcl.example.net/geojson/%s'

tests/test_matrix42.py

@@ -33,8 +33,9 @@ def matrix42():
 def test_matrix42_fragment(mocked_request, app, matrix42):
     endpoint = generic_endpoint_url('matrix42', 'fragment', slug=matrix42.slug)
     assert endpoint == '/matrix42/test/fragment'
+    endpoint += '/SPSUserClassBase'
 
-    params = {'ddname': 'SPSUserClassBase'}
+    params = {}
     mocked_request.side_effect = [
         FakedResponse(content=TOKEN, status_code=200),
         FakedResponse(content=USERS, status_code=200),
@@ -111,6 +112,48 @@ def test_matrix42_fragment(mocked_request, app, matrix42):
     assert resp.json['data'][0]['id'] == 'id:a9386c3e-cb7a-ed11-a3bb-000d3aaa0172'
     assert resp.json['data'][0]['text'] == 'ds:User1, Leo'
 
+    # filter
+    del params['q']
+    params['filter'] = '1=1'
+    mocked_request.reset_mock()
+    mocked_request.side_effect = [
+        FakedResponse(content=TOKEN, status_code=200),
+        FakedResponse(content=USERS, status_code=200),
+    ]
+    resp = app.get(endpoint, params=params, status=200)
+    _, get_users = mocked_request.call_args_list
+    assert get_users[0] == (
+        'GET',
+        'https://matrix42.example.net/api/data/fragments/SPSUserClassBase/schema-info',
+    )
+    assert get_users[1]['params'] == {
+        'columns': 'DisplayString',
+        'where': '1=1',
+    }
+    assert resp.json['err'] == 0
+    assert len(resp.json['data']) == 2
+
+    # filter & q
+    params['q'] = 'User'
+    params['filter'] = '1=1'
+    mocked_request.reset_mock()
+    mocked_request.side_effect = [
+        FakedResponse(content=TOKEN, status_code=200),
+        FakedResponse(content=USERS, status_code=200),
+    ]
+    resp = app.get(endpoint, params=params, status=200)
+    _, get_users = mocked_request.call_args_list
+    assert get_users[0] == (
+        'GET',
+        'https://matrix42.example.net/api/data/fragments/SPSUserClassBase/schema-info',
+    )
+    assert get_users[1]['params'] == {
+        'columns': 'DisplayString',
+        'where': "DisplayString LIKE '%User%' AND 1=1",
+    }
+    assert resp.json['err'] == 0
+    assert len(resp.json['data']) == 2
+
     # get one user
     del params['q']
     params['id'] = 'a9386c3e-cb7a-ed11-a3bb-000d3aaa0172'
@@ -134,7 +177,8 @@ def test_matrix42_fragment(mocked_request, app, matrix42):
 @mock.patch('passerelle.utils.Request.request')
 def test_matrix42_bad_rawtoken(mocked_request, app, matrix42):
     endpoint = generic_endpoint_url('matrix42', 'fragment', slug=matrix42.slug)
-    params = {'ddname': 'SPSUserClassBase'}
+    endpoint += '/SPSUserClassBase'
+    params = {}
     # open access
     api = ApiUser.objects.create(username='all', keytype='', key='')
     obj_type = ContentType.objects.get_for_model(matrix42)

tests/test_toulouse_maelis.py

@@ -261,6 +261,9 @@ def django_db_setup(django_db_setup, django_db_blocker):
                     activity_mock.add_soap_response(
                         'readServiceList', get_xml_file('R_read_service_list.xml')
                     )
+                    activity_mock.add_soap_response(
+                        'readActivityList', get_xml_file('R_read_activity_list.xml')
+                    )
                     con.update_activity_referentials()
 
                 with ape_service() as ape_mock:
@@ -570,6 +573,7 @@ def test_update_referential_empty(mocked_get, con):
 def test_cron(db):
     assert Referential.objects.filter(referential_name='Category').count() == 3
     assert sorted(list({x.referential_name for x in Referential.objects.all()})) == [
+        'Activity',
         'ActivityNatureType',
         'ApeIndicator',
         'CSP',
@@ -6354,6 +6358,47 @@ def test_create_child_school_pre_registration(family_service, con, app):
     assert resp.json['data']['subscribeSchoolBean']['isWaitList']
 
 
+def test_create_child_school_pre_registration_soap_error(family_service, con, app):
+    family_service.add_soap_response(
+        'preSubscribeSchoolPerim', get_xml_file('R_create_child_school_pre_registration_soap_error.xml')
+    )
+    url = get_endpoint('create-child-school-pre-registration')
+    resp = app.post_json(
+        url,
+        params={
+            'numPerson': '248460',
+            'schoolYear': '2023',
+            'levelCode': 'CM1',
+            'dateSubscribe': '2023-09-01T00:00:00+02:00',
+        },
+    )
+    assert resp.json['err'] == 1
+    assert resp.json['err_class'] == 'passerelle.utils.soap.SOAPFault'
+    assert (
+        resp.json['err_desc']
+        == 'SOAP service at https://example.org/FamilyService?wsdl returned an error "E25 : Cette personne nappartient pas à cette famille"'
+    )
+
+
+def test_create_child_school_pre_registration_maelis_error(family_service, con, app):
+    family_service.add_soap_response(
+        'preSubscribeSchoolPerim', get_xml_file('R_create_child_school_pre_registration_maelis_error.xml')
+    )
+    url = get_endpoint('create-child-school-pre-registration')
+    resp = app.post_json(
+        url,
+        params={
+            'numPerson': '248460',
+            'schoolYear': '2023',
+            'levelCode': 'CM1',
+            'dateSubscribe': '2023-09-01T00:00:00+02:00',
+        },
+    )
+    assert resp.json['err'] == 1
+    assert resp.json['err_class'] == 'passerelle.utils.jsonresponse.APIError'
+    assert resp.json['err_desc'] == 'E113 : Il existe déjà une inscription scolaire pour cet enfant'
+
+
 def test_create_child_school_pre_registration_with_exemption(family_service, con, app):
     family_service.add_soap_response(
         'presubscribeSchoolDerog', get_xml_file('R_create_child_school_pre_registration_with_exemption.xml')
@@ -6443,25 +6488,17 @@ 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 request_check(request):
-        assert request.schoolyear == 1970
-        assert request.dateStartCalend == datetime.datetime(2023, 3, 1, 0, 0)
-        assert request.dateEndCalend == datetime.datetime(2025, 2, 28, 0, 0)
-
-    activity_service.add_soap_response(
-        'readActivityList',
-        get_xml_file('R_read_activity_list.xml'),
-        request_check=request_check,
-    )
+def test_read_activity_list(con, app, freezer):
     url = get_endpoint('read-activity-list')
 
     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
+    activity_text = [x['activity']['text'] for x in resp.json['data']]
+    assert activity_text == sorted(activity_text)
     assert [
         (
             x['id'],
@@ -6470,16 +6507,16 @@ def test_read_activity_list(activity_service, con, app):
         )
         for x in resp.json['data']
     ] == [
+        ('A10056517594-A10056517595-A10056517597', 'plop', None),
+        ('A10056514645-A10056514650-A10053179757', None, None),
+        ('A10056514645-A10056514648-A10053179876', None, None),
+        ('A10056514645-A10056514649-A10053179757', None, None),
         ('A10051141965-A10051141966-A10053179226', 'A10049329051', 'Sorties'),
         ('A10051141965-A10051141968-A10053179226', 'A10049329051', 'Sorties'),
         ('A10051141965-A10051141970-A10053179226', 'A10049329051', 'Sorties'),
         ('A10051141965-A10051141990-A10053179227', 'A10049329051', 'Sorties'),
-        ('A10056514645-A10056514650-A10053179757', None, None),
-        ('A10056514645-A10056514648-A10053179876', None, None),
-        ('A10056514645-A10056514649-A10053179757', None, None),
-        ('A10056517594-A10056517595-A10056517597', 'plop', None),
     ]
-    item = resp.json['data'][0]
+    item = resp.json['data'][4]
     item['activity'] = 'N/A'
     item['unit'] = 'N/A'
     item['place'] = 'N/A'
@@ -6499,7 +6536,7 @@ def test_read_activity_list(activity_service, con, app):
             },
             'nature': {'text': "Nature de l'activité", 'data': {'4': 'ART PLASTIQUE'}, 'order': ['4']},
             'type': {
-                'text': "Type de l'activité",
+                'text': 'Discipline',
                 'data': {'activite-reguliere': 'ACTIVITE REGULIERE'},
                 'order': ['activite-reguliere'],
             },
@@ -6524,7 +6561,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': {
@@ -6533,7 +6569,7 @@ def test_read_activity_list(activity_service, con, app):
                 'order': ['1', '4'],
             },
             'type': {
-                'text': "Type de l'activité",
+                'text': 'Discipline',
                 'data': {
                     'activite-reguliere': 'ACTIVITE REGULIERE',
                     'activites-aquatiques-activite-reguliere': 'Activités Aquatiques Activité Réguliére',
@@ -6583,17 +6619,16 @@ 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': []},
-                'type': {'text': "Type de l'activité", 'data': {}, 'order': []},
+                'type': {'text': 'Discipline', 'data': {}, 'order': []},
                 'public': {'text': 'Public', 'data': {}, 'order': []},
                 'day': {'text': 'Jours', 'data': {}, 'order': []},
                 'place': {'text': 'Lieu', 'data': {}, 'order': []},
@@ -6604,22 +6639,20 @@ 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')
+def test_read_activity_list_no_nature(activity_service, con, app, freezer):
+    def request_check(request):
+        assert request.schoolyear == 1970
+        assert request.dateStartCalend == datetime.datetime(2023, 3, 1, 0, 0)
+        assert request.dateEndCalend == datetime.datetime(2025, 2, 28, 0, 0)
 
+    activity_service.add_soap_response(
+        'readActivityList', get_xml_file('R_read_activity_list_no_nature.xml'), request_check=request_check
+    )
+    url = get_endpoint('read-activity-list')
     freezer.move_to('2024-02-29')
+    con.update_catalog_referential()
     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):
-    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)
-    assert resp.json['err'] == 0
     assert len(resp.json['data']) == 0
 
 
@@ -6643,7 +6676,6 @@ def test_get_person_activity_list(activity_service, con, app):
         'nature': '',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 0
@@ -6725,7 +6757,7 @@ def test_get_person_activity_list(activity_service, con, app):
         ('A10053187065', 'Semaine 2'),
     ]
 
-    params['text_template'] = ''
+    del params['text_template']
     params['type_ids'] = 'LOI_VAC,,'
     resp = app.get(url, params=params)
     assert resp.json['err'] == 0
@@ -6760,7 +6792,6 @@ def test_get_person_activity_list_not_linked_error(con, app):
         'nature': '',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 1
@@ -6777,7 +6808,6 @@ def test_get_person_activity_list_date_error(con, app):
         'nature': '',
         'start_date': 'bad',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params, status=400)
     assert resp.json['err'] == 1
@@ -6820,7 +6850,6 @@ def test_get_person_unit_list(activity_service, con, app):
         'activity_id': 'A10053187087',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 0
@@ -6888,7 +6917,6 @@ def test_get_person_unit_list_not_linked_error(con, app):
         'activity_id': 'A10053187087',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 1
@@ -6905,7 +6933,6 @@ def test_get_person_unit_list_date_error(con, app):
         'activity_id': 'A10053187087',
         'start_date': 'bad',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params, status=400)
     assert resp.json['err'] == 1
@@ -6944,7 +6971,6 @@ def test_get_person_unit_list_no_activity_error(activity_service, con, app):
         'activity_id': 'plop',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 1
@@ -6970,7 +6996,6 @@ def test_get_person_place_list(activity_service, con, app):
         'unit_id': 'A10053187241',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 0
@@ -7027,7 +7052,6 @@ def test_get_person_place_list_not_linked_error(con, app):
         'unit_id': 'A10053187241',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 1
@@ -7045,7 +7069,6 @@ def test_get_person_place_list_date_error(con, app):
         'unit_id': 'A10053187241',
         'start_date': 'bad',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params, status=400)
     assert resp.json['err'] == 1
@@ -7085,7 +7108,6 @@ def test_get_person_place_list_no_unit_error(activity_service, con, app):
         'unit_id': 'plop',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
-        'text_template': '',
     }
     resp = app.get(url, params=params)
     assert resp.json['err'] == 1