misc: fix Django 3.2 default auto field warning (#75442)

passerelle/contrib/toulouse_maelis/migrations/0002_referential.py

@@ -1,6 +1,7 @@
 # Generated by Django 2.2.26 on 2022-12-08 16:05
 
 import django.contrib.postgres.fields.jsonb
+import django.core.serializers.json
 import django.db.models.deletion
 from django.db import migrations, models
 
@@ -21,7 +22,12 @@ class Migration(migrations.Migration):
                 ('referential_name', models.CharField(max_length=64, verbose_name='Name')),
                 ('item_id', models.CharField(max_length=64, verbose_name='Key')),
                 ('item_text', models.CharField(max_length=128, verbose_name='Text')),
-                ('item_data', django.contrib.postgres.fields.jsonb.JSONField(verbose_name='Data')),
+                (
+                    'item_data',
+                    django.contrib.postgres.fields.jsonb.JSONField(
+                        encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Data'
+                    ),
+                ),
                 ('created', models.DateTimeField(auto_now_add=True, verbose_name='Created')),
                 ('updated', models.DateTimeField(auto_now=True, verbose_name='Updated')),
                 (

passerelle/contrib/toulouse_maelis/migrations/0006_auto_20230324_1730.py

@@ -0,0 +1,39 @@
+# Generated by Django 2.2.26 on 2023-03-24 16:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('toulouse_maelis', '0005_auto_20221221_1546'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='toulousemaelis',
+            name='extrasco_nature_codes',
+            field=models.TextField(
+                blank=True,
+                default='X',
+                verbose_name='Codes des natures des activités extra-scolaires, séparés par des virgules',
+            ),
+        ),
+        migrations.AddField(
+            model_name='toulousemaelis',
+            name='loisir_nature_codes',
+            field=models.TextField(
+                blank=True,
+                default='P,L,S,1,2,3,4,5,6,7,8,9',
+                verbose_name='Codes des natures des activités loisirs, séparés par des virgules',
+            ),
+        ),
+        migrations.AddField(
+            model_name='toulousemaelis',
+            name='perisco_nature_codes',
+            field=models.TextField(
+                blank=True,
+                default='A,R',
+                verbose_name='Codes des natures des activités péri-scolaires, séparés par des virgules',
+            ),
+        ),
+    ]

passerelle/contrib/toulouse_maelis/models.py

@@ -59,6 +59,21 @@ class ToulouseMaelis(BaseResource, HTTPResource):
     zeep_wsse_password = models.CharField(
         max_length=64, blank=True, default='', verbose_name='Mot de passe WSSE'
     )
+    perisco_nature_codes = models.TextField(
+        blank=True,
+        default='A,R',
+        verbose_name='Codes des natures des activités péri-scolaires, séparés par des virgules',
+    )
+    extrasco_nature_codes = models.TextField(
+        blank=True,
+        default='X',
+        verbose_name='Codes des natures des activités extra-scolaires, séparés par des virgules',
+    )
+    loisir_nature_codes = models.TextField(
+        blank=True,
+        default='P,L,S,' + ','.join(str(x) for x in range(1, 10)),
+        verbose_name='Codes des natures des activités loisirs, séparés par des virgules',
+    )
 
     category = 'Connecteurs métiers'
     _category_ordering = ['Famille', 'Activités']
@@ -66,6 +81,15 @@ class ToulouseMaelis(BaseResource, HTTPResource):
     class Meta:
         verbose_name = 'Toulouse Maelis'
 
+    def get_perisco_nature_codes(self):
+        return [x.strip() for x in self.perisco_nature_codes.split(',') if x.strip()]
+
+    def get_extrasco_nature_codes(self):
+        return [x.strip() for x in self.extrasco_nature_codes.split(',') if x.strip()]
+
+    def get_loisir_nature_codes(self):
+        return [x.strip() for x in self.loisir_nature_codes.split(',') if x.strip()]
+
     def get_client(self, wsdl_short_name):
         wsse = UsernameToken(self.zeep_wsse_username, self.zeep_wsse_password)
         wsdl_name = wsdl_short_name + 'Service?wsdl'
@@ -271,6 +295,17 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                 return child
         raise APIError("no '%s' child on '%s' family" % (child_id, family_id))
 
+    def get_rl_or_child_raw(self, family_id, person_id):
+        data = self.get_family_raw(family_id)
+        if data['RL1']['num'] == person_id:
+            return data['RL1']
+        elif data['RL2'] and data['RL2']['num'] == person_id:
+            return data['RL2']
+        for child in data['childList']:
+            if child['num'] == person_id:
+                return child
+        raise APIError("no '%s' RL or child on '%s' family" % (person_id, family_id))
+
     def get_child_person_raw(self, family_id, child_id, person_id):
         data = self.get_child_raw(family_id, child_id)
         for person in data['authorizedPersonList']:
@@ -569,16 +604,23 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         self,
         family_id,
         person_id,
-        nature_id=None,
+        nature=None,
         type_ids=None,
         reference_year=None,
         start_date=None,
         end_date=None,
     ):
+        if str(nature).lower() == 'extrasco':
+            nature_filter_codes = self.get_extrasco_nature_codes()
+        elif str(nature).lower() == 'loisir':
+            nature_filter_codes = self.get_loisir_nature_codes()
+        else:
+            nature_filter_codes = None
+        type_filter_codes = [x.strip() for x in str(type_ids or '').split(',') if x.strip()]
+
         params = {
             'numDossier': family_id,
             'numPerson': person_id,
-            'codeNatureActivity': nature_id,
             'yearSchool': reference_year,
             'dateStartActivity': start_date,
             'dateEndActivity': end_date,
@@ -586,11 +628,19 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         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
-            ]
+
+        activities = []
+        for item in data['catalogueActivityList']:
+            activity_type = item['activity'].get('activityType')
+            activity_nature = activity_type.get('natureSpec') if activity_type else None
+            if type_filter_codes:
+                if not activity_type or activity_type['code'] not in type_filter_codes:
+                    continue
+            if nature_filter_codes:
+                if not activity_nature or activity_nature['code'] not in nature_filter_codes:
+                    continue
+            activities.append(item)
+        data['catalogueActivityList'] = activities
         return data
 
     def get_baskets_raw(self, family_id):
@@ -1189,6 +1239,54 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         response = self.call('Family', 'isChildExists', **post_data)
         return {'data': response}
 
+    @endpoint(
+        display_category='Famille',
+        description="Lister les activités auxquelles un RL ou un enfant est inscrit",
+        perm='can_access',
+        name='read-subscribe-activity-list',
+        parameters={
+            'child_id': {'description': "Numéro du représentant légal ou de l'enfant"},
+            'NameID': {'description': 'Publik NameID'},
+            'family_id': {'description': 'Numéro de DUI'},
+            'nature': {
+                'description': "Natures des activités : PERICSO, EXTRASCO ou LOISIR (toutes par défaut)",
+            },
+            'type_ids': {
+                'description': "Codes des types des activités (tous par défaut), séparés par des virgules",
+                'example_value': 'ACCSOIR,RESTSCOL',
+            },
+        },
+    )
+    def read_subscribe_activity_list(
+        self, request, person_id, NameID=None, family_id=None, nature=None, type_ids=None
+    ):
+        family_id = family_id or self.get_link(NameID).family_id
+        result = self.get_rl_or_child_raw(family_id, person_id)
+        if str(nature).lower() == 'perisco':
+            nature_filter_codes = self.get_perisco_nature_codes()
+        elif str(nature).lower() == 'extrasco':
+            nature_filter_codes = self.get_extrasco_nature_codes()
+        elif str(nature).lower() == 'loisir':
+            nature_filter_codes = self.get_loisir_nature_codes()
+        else:
+            nature_filter_codes = None
+        type_filter_codes = [x.strip() for x in str(type_ids or '').split(',') if x.strip()]
+
+        data = []
+        for item in result['subscribeActivityList'] or []:
+            activity_type = item.get('typeActivity')
+            activity_nature = activity_type.get('natureSpec') if activity_type else None
+            if type_filter_codes:
+                if not activity_type or activity_type['code'] not in type_filter_codes:
+                    continue
+            if nature_filter_codes:
+                if not activity_nature or activity_nature['code'] not in nature_filter_codes:
+                    continue
+            item['id'] = item['idActivity']
+            item['text'] = item['libelle']
+            data.append(item)
+        return {'data': data}
+
     @endpoint(
         display_category='Famille',
         description='Créer la famille',
@@ -1852,7 +1950,11 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                     activity = schedule['activity']
                     if not activity['activityType']['natureSpec']:
                         continue
-                    if activity['activityType']['natureSpec']['code'] not in ['A', 'R', 'X']:
+                    if (
+                        activity['activityType']['natureSpec']['code'] not in self.get_perisco_nature_codes()
+                        and activity['activityType']['natureSpec']['code']
+                        not in self.get_extrasco_nature_codes()
+                    ):
                         continue
                     activity_id = activity['idAct']
                     many_units = len(schedule['unitScheduleList']) > 1
@@ -1868,7 +1970,8 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                                 'prefill': day['scheduledPresence'] > 0 or day['realPresence'] > 1,
                                 'disabled': (
                                     day['status'] != 'WRITABLE'
-                                    or activity['activityType']['natureSpec']['code'] in ['X']
+                                    or activity['activityType']['natureSpec']['code']
+                                    in self.get_extrasco_nature_codes()
                                 ),
                                 'details': day,
                             }
@@ -1878,7 +1981,10 @@ class ToulouseMaelis(BaseResource, HTTPResource):
                             booking['details']['status_color'] = color
                             booking['details']['activity_id'] = activity_id
                             booking['details']['activity_type'] = activity['activityType']['code']
-                            if activity['activityType']['natureSpec']['code'] in ['A', 'R']:
+                            if (
+                                activity['activityType']['natureSpec']['code']
+                                in self.get_perisco_nature_codes()
+                            ):
                                 booking['details']['activity_label'] = activity['activityType']['libelle']
                             else:
                                 booking['details']['activity_label'] = (
@@ -2269,19 +2375,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:
-            # actual loisir nature codes
-            nature_filter_codes = ['P', 'L', 'S'] + [str(i) for i in range(1, 10)]
-        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é",
@@ -2315,7 +2412,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']
@@ -2377,7 +2474,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         perm='can_access',
         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"},
+            'nature': {
+                'description': "Nature des activités : EXTRASCO ou LOISIR (toutes par défaut)",
+            },
             'type_ids': {
                 'description': "Codes des types des activités, séparées par des virgules",
                 'example_value': 'EXTMERC,EXTVAC',
@@ -2396,7 +2495,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         person_id,
         NameID=None,
         family_id=None,
-        nature_id=None,
+        nature=None,
         type_ids=None,
         start_date=None,
         end_date=None,
@@ -2412,12 +2511,13 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         response = self.get_person_activity_list_raw(
             family_id,
             person_id,
-            nature_id=nature_id,
+            nature=nature,
             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),
         )
+
         for item in response['catalogueActivityList']:
             item['id'] = item['activity']['idActivity']
             item['text'] = render_to_string(text_template, item).strip()
@@ -2554,7 +2654,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
             'NameID': {'description': 'Publik NameID'},
             '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"},
+            'nature': {
+                'description': "Nature des activités : EXTRASCO ou LOISIR (toutes par défaut)",
+            },
             'type_ids': {
                 'description': "Codes des types des activités, séparées par des virgules",
                 'example_value': 'EXTMERC,EXTVAC',
@@ -2574,7 +2676,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         family_id=None,
         start_date=None,
         end_date=None,
-        nature_id=None,
+        nature=None,
         type_ids=None,
         activity_id=None,
         unit_id=None,
@@ -2588,7 +2690,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
         response = self.get_person_activity_list_raw(
             family_id,
             person_id,
-            nature_id=nature_id,
+            nature=nature,
             type_ids=type_ids,
             reference_year=reference_year,
             start_date=start_date and start_date.strftime(utils.json_date_format),

tests/data/toulouse_maelis/R_read_family.xml

@@ -99,6 +99,23 @@
             <number>789</number>
             <organ>A10007752822</organ>
           </CAFInfo>
+          <subscribeActivityList>
+            <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179465</idUnit>
+              <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-22T00:00:00+01:00</dateStart>
+              <dateEnd>2023-03-22T00:00:00+01:00</dateEnd>
+            </subscribesUnit>
+            <place>RANGUEIL</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179463</idActivity>
+            <typeActivity/>
+          </subscribeActivityList>
         </RL2>
         <emergencyPersonList>
           <numPerson>614059</numPerson>
@@ -212,6 +229,129 @@
             <dateFin>2022-12-31T00:00:00+01:00</dateFin>
             <description>bla bla PAI</description>
           </paiInfoBean>
+          <subscribeActivityList>
+            <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327683</idUnit>
+              <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327682</idActivity>
+            <typeActivity>
+              <code>RESTSCOL</code>
+              <libelle>Restauration scolaire</libelle>
+              <natureSpec>
+                <code>R</code>
+                <libelle>Restauration Scolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MIDI 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327687</idUnit>
+              <libelle>CLAE MIDI 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327686</idActivity>
+            <typeActivity>
+              <code>ACCPERI</code>
+              <libelle>Accueil périscolaire</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MATIN 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327690</idUnit>
+              <libelle>CLAE MATIN 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327689</idActivity>
+            <typeActivity>
+              <code>ACCMAT</code>
+              <libelle>Accueil du matin</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049354915</idUnit>
+              <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>MAOURINE (la) ELEMENTAIRE</place>
+            <planningHebdomadaire>1101111</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049354913</idActivity>
+            <typeActivity>
+              <code>EXTMERC</code>
+              <libelle>Mercredi</libelle>
+              <natureSpec>
+                <code>X</code>
+                <libelle>Extrascolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179800</idUnit>
+              <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-06-30T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>ARGOULETS</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179798</idActivity>
+            <typeActivity>
+              <code>25</code>
+              <libelle>ACTIVITE REGULIERE - SPORT</libelle>
+              <natureSpec>
+                <code>8</code>
+                <libelle>SPORT</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
         </childList>
         <childList>
           <num>613987</num>

tests/data/toulouse_maelis/R_read_family_relax.xml

@@ -99,6 +99,23 @@
             <number>789</number>
             <organ>A10007752822</organ>
           </CAFInfo>
+          <subscribeActivityList>
+            <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179465</idUnit>
+              <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-22T00:00:00+01:00</dateStart>
+              <dateEnd>2023-03-22T00:00:00+01:00</dateEnd>
+            </subscribesUnit>
+            <place>RANGUEIL</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179463</idActivity>
+            <typeActivity/>
+          </subscribeActivityList>
         </RL2>
         <emergencyPersonList>
           <numPerson>614059</numPerson>
@@ -211,6 +228,129 @@
             <dateFin>2022-12-31T00:00:00+01:00</dateFin>
             <description>bla bla PAI</description>
           </paiInfoBean>
+          <subscribeActivityList>
+            <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327683</idUnit>
+              <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327682</idActivity>
+            <typeActivity>
+              <code>RESTSCOL</code>
+              <libelle>Restauration scolaire</libelle>
+              <natureSpec>
+                <code>R</code>
+                <libelle>Restauration Scolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MIDI 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327687</idUnit>
+              <libelle>CLAE MIDI 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327686</idActivity>
+            <typeActivity>
+              <code>ACCPERI</code>
+              <libelle>Accueil périscolaire</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MATIN 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327690</idUnit>
+              <libelle>CLAE MATIN 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327689</idActivity>
+            <typeActivity>
+              <code>ACCMAT</code>
+              <libelle>Accueil du matin</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049354915</idUnit>
+              <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>MAOURINE (la) ELEMENTAIRE</place>
+            <planningHebdomadaire>1101111</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049354913</idActivity>
+            <typeActivity>
+              <code>EXTMERC</code>
+              <libelle>Mercredi</libelle>
+              <natureSpec>
+                <code>X</code>
+                <libelle>Extrascolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179800</idUnit>
+              <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-06-30T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>ARGOULETS</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179798</idActivity>
+            <typeActivity>
+              <code>25</code>
+              <libelle>ACTIVITE REGULIERE - SPORT</libelle>
+              <natureSpec>
+                <code>8</code>
+                <libelle>SPORT</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
         </childList>
         <childList>
           <num>613987</num>

tests/data/toulouse_maelis/R_read_family_reordered.xml

@@ -99,6 +99,23 @@
             <number>789</number>
             <organ>A10007752822</organ>
           </CAFInfo>
+          <subscribeActivityList>
+            <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179465</idUnit>
+              <libelle>CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-22T00:00:00+01:00</dateStart>
+              <dateEnd>2023-03-22T00:00:00+01:00</dateEnd>
+            </subscribesUnit>
+            <place>RANGUEIL</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179463</idActivity>
+            <typeActivity/>
+          </subscribeActivityList>
         </RL2>
         <emergencyPersonList>
           <numPerson>614059</numPerson>
@@ -212,6 +229,129 @@
             <dateFin>2022-12-31T00:00:00+01:00</dateFin>
             <description>bla bla PAI</description>
           </paiInfoBean>
+          <subscribeActivityList>
+            <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327683</idUnit>
+              <libelle>RESTAURATION SCOLAIRE 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327682</idActivity>
+            <typeActivity>
+              <code>RESTSCOL</code>
+              <libelle>Restauration scolaire</libelle>
+              <natureSpec>
+                <code>R</code>
+                <libelle>Restauration Scolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MIDI 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327687</idUnit>
+              <libelle>CLAE MIDI 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327686</idActivity>
+            <typeActivity>
+              <code>ACCPERI</code>
+              <libelle>Accueil périscolaire</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>CLAE MATIN 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049327690</idUnit>
+              <libelle>CLAE MATIN 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-03-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>DUPONT PIERRE ELEMENTAIRE</place>
+            <planningHebdomadaire>0010011</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049327689</idActivity>
+            <typeActivity>
+              <code>ACCMAT</code>
+              <libelle>Accueil du matin</libelle>
+              <natureSpec>
+                <code>A</code>
+                <libelle>Accueil Périscolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10049354915</idUnit>
+              <libelle>SEMST2 ADL MERC. ELEM Maourine 22/23</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-07-07T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>MAOURINE (la) ELEMENTAIRE</place>
+            <planningHebdomadaire>1101111</planningHebdomadaire>
+            <typeConsum>ENF</typeConsum>
+            <libelleTypeConsum>ENFANT</libelleTypeConsum>
+            <idActivity>A10049354913</idActivity>
+            <typeActivity>
+              <code>EXTMERC</code>
+              <libelle>Mercredi</libelle>
+              <natureSpec>
+                <code>X</code>
+                <libelle>Extrascolaire</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
+          <subscribeActivityList>
+            <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+            <typeIns>1</typeIns>
+            <libelleTypeIns>DEFINITIVE</libelleTypeIns>
+            <subscribesUnit>
+              <idUnit>A10053179800</idUnit>
+              <libelle>ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES</libelle>
+              <bUniStd>true</bUniStd>
+              <dateStart>2023-02-01T00:00:00+01:00</dateStart>
+              <dateEnd>2023-06-30T00:00:00+02:00</dateEnd>
+            </subscribesUnit>
+            <place>ARGOULETS</place>
+            <typeConsum>INS</typeConsum>
+            <libelleTypeConsum>INSCRIT</libelleTypeConsum>
+            <idActivity>A10053179798</idActivity>
+            <typeActivity>
+              <code>25</code>
+              <libelle>ACTIVITE REGULIERE - SPORT</libelle>
+              <natureSpec>
+                <code>8</code>
+                <libelle>SPORT</libelle>
+              </natureSpec>
+            </typeActivity>
+          </subscribeActivityList>
         </childList>
         <childList>
           <num>613987</num>

tests/test_toulouse_maelis.py

@@ -32,6 +32,7 @@ from passerelle.contrib.toulouse_maelis.utils import get_public_criterias, json_
 from passerelle.utils.jsonresponse import APIError
 from passerelle.utils.soap import SOAPError
 from passerelle.utils.templates import render_to_string
+from tests.test_manager import login
 from tests.utils import FakedResponse, ResponsesSoap, generic_endpoint_url, setup_access_rights
 
 TEST_BASE_DIR = os.path.join(os.path.dirname(__file__), 'data', 'toulouse_maelis')
@@ -243,6 +244,63 @@ def con(db):
     return ToulouseMaelis.objects.get()
 
 
+def test_nature_codes(con):
+    assert con.get_perisco_nature_codes() == ['A', 'R']
+    assert con.get_extrasco_nature_codes() == ['X']
+    assert con.get_loisir_nature_codes() == ['P', 'L', 'S', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+
+
+def test_manager(admin_user, app, con):
+    app = login(app)
+    path = '/%s/%s/' % (con.get_connector_slug(), con.slug)
+    resp = app.get(path)
+    assert [
+        x.text
+        for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+        if x.text.startswith('Codes des natures des activités péri-scolaires')
+    ][0].split(':')[1].strip() == 'A,R'
+    assert [
+        x.text
+        for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+        if x.text.startswith('Codes des natures des activités extra-scolaires')
+    ][0].split(':')[1].strip() == 'X'
+    assert (
+        'P,L,S,1,2,3'
+        in [
+            x.text
+            for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+            if x.text.startswith('Codes des natures des activités loisirs')
+        ][0]
+    )
+
+    path = '/manage/%s/%s/edit' % (con.get_connector_slug(), con.slug)
+    resp = app.get(path)
+    resp.form['title'] = 'Malis connector'
+    resp.form['description'] = 'Malis connector'
+    resp.form['perisco_nature_codes'] = 'P,L, O ,P'
+    resp.form['extrasco_nature_codes'] = 'Z'
+    resp.form['loisir_nature_codes'] = ''
+    resp = resp.form.submit()
+    resp = resp.follow()
+    assert [
+        x.text
+        for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+        if x.text.startswith('Codes des natures des activités péri-scolaires')
+    ][0].split(':')[1].strip() == 'P,L, O ,P'
+    assert [
+        x.text
+        for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+        if x.text.startswith('Codes des natures des activités extra-scolaires')
+    ][0].split(':')[1].strip() == 'Z'
+    assert 'Codes des natures des activités loisirs' not in [
+        x.text for x in resp.html.find('div', {'id': 'description'}).find_all('p')
+    ]
+    con = ToulouseMaelis.objects.get()
+    assert con.get_perisco_nature_codes() == ['P', 'L', 'O', 'P']
+    assert con.get_extrasco_nature_codes() == ['Z']
+    assert con.get_loisir_nature_codes() == []
+
+
 @mock.patch('passerelle.utils.Request.get')
 def test_call_with_wrong_wsdl_url(mocked_get, con):
     mocked_get.side_effect = CONNECTION_ERROR
@@ -1224,6 +1282,7 @@ def test_read_family(family_service, xml, con, app):
     del data['paiInfoBean']
     del data['indicatorList']
     del data['indicators']
+    del data['subscribeActivityList']
     assert data == {
         'num': '613880',
         'lastname': 'DOE',
@@ -1251,7 +1310,6 @@ def test_read_family(family_service, xml, con, app):
         'mother': {'num': 613963, 'civility': 'MME', 'firstname': 'JANE', 'lastname': 'DOE'},
         'father': {'num': 613878, 'civility': 'M.', 'firstname': 'JHON', 'lastname': 'DOE'},
         'rl': None,
-        'subscribeActivityList': [],
     }
     if xml != 'R_read_family_relax.xml':
         assert resp.json['data']['childList'][0]['paiInfoBean'] == {
@@ -1363,6 +1421,13 @@ def test_read_family(family_service, xml, con, app):
             'note': None,
         },
     ]
+    assert [x['libelle'] for x in resp.json['data']['childList'][0]['subscribeActivityList']] == [
+        'RESTAURATION SCOLAIRE 22/23',
+        'CLAE MIDI 22/23',
+        'CLAE MATIN 22/23',
+        'SEMST2 ADL MERC. ELEM Maourine 22/23',
+        'ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES',
+    ]
 
 
 def test_read_family_not_linked_error(con, app):
@@ -1531,7 +1596,29 @@ def test_read_rl2(family_service, con, app):
                 'typeDesc': 'NONE',
             },
         },
-        'subscribeActivityList': [],
+        'subscribeActivityList': [
+            {
+                'libelle': 'CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22',
+                'typeIns': '1',
+                'libelleTypeIns': 'DEFINITIVE',
+                'subscribesUnit': [
+                    {
+                        'idUnit': 'A10053179465',
+                        'libelle': 'CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22',
+                        'bUniStd': True,
+                        'dateStart': '2023-03-22T00:00:00+01:00',
+                        'dateEnd': '2023-03-22T00:00:00+01:00',
+                    }
+                ],
+                'place': 'RANGUEIL',
+                'planningHebdomadaire': None,
+                'typeConsum': 'INS',
+                'libelleTypeConsum': 'INSCRIT',
+                'comment': None,
+                'idActivity': 'A10053179463',
+                'typeActivity': None,
+            }
+        ],
     }
 
 
@@ -1553,6 +1640,85 @@ def test_read_rl_not_found(family_service, con, app):
     assert resp.json['err_desc'] == "no '000000' RL on '1312' family"
 
 
+def test_read_subscribe_activity_list(family_service, con, app):
+    family_service.add_soap_response('readFamily', get_xml_file('R_read_family.xml'))
+    url = get_endpoint('read-subscribe-activity-list')
+
+    resp = app.get(url + '?family_id=1312&person_id=613880')
+    assert resp.json['err'] == 0
+    Link.objects.create(resource=con, family_id='1312', name_id='local')
+
+    # RL2
+    resp = app.get(url + '?NameID=local&person_id=613879')
+    assert [(x['id'], x['text']) for x in resp.json['data']] == [
+        ('A10053179463', 'CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22')
+    ]
+
+    # child
+    resp = app.get(url + '?NameID=local&person_id=613880')
+    assert [
+        (x['id'], x['text'], x['typeActivity']['natureSpec']['code'], x['typeActivity']['code'])
+        for x in resp.json['data']
+    ] == [
+        ('A10049327682', 'RESTAURATION SCOLAIRE 22/23', 'R', 'RESTSCOL'),
+        ('A10049327686', 'CLAE MIDI 22/23', 'A', 'ACCPERI'),
+        ('A10049327689', 'CLAE MATIN 22/23', 'A', 'ACCMAT'),
+        ('A10049354913', 'SEMST2 ADL MERC. ELEM Maourine 22/23', 'X', 'EXTMERC'),
+        ('A10053179798', 'ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES', '8', '25'),
+    ]
+
+    resp = app.get(url + '?NameID=local&person_id=613880&nature=PERISCO')
+    assert resp.json['err'] == 0
+    assert [
+        (x['id'], x['text'], x['typeActivity']['natureSpec']['code'], x['typeActivity']['code'])
+        for x in resp.json['data']
+    ] == [
+        ('A10049327682', 'RESTAURATION SCOLAIRE 22/23', 'R', 'RESTSCOL'),
+        ('A10049327686', 'CLAE MIDI 22/23', 'A', 'ACCPERI'),
+        ('A10049327689', 'CLAE MATIN 22/23', 'A', 'ACCMAT'),
+    ]
+
+    resp = app.get(url + '?NameID=local&person_id=613880&nature=EXTRASCO')
+    assert [
+        (x['id'], x['text'], x['typeActivity']['natureSpec']['code'], x['typeActivity']['code'])
+        for x in resp.json['data']
+    ] == [
+        ('A10049354913', 'SEMST2 ADL MERC. ELEM Maourine 22/23', 'X', 'EXTMERC'),
+    ]
+
+    resp = app.get(url + '?NameID=local&person_id=613880&nature=LOISIR')
+    assert [
+        (x['id'], x['text'], x['typeActivity']['natureSpec']['code'], x['typeActivity']['code'])
+        for x in resp.json['data']
+    ] == [
+        ('A10053179798', 'ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES', '8', '25'),
+    ]
+
+    resp = app.get(url + '?NameID=local&person_id=613880&type_ids=ACCMAT')
+    assert resp.json['err'] == 0
+    assert [
+        (x['id'], x['text'], x['typeActivity']['natureSpec']['code'], x['typeActivity']['code'])
+        for x in resp.json['data']
+    ] == [('A10049327689', 'CLAE MATIN 22/23', 'A', 'ACCMAT')]
+
+
+def test_read_subscribe_activity_list_not_linked_error(con, app):
+    url = get_endpoint('read-subscribe-activity-list')
+
+    resp = app.get(url + '?NameID=local&person_id=613880')
+    assert resp.json['err'] == 1
+    assert resp.json['err_desc'] == 'User not linked to family'
+
+
+def test_read_subscribe_activity_list_not_found(family_service, con, app):
+    family_service.add_soap_response('readFamily', get_xml_file('R_read_family.xml'))
+    url = get_endpoint('read-subscribe-activity-list')
+
+    resp = app.get(url + '?family_id=1312&person_id=000000')
+    assert resp.json['err'] == 1
+    assert resp.json['err_desc'] == "no '000000' RL or child on '1312' family"
+
+
 def test_read_person(family_service, con, app):
     family_service.add_soap_response('readFamily', get_xml_file('R_read_family.xml'))
     url = get_endpoint('read-person')
@@ -5084,9 +5250,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
@@ -5126,12 +5293,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
@@ -5188,11 +5357,13 @@ def test_get_person_activity_list(activity_service, con, app):
     )
     url = get_endpoint('get-person-activity-list')
 
+    con.extrasco_nature_codes = 'V'
+    con.save()
     params = {
         'NameID': '',
         'family_id': '311323',
         'person_id': '246423',
-        'nature_id': '',
+        'nature': '',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
         'text_template': '',
@@ -5286,6 +5457,22 @@ def test_get_person_activity_list(activity_service, con, app):
         ('A10053187065', 'Vacances Hivers 2023'),
     ]
 
+    params['type_ids'] = ''
+    params['nature'] = 'LOISIR'
+    resp = app.get(url, params=params)
+    assert resp.json['err'] == 0
+    assert [(x['id'], x['text']) for x in resp.json['data']] == [
+        ('A10051141965', 'Activité modèle'),
+    ]
+
+    params['nature'] = 'EXTRASCO'
+    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')
@@ -5293,7 +5480,7 @@ def test_get_person_activity_list_not_linked_error(con, app):
         'NameID': 'local',
         'family_id': '',
         'person_id': '246423',
-        'nature_id': '',
+        'nature': '',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
         'text_template': '',
@@ -5310,7 +5497,7 @@ def test_get_person_activity_list_date_error(con, app):
         'NameID': '',
         'family_id': '311323',
         'person_id': '246423',
-        'nature_id': '',
+        'nature': '',
         'start_date': 'bad',
         'end_date': '2023-08-31',
         'text_template': '',
@@ -5643,11 +5830,13 @@ def test_get_person_catalog_geojson(activity_service, con, app):
     )
     url = get_endpoint('get-person-catalog-geojson')
 
+    con.extrasco_nature_codes = 'V'
+    con.save()
     params = {
         'NameID': '',
         'family_id': '311323',
         'person_id': '246423',
-        'nature_id': '',
+        'nature': '',
         'start_date': '2022-09-01',
         'end_date': '2023-08-31',
         'activity_id': 'A10053187087',
@@ -5767,6 +5956,19 @@ def test_get_person_catalog_geojson(activity_service, con, app):
     resp = app.get(url, params=params)
     assert len(resp.json['features']) == 0
 
+    params['type_ids'] = ''
+    params['nature'] = 'EXTRASCO'
+    resp = app.get(url, params=params)
+    assert len(resp.json['features']) == 4
+    assert [
+        x['properties']['activity']['activity']['activityType']['natureSpec']['code']
+        for x in resp.json['features']
+    ] == ['V', 'V', 'V', 'V']
+
+    params['nature'] = 'LOISIR'
+    resp = app.get(url, params=params)
+    assert len(resp.json['features']) == 0  # no lon/lat
+
 
 def test_get_person_catalog_geojson_not_linked_error(con, app):
     url = get_endpoint('get-person-catalog-geojson')