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

toulouse-maelis: ajouter le département aux informations de naissances #209

Merged
nroche merged 8 commits from wip/76608-parsifal-birth-county into main 2023-04-17 17:28:51 +02:00
Conversation 0 Commits 8 Files Changed 19 +28 -3
5 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56d14bd440 - Show all commits

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

@ -409,6 +409,11 @@ class ToulouseMaelis(BaseResource, HTTPResource):
subscribe_natures[school_year].add(activity_nature['code'])
data['subscribe_natures'] = {x: sorted(list(y)) for x, y in subscribe_natures.items()}
def add_text_value_to_birth(self, data):
self.add_text_value('Town', data, ['birth', 'communeCode'])
self.add_text_value('County', data, ['birth', 'cdDepartment'])
self.add_text_value('Country', data, ['birth', 'countryCode'])
def add_text_value_to_rl_indicator(self, data):
self.add_text_value('RLIndicator', data, ['code'])
@ -434,6 +439,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
city = CityModel.objects.filter(code=data['birth']['communeCode']).first()
if city:
data['birth']['zipCode'] = city.zipcode
self.add_text_value_to_birth(data)
def add_text_value_to_person(self, data):
self.add_text_value('Civility', data, ['civility'])
@ -458,6 +464,7 @@ class ToulouseMaelis(BaseResource, HTTPResource):
city = CityModel.objects.filter(code=data['birth']['communeCode']).first()
if city:
data['birth']['zipCode'] = city.zipcode
self.add_text_value_to_birth(data)
def add_text_value_to_family(self, data):
self.add_text_value('Category', data, ['category'])

3
tests/data/toulouse_maelis/R_read_family.xml
View File

@ -17,6 +17,7 @@
<dateBirth>1938-07-26T00:00:00+01:00</dateBirth>
<place>Rabbat</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99350</countryCode>
</birth>
<adresse>
@ -72,6 +73,7 @@
<dateBirth>1940-06-22T00:00:00+02:00</dateBirth>
<place>Bardot</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99351</countryCode>
</birth>
<adresse>
@ -140,6 +142,7 @@
<dateBirth>1943-01-19T00:00:00+01:00</dateBirth>
<place>Saint-louis</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99100</countryCode>
</birth>
<dietcode>RSV</dietcode>

3
tests/data/toulouse_maelis/R_read_family_relax.xml
View File

@ -17,6 +17,7 @@
<dateBirth>1938-07-26T00:00:00+01:00</dateBirth>
<place>Rabbat</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99350</countryCode>
</birth>
<adresse>
@ -72,6 +73,7 @@
<dateBirth>1940-06-22T00:00:00+02:00</dateBirth>
<place>Bardot</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99351</countryCode>
</birth>
<adresse>
@ -140,6 +142,7 @@
<dateBirth>1943-01-19T00:00:00+01:00</dateBirth>
<place>Saint-louis</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99100</countryCode>
</birth>
<dietcode>RSV</dietcode>

3
tests/data/toulouse_maelis/R_read_family_reordered.xml
View File

@ -17,6 +17,7 @@
<dateBirth>1938-07-26T00:00:00+01:00</dateBirth>
<place>Rabbat</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99350</countryCode>
</birth>
<adresse>
@ -72,6 +73,7 @@
<dateBirth>1940-06-22T00:00:00+02:00</dateBirth>
<place>Bardot</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99351</countryCode>
</birth>
<adresse>
@ -140,6 +142,7 @@
<dateBirth>1943-01-19T00:00:00+01:00</dateBirth>
<place>Saint-louis</place>
<communeCode>91122</communeCode>
<cdDepartment>91</cdDepartment>
<countryCode>99100</countryCode>
</birth>
<dietcode>RSV</dietcode>

15
tests/test_toulouse_maelis.py
View File

@ -1394,11 +1394,14 @@ def test_read_family(family_service, xml, con, app):
'quality': 'PERE',
'civility': 'M.',
'birth': {
'cdDepartment': None,
'cdDepartment': '91',
'communeCode': '91122',
'countryCode': '99350',
'dateBirth': '1938-07-26T00:00:00+01:00',
'place': 'Rabbat',
'cdDepartment_text': 'ESSONNE',
'communeCode_text': 'BURES-SUR-YVETTE',
'countryCode_text': 'MAROC',
},
'adresse': {
'idStreet': 'AM0330',
@ -1510,11 +1513,14 @@ def test_read_family(family_service, xml, con, app):
'sexe': 'F',
'sexe_text': 'Féminin',
'birth': {
'cdDepartment': None,
'cdDepartment': '91',
'dateBirth': '1943-01-19T00:00:00+01:00',
'place': 'Saint-louis',
'communeCode': '91122',
'countryCode': '99100',
'cdDepartment_text': 'ESSONNE',
'communeCode_text': 'BURES-SUR-YVETTE',
'countryCode_text': 'FRANCE',
},
'dietcode': 'RSV',
'dietcode_text': '3- RÉGIME SANS VIANDE',
@ -1760,11 +1766,14 @@ def test_read_rl2(family_service, con, app):
'quality': 'MERE',
'civility': 'MME',
'birth': {
'cdDepartment': None,
'cdDepartment': '91',
'communeCode': '91122',
'countryCode': '99351',
'dateBirth': '1940-06-22T00:00:00+02:00',
'place': 'Bardot',
'cdDepartment_text': 'ESSONNE',
'communeCode_text': 'BURES-SUR-YVETTE',
'countryCode_text': 'TUNISIE',
},
'adresse': {
'idStreet': None,