diff --git a/tests/data/toulouse_maelis/R_read_family.xml b/tests/data/toulouse_maelis/R_read_family.xml index f63f1ee1..2dc17ad8 100644 --- a/tests/data/toulouse_maelis/R_read_family.xml +++ b/tests/data/toulouse_maelis/R_read_family.xml @@ -99,6 +99,23 @@ 789 A10007752822 + + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + 1 + DEFINITIVE + + A10053179465 + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + true + 2023-03-22T00:00:00+01:00 + 2023-03-22T00:00:00+01:00 + + RANGUEIL + INS + INSCRIT + A10053179463 + + 614059 @@ -212,6 +229,129 @@ 2022-12-31T00:00:00+01:00 bla bla PAI + + RESTAURATION SCOLAIRE 22/23 + 1 + DEFINITIVE + + A10049327683 + RESTAURATION SCOLAIRE 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327682 + + RESTSCOL + Restauration scolaire + + R + Restauration Scolaire + + + + + CLAE MIDI 22/23 + 1 + DEFINITIVE + + A10049327687 + CLAE MIDI 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + 0010011 + ENF + ENFANT + A10049327686 + + ACCPERI + Accueil périscolaire + + A + Accueil Périscolaire + + + + + CLAE MATIN 22/23 + 1 + DEFINITIVE + + A10049327690 + CLAE MATIN 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327689 + + ACCMAT + Accueil du matin + + A + Accueil Périscolaire + + + + + SEMST2 ADL MERC. ELEM Maourine 22/23 + 1 + DEFINITIVE + + A10049354915 + SEMST2 ADL MERC. ELEM Maourine 22/23 + true + 2023-02-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + MAOURINE (la) ELEMENTAIRE + 1101111 + ENF + ENFANT + A10049354913 + + EXTMERC + Mercredi + + X + Extrascolaire + + + + + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + 1 + DEFINITIVE + + A10053179800 + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + true + 2023-02-01T00:00:00+01:00 + 2023-06-30T00:00:00+02:00 + + ARGOULETS + INS + INSCRIT + A10053179798 + + 25 + ACTIVITE REGULIERE - SPORT + + 8 + SPORT + + + 613987 diff --git a/tests/data/toulouse_maelis/R_read_family_relax.xml b/tests/data/toulouse_maelis/R_read_family_relax.xml index 2eeb2067..eb547e23 100644 --- a/tests/data/toulouse_maelis/R_read_family_relax.xml +++ b/tests/data/toulouse_maelis/R_read_family_relax.xml @@ -99,6 +99,23 @@ 789 A10007752822 + + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + 1 + DEFINITIVE + + A10053179465 + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + true + 2023-03-22T00:00:00+01:00 + 2023-03-22T00:00:00+01:00 + + RANGUEIL + INS + INSCRIT + A10053179463 + + 614059 @@ -211,6 +228,129 @@ 2022-12-31T00:00:00+01:00 bla bla PAI + + RESTAURATION SCOLAIRE 22/23 + 1 + DEFINITIVE + + A10049327683 + RESTAURATION SCOLAIRE 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327682 + + RESTSCOL + Restauration scolaire + + R + Restauration Scolaire + + + + + CLAE MIDI 22/23 + 1 + DEFINITIVE + + A10049327687 + CLAE MIDI 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + 0010011 + ENF + ENFANT + A10049327686 + + ACCPERI + Accueil périscolaire + + A + Accueil Périscolaire + + + + + CLAE MATIN 22/23 + 1 + DEFINITIVE + + A10049327690 + CLAE MATIN 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327689 + + ACCMAT + Accueil du matin + + A + Accueil Périscolaire + + + + + SEMST2 ADL MERC. ELEM Maourine 22/23 + 1 + DEFINITIVE + + A10049354915 + SEMST2 ADL MERC. ELEM Maourine 22/23 + true + 2023-02-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + MAOURINE (la) ELEMENTAIRE + 1101111 + ENF + ENFANT + A10049354913 + + EXTMERC + Mercredi + + X + Extrascolaire + + + + + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + 1 + DEFINITIVE + + A10053179800 + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + true + 2023-02-01T00:00:00+01:00 + 2023-06-30T00:00:00+02:00 + + ARGOULETS + INS + INSCRIT + A10053179798 + + 25 + ACTIVITE REGULIERE - SPORT + + 8 + SPORT + + + 613987 diff --git a/tests/data/toulouse_maelis/R_read_family_reordered.xml b/tests/data/toulouse_maelis/R_read_family_reordered.xml index 3cc3b9d3..cd000e86 100644 --- a/tests/data/toulouse_maelis/R_read_family_reordered.xml +++ b/tests/data/toulouse_maelis/R_read_family_reordered.xml @@ -99,6 +99,23 @@ 789 A10007752822 + + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + 1 + DEFINITIVE + + A10053179465 + CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22 + true + 2023-03-22T00:00:00+01:00 + 2023-03-22T00:00:00+01:00 + + RANGUEIL + INS + INSCRIT + A10053179463 + + 614059 @@ -212,6 +229,129 @@ 2022-12-31T00:00:00+01:00 bla bla PAI + + RESTAURATION SCOLAIRE 22/23 + 1 + DEFINITIVE + + A10049327683 + RESTAURATION SCOLAIRE 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327682 + + RESTSCOL + Restauration scolaire + + R + Restauration Scolaire + + + + + CLAE MIDI 22/23 + 1 + DEFINITIVE + + A10049327687 + CLAE MIDI 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + 0010011 + ENF + ENFANT + A10049327686 + + ACCPERI + Accueil périscolaire + + A + Accueil Périscolaire + + + + + CLAE MATIN 22/23 + 1 + DEFINITIVE + + A10049327690 + CLAE MATIN 22/23 + true + 2023-03-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + DUPONT PIERRE ELEMENTAIRE + 0010011 + ENF + ENFANT + A10049327689 + + ACCMAT + Accueil du matin + + A + Accueil Périscolaire + + + + + SEMST2 ADL MERC. ELEM Maourine 22/23 + 1 + DEFINITIVE + + A10049354915 + SEMST2 ADL MERC. ELEM Maourine 22/23 + true + 2023-02-01T00:00:00+01:00 + 2023-07-07T00:00:00+02:00 + + MAOURINE (la) ELEMENTAIRE + 1101111 + ENF + ENFANT + A10049354913 + + EXTMERC + Mercredi + + X + Extrascolaire + + + + + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + 1 + DEFINITIVE + + A10053179800 + ECOLE DES SPORTS 22/23 SEMESTRE 2 - MULTIACTIVITES + true + 2023-02-01T00:00:00+01:00 + 2023-06-30T00:00:00+02:00 + + ARGOULETS + INS + INSCRIT + A10053179798 + + 25 + ACTIVITE REGULIERE - SPORT + + 8 + SPORT + + + 613987 diff --git a/tests/test_toulouse_maelis.py b/tests/test_toulouse_maelis.py index 637e014e..21fea5d1 100644 --- a/tests/test_toulouse_maelis.py +++ b/tests/test_toulouse_maelis.py @@ -1240,6 +1240,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', @@ -1267,7 +1268,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'] == { @@ -1379,6 +1379,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): @@ -1521,7 +1528,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, + } + ], }