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

toulouse-maelis: rename assert functions to check_and_validate (#74749)
gitea/passerelle/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Nicolas Roche 2023-02-22 14:43:08 +01:00
parent eac46f952d
commit da27a33dce
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,7 +409,9 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if obj is False or str(obj).lower() in ['false', 'non', '0']:
return False
def assert_update_indicator_payload_in_referential(self, referential, post_data, parent_keys=None):
def check_and_adapt_update_indicator_payload_in_referential(
self, referential, post_data, parent_keys=None
):
keys = parent_keys or []
data = post_data
for key in keys:
@ -421,7 +423,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
item['isActive'] = self.encode_bool(item['isActive'])
def assert_child_medical_record_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_child_medical_record_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
data = post_data
for key in keys:
@ -434,11 +436,11 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'Vaccin', post_data, keys + ['vaccinList', i, 'code'], required=False
)
def assert_child_pai_payoad_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_child_pai_payoad_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential('PAI', post_data, keys + ['code'])
def assert_child_person_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_child_person_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential(
'Civility', post_data, keys + ['personInfo', 'civility'], required=False
@ -446,7 +448,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
self.assert_post_data_in_referential('Sex', post_data, keys + ['personInfo', 'sexe'], required=False)
self.assert_post_data_in_referential('Quality', post_data, keys + ['personQuality', 'code'])
def assert_child_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_child_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential('Sex', post_data, keys + ['sexe'])
@ -460,19 +462,21 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if 'dietcode' in data:
self.assert_post_data_in_referential('DietCode', post_data, keys + ['dietcode'], required=False)
if 'paiInfoBean' in data:
self.assert_child_pai_payoad_in_referential(post_data, keys + ['paiInfoBean'])
self.check_and_adapt_child_pai_payoad_in_referential(post_data, keys + ['paiInfoBean'])
if 'medicalRecord' in data:
# dead code as updateFamily seems not to modify medicalRecord
self.assert_child_medical_record_payload_in_referential(post_data, keys + ['medicalRecord'])
self.assert_update_indicator_payload_in_referential('ChildIndicator', post_data, keys)
self.check_and_adapt_child_medical_record_payload_in_referential(
post_data, keys + ['medicalRecord']
)
self.check_and_adapt_update_indicator_payload_in_referential('ChildIndicator', post_data, keys)
def assert_person_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_person_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential('Civility', post_data, keys + ['civility'], required=False)
self.assert_post_data_in_referential('Sex', post_data, keys + ['sexe'], required=False)
self.assert_post_data_in_referential('Quality', post_data, keys + ['quality'])
def assert_update_coordinate_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_update_coordinate_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential(
'Street', post_data, keys + ['adresse', 'idStreet'], required=False
@ -497,31 +501,31 @@ class ToulouseMaelis(BaseResource, HTTPResource):
if key in data:
data[key] = self.encode_bool(data[key])
def assert_rl_payload_in_referential(self, post_data, parent_keys=None):
def check_and_adapt_rl_payload_in_referential(self, post_data, parent_keys=None):
keys = parent_keys or []
self.assert_post_data_in_referential('Civility', post_data, keys + ['civility'])
self.assert_post_data_in_referential('Quality', post_data, keys + ['quality'])
self.assert_update_coordinate_payload_in_referential(post_data, keys)
self.assert_update_indicator_payload_in_referential('RLIndicator', post_data, keys)
self.check_and_adapt_update_coordinate_payload_in_referential(post_data, keys)
self.check_and_adapt_update_indicator_payload_in_referential('RLIndicator', post_data, keys)
def assert_create_rl1_payload_in_referential(self, post_data):
def check_and_adapt_create_rl1_payload_in_referential(self, post_data):
self.assert_post_data_in_referential('Category', post_data, ['category'])
self.assert_post_data_in_referential('Situation', post_data, ['situation'])
self.assert_rl_payload_in_referential(post_data, ['rl1'])
self.check_and_adapt_rl_payload_in_referential(post_data, ['rl1'])
def assert_family_payload_in_referential(self, post_data):
def check_and_adapt_family_payload_in_referential(self, post_data):
self.assert_post_data_in_referential('Category', post_data, ['category'])
self.assert_post_data_in_referential('Situation', post_data, ['situation'])
for rlg in 'rl1', 'rl2':
if rlg in post_data:
self.assert_rl_payload_in_referential(post_data, [rlg])
self.check_and_adapt_rl_payload_in_referential(post_data, [rlg])
for i, person in enumerate(post_data.get('emergencyPersonList') or []):
for j in range(0, len(person.get('personList') or [])):
self.assert_person_payload_in_referential(
self.check_and_adapt_person_payload_in_referential(
post_data, ['emergencyPersonList', i, 'personList', j]
)
for i in range(0, len(post_data.get('childList') or [])):
self.assert_child_payload_in_referential(post_data, ['childList', i])
self.check_and_adapt_child_payload_in_referential(post_data, ['childList', i])
if 'flagCom' in post_data:
post_data['flagCom'] = self.encode_bool(post_data['flagCom'])
@ -1144,7 +1148,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
def create_family(self, request, post_data, NameID=None):
if self.link_set.filter(name_id=NameID).exists():
raise APIError('User already linked to family')
self.assert_family_payload_in_referential(post_data)
self.check_and_adapt_family_payload_in_referential(post_data)
response = self.call('Family', 'createFamily', **post_data)
family_id = response.get('number')
@ -1169,7 +1173,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_family(self, request, post_data, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_family_payload_in_referential(post_data)
self.check_and_adapt_family_payload_in_referential(post_data)
self.replace_null_values(post_data)
# adapt payload to use same input as create_family
@ -1195,7 +1199,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
def create_rl1(self, request, post_data, NameID=None):
if self.link_set.filter(name_id=NameID).exists():
raise APIError('User already linked to family')
self.assert_create_rl1_payload_in_referential(post_data)
self.check_and_adapt_create_rl1_payload_in_referential(post_data)
response = self.call('Family', 'createFamily', **post_data)
family_id = response.get('number')
@ -1220,7 +1224,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_rl1(self, request, post_data, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_rl_payload_in_referential(post_data)
self.check_and_adapt_rl_payload_in_referential(post_data)
self.replace_null_values(post_data)
family = self.get_family_raw(family_id)
@ -1252,7 +1256,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def create_rl2(self, request, post_data, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_rl_payload_in_referential(post_data)
self.check_and_adapt_rl_payload_in_referential(post_data)
family = self.get_family_raw(family_id)
if family['RL2']:
raise APIError('RL2 already defined on family')
@ -1283,7 +1287,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_rl2(self, request, post_data, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_rl_payload_in_referential(post_data)
self.check_and_adapt_rl_payload_in_referential(post_data)
self.replace_null_values(post_data)
family = self.get_family_raw(family_id)
if not family['RL2']:
@ -1322,7 +1326,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def create_child(self, request, post_data, NameID=None, family_id=None, force=False):
family_id = family_id or self.get_link(NameID).family_id
self.assert_child_payload_in_referential(post_data)
self.check_and_adapt_child_payload_in_referential(post_data)
payload = {
'numDossier': family_id,
@ -1350,7 +1354,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_child(self, request, post_data, child_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_child_payload_in_referential(post_data)
self.check_and_adapt_child_payload_in_referential(post_data)
self.replace_null_values(post_data)
family = self.get_family_raw(family_id)
@ -1389,7 +1393,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_coordinate(self, request, post_data, rl_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_update_coordinate_payload_in_referential(post_data)
self.check_and_adapt_update_coordinate_payload_in_referential(post_data)
self.replace_null_values(post_data)
self.call('Family', 'updateCoordinate', numDossier=family_id, numPerson=rl_id, **post_data)
@ -1409,7 +1413,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_rl_indicator(self, request, post_data, rl_id, NameID=None, family_id=None):
assert family_id or self.get_link(NameID)
self.assert_update_indicator_payload_in_referential('RLIndicator', post_data)
self.check_and_adapt_update_indicator_payload_in_referential('RLIndicator', post_data)
self.call('Family', 'updatePersonIndicatorList', numPerson=rl_id, **post_data)
return {'data': 'ok'}
@ -1451,7 +1455,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def create_person(self, request, post_data, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_person_payload_in_referential(post_data)
self.check_and_adapt_person_payload_in_referential(post_data)
family = self.get_family_raw(family_id)
personList = family['emergencyPersonList']
@ -1483,7 +1487,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_person(self, request, post_data, person_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_person_payload_in_referential(post_data)
self.check_and_adapt_person_payload_in_referential(post_data)
family = self.get_family_raw(family_id)
personList = family['emergencyPersonList']
@ -1557,7 +1561,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def create_child_person(self, request, post_data, child_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_child_person_payload_in_referential(post_data)
self.check_and_adapt_child_person_payload_in_referential(post_data)
child = self.get_child_raw(family_id, child_id)
personList = child['authorizedPersonList']
@ -1587,7 +1591,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_child_person(self, request, post_data, child_id, person_id, NameID=None, family_id=None):
family_id = family_id or self.get_link(NameID).family_id
self.assert_child_person_payload_in_referential(post_data)
self.check_and_adapt_child_person_payload_in_referential(post_data)
child = self.get_child_raw(family_id, child_id)
personList = child['authorizedPersonList']
@ -1676,7 +1680,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_child_pai(self, request, post_data, child_id, NameID=None, family_id=None):
assert family_id or self.get_link(NameID)
self.assert_child_pai_payoad_in_referential(post_data)
self.check_and_adapt_child_pai_payoad_in_referential(post_data)
# use None to empty date passed as an empty string by date filter
for key in ('dateDeb', 'dateFin'):
@ -1700,7 +1704,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_child_medical_record(self, request, post_data, child_id, NameID=None, family_id=None):
assert family_id or self.get_link(NameID)
self.assert_child_medical_record_payload_in_referential(post_data)
self.check_and_adapt_child_medical_record_payload_in_referential(post_data)
self.replace_null_values(post_data)
payload = {
@ -1724,7 +1728,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
def update_child_indicator(self, request, post_data, child_id, NameID=None, family_id=None):
assert family_id or self.get_link(NameID)
self.assert_update_indicator_payload_in_referential('ChildIndicator', post_data)
self.check_and_adapt_update_indicator_payload_in_referential('ChildIndicator', post_data)
self.call('Family', 'updatePersonIndicatorList', numPerson=child_id, **post_data)
return {'data': 'ok'}