0001-toulouse-maelis-return-family-id-on-read-family-memb.patch

Nicolas Roche, 14 décembre 2022 13:31

Voir les différences: en ligne côte à côte

Subject: [PATCH] toulouse-maelis: return family id on read family members
 endpoints (#72399)

 functests/toulouse_maelis/conftest.py                      | 1 +
 functests/toulouse_maelis/data/test_create_family.json     | 3 ++-
 functests/toulouse_maelis/data/test_update_family.json     | 3 ++-
 functests/toulouse_maelis/data/test_update_family_ras.json | 3 ++-
 passerelle/contrib/toulouse_maelis/models.py               | 5 +++++
 tests/test_toulouse_maelis.py                              | 2 ++
 6 files changed, 14 insertions(+), 3 deletions(-)

     def remove_id_on_rlg(rlg):
         if rlg:
             rlg['num'] = 'N/A'
             rlg['lastname'] = 'N/A'
     def remove_id_on_family(family):
         family['number'] = 'N/A'
         family['family_id'] = 'N/A'
         remove_id_on_rlg(family['RL1'])
         remove_id_on_rlg(family['RL2'])
         for child in family['childList']:
             remove_id_on_child(child)
         for person in family['emergencyPersonList']:
             person['numPerson'] = 'N/A'

           "civility_text": "Madame",
           "quality_text": "ORGANISME SOCIAL",
           "sexe_text": "F\u00e9minin"
+        }
       ],
       "indicatorList": [],
       "childErrorList": [],
       "category_text": "BIPARENTALE",
       "situation_text": "Vivant maritalement"
       "situation_text": "Vivant maritalement",
       "family_id": "N/A"
+    }

           "civility_text": "Madame",
           "quality_text": "ORGANISME SOCIAL",
           "sexe_text": "F\u00e9minin"
+        }
       ],
       "indicatorList": [],
       "childErrorList": [],
       "category_text": "BIPARENTALE",
       "situation_text": "Vivant maritalement"
       "situation_text": "Vivant maritalement",
       "family_id": "N/A"
+    }

           "contact": null,
           "quality_text": "AUTRE",
           "sexe_text": "Masculin"
+        }
       ],
       "indicatorList": [],
       "childErrorList": [],
       "category_text": "MONOPARENTALE",
       "situation_text": "UNION LIBRE"
       "situation_text": "UNION LIBRE",
       "family_id": "N/A"
+    }

             parameters={
                 'NameID': {'description': 'Publik NameID'},
                 'income_year': {'description': 'Année de revenu pour filtrer les quotients'},
             },
+        )
         def read_family(self, request, NameID, income_year=None):
             family_id = self.get_link(NameID).family_id
             data = self.get_family(family_id, incomeYear=income_year)
             data['family_id'] = family_id
             return {'data': data}
         @endpoint(
             display_category='Famille',
             description="Informations sur un responsable légal",
             perm='can_access',
             name='read-rl',
             parameters={
                 'NameID': {'description': 'Publik NameID'},
                 'rl_id': {'description': 'Numéro du représentant légal'},
                 'income_year': {'description': 'Année de revenu pour filtrer les quotients'},
             },
+        )
         def read_rl(self, request, NameID, rl_id, income_year=None):
             family_id = self.get_link(NameID).family_id
             data = self.get_rl(family_id, rl_id, incomeYear=income_year)
             data['family_id'] = family_id
             return {'data': data}
         @endpoint(
             display_category='Famille',
             description="Informations sur une personne autorisée à récupérer les enfants ou à prévenir en cas d'urgence",
             perm='can_access',
             name='read-person',
             parameters={
                 'NameID': {'description': 'Publik NameID'},
                 'person_id': {'description': 'Numéro de la personne'},
             },
+        )
         def read_person(self, request, NameID, person_id):
             family_id = self.get_link(NameID).family_id
             data = self.get_person(family_id, person_id)
             data['family_id'] = family_id
             return {'data': data}
         @endpoint(
             display_category='Famille',
             description="Informations sur un enfant",
             perm='can_access',
             name='read-child',
             parameters={
                 'NameID': {'description': 'Publik NameID'},
                 'child_id': {'description': "Numéro de l'enfant"},
             },
+        )
         def read_child(self, request, NameID, child_id):
             family_id = self.get_link(NameID).family_id
             data = self.get_child(family_id, child_id)
             data['family_id'] = family_id
             return {'data': data}
         @endpoint(
             display_category='Famille',
             description="Informations sur une personne autorisée à récupérer l'enfant",
             perm='can_access',
             name='read-child-person',
             parameters={
                 'NameID': {'description': 'Publik NameID'},
                 'child_id': {'description': "Numéro de l'enfant"},
                 'person_id': {'description': 'Numéro de la personne'},
             },
+        )
         def read_child_person(self, request, NameID, child_id, person_id):
             family_id = self.get_link(NameID).family_id
             data = self.get_child_person(family_id, child_id, person_id)
             data['family_id'] = family_id
             return {'data': data}
         @endpoint(
             display_category='Famille',
             description="Vérifier qu'un responsable légal existe en base",
             perm='can_access',
             name='is-rl-exists',
             post={'request_body': {'schema': {'application/json': schemas.ISEXISTS_SCHEMA}}},

         resp = app.get(url + '?NameID=local')
         assert resp.json['err'] == 0
         data = resp.json['data']
         del data['RL1']
         del data['RL2']
         del data['childList']
         del data['emergencyPersonList']
         assert data == {
             'family_id': '1312',
             'number': 1312,
             'category': 'BI',
             'situation': 'M',
             'flagCom': True,
             'nbChild': 2,
             'nbTotalChild': None,
             'nbAES': None,
             'quotientList': [],
-...
     def test_read_rl2(family_service, con, app):
         family_service.add_soap_response('readFamily', get_xml_file('R_read_family.xml'))
         url = get_endpoint('read-rl')
         Link.objects.create(resource=con, family_id='1312', name_id='local')
         resp = app.get(url + '?NameID=local&rl_id=613879')
         assert resp.json['err'] == 0
         assert resp.json['data'] == {
             'family_id': '1312',
             'num': '613879',
             'lastname': 'DOE',
             'firstname': 'JANE',
             'maidenName': 'SMITH',
             'quality': 'MERE',
             'civility': 'MME',
             'birth': {
                 'communeCode': None,
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-toulouse-maelis-return-family-id-on-read-family-memb.patch