toulouse-maelis: manage new fields on medical record (#71642)

passerelle/contrib/toulouse_maelis/schemas.py

@@ -342,6 +342,38 @@ MEDICALRECORD_SCHEMA = {
             'type': 'object',
             'properties': {
                 'familyDoctor': FAMILYDOCTOR_SCHEMA,
+                'allergy1': {
+                    'description': 'Allergie 1',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'allergy2': {
+                    'description': 'Allergie 2',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'comment1': {
+                    'description': 'Commentaire 1',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'comment2': {
+                    'description': 'Commentaire 2',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'observ1': {
+                    'description': 'Observation 1',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'observ2': {
+                    'description': 'Observation 2',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
+                'isAuthHospital': {
+                    'description': "Autorisation d'hospitalisation",
+                    'oneOf': BOOLEAN_TYPES,
+                },
+                'hospital': {
+                    'description': 'Hopital',
+                    'oneOf': [{'type': 'string'}, {'type': 'null'}],
+                },
                 'vaccinList': {
                     'oneOf': [
                         {

tests/data/toulouse_maelis/Q_update_child_medical_record.xml

@@ -21,6 +21,14 @@
               <town>Compton</town>
             </address>
           </familyDoctor>
+          <allergy1>butterscotch, imitation butterscotch, glow-in-the-dark monster make-up, and shrimp</allergy1>
+          <allergy2>cauliflower</allergy2>
+          <comment1>the shrimp allergy isn't fully identified</comment1>
+          <comment2/>
+          <observ1>Ay Caramba!</observ1>
+          <observ2/>
+          <isAuthHospital>true</isAuthHospital>
+          <hospital>Springfield General Hospital</hospital>
           <vaccinList>
             <code>DTC</code>
             <vaccinationDate>2011-01-11</vaccinationDate>

tests/data/toulouse_maelis/R_read_family.xml

@@ -130,6 +130,13 @@
                 <town>Compton</town>
               </address>
             </familyDoctor>
+            <allergy1>butterscotch, imitation butterscotch, glow-in-the-dark monster make-up</allergy1>
+            <allergy2>shrimp and cauliflower</allergy2>
+            <comment1>the shrimp allergy isn't fully identified</comment1>
+            <observ1>Ay Caramba!</observ1>
+            <observ2>Eat my shorts!</observ2>
+            <isAuthHospital>true</isAuthHospital>
+            <hospital>Springfield General Hospital</hospital>
             <vaccinList>
               <code>ROR</code>
               <label>ROUGEOLE-OREILLONS-RUBEOLE</label>

tests/data/toulouse_maelis/R_read_family_relax.xml

@@ -128,6 +128,13 @@
                 <town>Compton</town>
               </address>
             </familyDoctor>
+            <allergy1>butterscotch, imitation butterscotch, glow-in-the-dark monster make-up</allergy1>
+            <allergy2>shrimp and cauliflower</allergy2>
+            <comment1>the shrimp allergy isn't fully identified</comment1>
+            <observ1>Ay Caramba!</observ1>
+            <observ2>Eat my shorts!</observ2>
+            <isAuthHospital>true</isAuthHospital>
+            <hospital>Springfield General Hospital</hospital>
             <vaccinList>
               <code>ROR</code>
               <label>ROUGEOLE-OREILLONS-RUBEOLE</label>

tests/data/toulouse_maelis/R_read_family_reordered.xml

@@ -129,6 +129,13 @@
                 <town>Compton</town>
               </address>
             </familyDoctor>
+            <allergy1>butterscotch, imitation butterscotch, glow-in-the-dark monster make-up</allergy1>
+            <allergy2>shrimp and cauliflower</allergy2>
+            <comment1>the shrimp allergy isn't fully identified</comment1>
+            <observ1>Ay Caramba!</observ1>
+            <observ2>Eat my shorts!</observ2>
+            <isAuthHospital>true</isAuthHospital>
+            <hospital>Springfield General Hospital</hospital>
             <vaccinList>
               <code>ROR</code>
               <label>ROUGEOLE-OREILLONS-RUBEOLE</label>

tests/test_toulouse_maelis.py

@@ -666,14 +666,14 @@ def test_read_family(mocked_post, mocked_get, read_family, con, app):
             "phone": "0612341234",
             "address": {"street1": "Alameda", "zipcode": "90220", "town": "Compton"},
         },
-        'allergy1': None,
-        'allergy2': None,
-        'comment1': None,
+        'allergy1': 'butterscotch, imitation butterscotch, glow-in-the-dark monster make-up',
+        'allergy2': 'shrimp and cauliflower',
+        'comment1': "the shrimp allergy isn't fully identified",
         'comment2': None,
-        'hospital': None,
-        'isAuthHospital': None,
-        'observ1': None,
-        'observ2': None,
+        'observ1': 'Ay Caramba!',
+        'observ2': 'Eat my shorts!',
+        'isAuthHospital': True,
+        'hospital': 'Springfield General Hospital',
         "vaccinList": [
             {
                 "code": "ROR",
@@ -2701,6 +2701,14 @@ def test_update_child_medical_record(mocked_post, mocked_get, con, app):
         'familyDoctor/address/street1': 'Alameda',
         'familyDoctor/address/zipcode': '90220',
         'familyDoctor/address/town': 'Compton',
+        'allergy1': 'butterscotch, imitation butterscotch, glow-in-the-dark monster make-up, and shrimp',
+        'allergy2': 'cauliflower',
+        'comment1': "the shrimp allergy isn't fully identified",
+        'comment2': None,
+        'observ1': 'Ay Caramba!',
+        'observ2': None,
+        'isAuthHospital': True,
+        'hospital': 'Springfield General Hospital',
         'vaccinList/0/code': 'DTC',
         'vaccinList/0/vaccinationDate': '2011-01-11',
         'vaccinList/1/code': 'ROR',