entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 16 Releases Activity

toulouse-maelis: rename category field (#71641)

This commit is contained in:
Nicolas Roche 2022-11-18 14:05:28 +01:00
parent da33488040
commit 2d34e5b032
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
passerelle/contrib/toulouse_maelis/models.py
View File

@ -319,12 +319,12 @@ class ToulouseMaelis(BaseResource, HTTPResource):
self.assert_update_coordinate_payload_in_referential(post_data, keys) self.assert_update_coordinate_payload_in_referential(post_data, keys)
def assert_create_rl1_payload_in_referential(self, post_data): def assert_create_rl1_payload_in_referential(self, post_data):
self.assert_post_data_in_referential('Category', post_data, ['categorie']) self.assert_post_data_in_referential('Category', post_data, ['category'])
self.assert_post_data_in_referential('Situation', post_data, ['situation']) self.assert_post_data_in_referential('Situation', post_data, ['situation'])
self.assert_rl_payload_in_referential(post_data, ['rl1']) self.assert_rl_payload_in_referential(post_data, ['rl1'])
def assert_family_payload_in_referential(self, post_data): def assert_family_payload_in_referential(self, post_data):
self.assert_post_data_in_referential('Category', post_data, ['categorie']) self.assert_post_data_in_referential('Category', post_data, ['category'])
self.assert_post_data_in_referential('Situation', post_data, ['situation']) self.assert_post_data_in_referential('Situation', post_data, ['situation'])
for rlg in 'rl1', 'rl2': for rlg in 'rl1', 'rl2':
if rlg in post_data: if rlg in post_data:
@ -679,7 +679,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
rl1['adresse'] = family['RL1']['adresse'] rl1['adresse'] = family['RL1']['adresse']
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -707,7 +707,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -739,7 +739,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
rl2['adresse'] = family['RL2']['adresse'] rl2['adresse'] = family['RL2']['adresse']
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -805,7 +805,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
child['num'] = child_id child['num'] = child_id
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -854,7 +854,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
personList.append(post_data) personList.append(post_data)
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -893,7 +893,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
) )
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],
@ -930,7 +930,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
) )
payload = { payload = {
'dossierNumber': family_id, 'dossierNumber': family_id,
'categorie': family['category'], 'category': family['category'],
'situation': family['situation'], 'situation': family['situation'],
'flagCom': family['flagCom'], 'flagCom': family['flagCom'],
'nbChild': family['nbChild'], 'nbChild': family['nbChild'],

8
passerelle/contrib/toulouse_maelis/schemas.py
View File

@ -470,10 +470,10 @@ UPDATE_FAMILY_SCHEMA = {
'title': 'Family', 'title': 'Family',
'description': 'Informations pour créer ou mettre à jour une famille', 'description': 'Informations pour créer ou mettre à jour une famille',
'type': 'object', 'type': 'object',
'required': ['categorie', 'situation'], 'required': ['category', 'situation'],
'properties': { 'properties': {
'categorie': { 'category': {
'description': 'Categorie (depuis référentiel)', 'description': 'Catégorie (depuis référentiel)',
'type': 'string', 'type': 'string',
'pattern': '.+', 'pattern': '.+',
}, },
@ -524,7 +524,7 @@ UPDATE_FAMILY_SCHEMA = {
} }
CREATE_FAMILY_SCHEMA = copy.deepcopy(UPDATE_FAMILY_SCHEMA) CREATE_FAMILY_SCHEMA = copy.deepcopy(UPDATE_FAMILY_SCHEMA)
CREATE_FAMILY_SCHEMA['required'] = ['rl1', 'categorie', 'situation'] CREATE_FAMILY_SCHEMA['required'] = ['rl1', 'category', 'situation']
create_family_child_schema = CREATE_FAMILY_SCHEMA['properties']['childList']['oneOf'][0]['items'] create_family_child_schema = CREATE_FAMILY_SCHEMA['properties']['childList']['oneOf'][0]['items']
del create_family_child_schema['properties']['bPhoto'] del create_family_child_schema['properties']['bPhoto']
del create_family_child_schema['properties']['bLeaveAlone'] del create_family_child_schema['properties']['bLeaveAlone']

6
tests/data/toulouse_maelis/Q_create_family.xml
View File

@ -10,7 +10,7 @@
</soap-env:Header> </soap-env:Header>
<soap-env:Body> <soap-env:Body>
<ns0:createFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:createFamily xmlns:ns0="family.ws.maelis.sigec.com">
<categorie>ACCEUI</categorie> <category>ACCEUI</category>
<situation>C</situation> <situation>C</situation>
<rl1> <rl1>
<lastname>Doe</lastname> <lastname>Doe</lastname>
@ -32,9 +32,9 @@
</CAFInfo> </CAFInfo>
</rl1> </rl1>
<childList> <childList>
<sexe>M</sexe>
<lastname>Zimmerman</lastname>
<firstname>Robert</firstname> <firstname>Robert</firstname>
<lastname>Zimmerman</lastname>
<sexe>M</sexe>
<dateBirth>1941-05-24</dateBirth> <dateBirth>1941-05-24</dateBirth>
<dietcode>RSV</dietcode> <dietcode>RSV</dietcode>
<medicalRecord> <medicalRecord>

2
tests/data/toulouse_maelis/Q_create_person.xml
View File

@ -11,7 +11,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_create_rl1.xml
View File

@ -10,7 +10,7 @@
</soap-env:Header> </soap-env:Header>
<soap-env:Body> <soap-env:Body>
<ns0:createFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:createFamily xmlns:ns0="family.ws.maelis.sigec.com">
<categorie>ACCEUI</categorie> <category>ACCEUI</category>
<situation>C</situation> <situation>C</situation>
<rl1> <rl1>
<lastname>Doe</lastname> <lastname>Doe</lastname>

2
tests/data/toulouse_maelis/Q_create_rl2.xml
View File

@ -10,7 +10,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_delete_person.xml
View File

@ -11,7 +11,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_update_child.xml
View File

@ -10,7 +10,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_update_family.xml
View File

@ -11,7 +11,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>C</situation> <situation>C</situation>
<rl1> <rl1>
<lastname>Doe</lastname> <lastname>Doe</lastname>

2
tests/data/toulouse_maelis/Q_update_person.xml
View File

@ -11,7 +11,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_update_rl1.xml
View File

@ -11,7 +11,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

2
tests/data/toulouse_maelis/Q_update_rl2.xml
View File

@ -10,7 +10,7 @@
<soap-env:Body> <soap-env:Body>
<ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com"> <ns0:updateFamily xmlns:ns0="family.ws.maelis.sigec.com">
<dossierNumber>1312</dossierNumber> <dossierNumber>1312</dossierNumber>
<categorie>BI</categorie> <category>BI</category>
<situation>M</situation> <situation>M</situation>
<flagCom>true</flagCom> <flagCom>true</flagCom>
<nbChild>2</nbChild> <nbChild>2</nbChild>

34
tests/test_toulouse_maelis.py
View File

@ -1027,7 +1027,7 @@ def test_create_family(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('create-family') url = get_endpoint('create-family')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1063,8 +1063,8 @@ def test_create_family(mocked_post, mocked_get, con, app):
def test_create_family_empty_referential_key_error(con, app): def test_create_family_empty_referential_key_error(con, app):
url = get_endpoint('create-family') url = get_endpoint('create-family')
params = { params = {
'categorie': '', 'category': '',
'situation': '', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
'rl1/lastname': 'Doe', 'rl1/lastname': 'Doe',
@ -1077,13 +1077,13 @@ def test_create_family_empty_referential_key_error(con, app):
resp = app.post_json(url + '?NameID=local', params=params, status=400) resp = app.post_json(url + '?NameID=local', params=params, status=400)
assert resp.json['err'] == 1 assert resp.json['err'] == 1
assert resp.json['err_desc'] == "categorie: '' does not match '.+'" assert resp.json['err_desc'] == "category: '' does not match '.+'"
def test_create_family_already_linked_error(con, app): def test_create_family_already_linked_error(con, app):
url = get_endpoint('create-family') url = get_endpoint('create-family')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1114,7 +1114,7 @@ def test_create_family_maelis_error(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('create-family') url = get_endpoint('create-family')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1147,7 +1147,7 @@ def test_create_family_wrong_referential_key_error(mocked_post, mocked_get, con,
] ]
url = get_endpoint('create-family') url = get_endpoint('create-family')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1194,7 +1194,7 @@ def test_update_family(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('update-family') url = get_endpoint('update-family')
params = { params = {
'categorie': 'BI', 'category': 'BI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1234,7 +1234,7 @@ def test_update_family(mocked_post, mocked_get, con, app):
def test_update_family_not_linked_error(con, app): def test_update_family_not_linked_error(con, app):
url = get_endpoint('update-family') url = get_endpoint('update-family')
params = { params = {
'categorie': 'BI', 'category': 'BI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1262,7 +1262,7 @@ def test_update_family_maelis_error(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('update-family') url = get_endpoint('update-family')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'childList/0/lastname': 'Zimmerman', 'childList/0/lastname': 'Zimmerman',
'childList/0/firstname': 'Robert', 'childList/0/firstname': 'Robert',
@ -1285,7 +1285,7 @@ def test_update_family_soap_error(mocked_post, mocked_get, con, app):
url = get_endpoint('update-family') url = get_endpoint('update-family')
params = { params = {
'nbChild': '100', 'nbChild': '100',
'categorie': 'BI', 'category': 'BI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1320,7 +1320,7 @@ def test_update_family_wrong_referential_key_error(mocked_post, mocked_get, con,
] ]
url = get_endpoint('update-family') url = get_endpoint('update-family')
params = { params = {
'categorie': 'BI', 'category': 'BI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1371,7 +1371,7 @@ def test_create_rl1(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('create-rl1') url = get_endpoint('create-rl1')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1393,7 +1393,7 @@ def test_create_rl1(mocked_post, mocked_get, con, app):
def test_create_rl1_empty_referential_key_error(con, app): def test_create_rl1_empty_referential_key_error(con, app):
url = get_endpoint('create-rl1') url = get_endpoint('create-rl1')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': '', 'rl1/civility': '',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1413,7 +1413,7 @@ def test_create_rl1_empty_referential_key_error(con, app):
def test_create_rl1_already_linked_error(con, app): def test_create_rl1_already_linked_error(con, app):
url = get_endpoint('create-rl1') url = get_endpoint('create-rl1')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1438,7 +1438,7 @@ def test_create_rl1_wrong_referential_key_error(mocked_post, mocked_get, con, ap
mocked_post.side_effect = [READ_CATEGORIES, READ_SITUATIONS, READ_CIVILITIES, READ_QUALITIES] mocked_post.side_effect = [READ_CATEGORIES, READ_SITUATIONS, READ_CIVILITIES, READ_QUALITIES]
url = get_endpoint('create-rl1') url = get_endpoint('create-rl1')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',
@ -1472,7 +1472,7 @@ def test_create_rl1_maelis_error(mocked_post, mocked_get, con, app):
] ]
url = get_endpoint('create-rl1') url = get_endpoint('create-rl1')
params = { params = {
'categorie': 'ACCEUI', 'category': 'ACCEUI',
'situation': 'C', 'situation': 'C',
'rl1/civility': 'M.', 'rl1/civility': 'M.',
'rl1/firstname': 'Jhon', 'rl1/firstname': 'Jhon',