nanterre: confondre le pacs et le mariage au niveau de la bdd (fixes #15789)

tests/test_nanterre.py

@@ -306,7 +306,7 @@ def test_create_individu(app, rsu_schema):
     response = app.post_json(union_url, params={
         'individu_id_1': first_id,
         'individu_id_2': second_id,
-        'statut': 'mariage',
+        'statut': 'pacs/mariage',
         'adresse_commune': 1,
     })
 
@@ -385,7 +385,7 @@ def test_create_individu(app, rsu_schema):
 
     data = get_reseau(first_id)
     assert data['union']
-    assert data['union_statut'] == 'mariage'
+    assert data['union_statut'] == 'pacs/mariage'
 
     # changement de situation maritale entre les deux adultes
     changement_de_situation_maritale_url = reverse('rsu-api-changement-de-situation-maritale',
@@ -394,14 +394,14 @@ def test_create_individu(app, rsu_schema):
                                                    })
 
     response = app.post_json(changement_de_situation_maritale_url, params={
-        'statut': 'pacs'
+        'statut': 'pacs/mariage'
     })
 
     assert response.json['err'] == 0
 
     data = get_reseau(first_id)
     assert data['union']
-    assert data['union_statut'] == 'pacs'
+    assert data['union_statut'] == 'pacs/mariage'
 
     # déclaration de séparation entre les deux adultes
     separation_url = reverse('rsu-api-separation', kwargs={
@@ -412,7 +412,7 @@ def test_create_individu(app, rsu_schema):
     data = response.json['data']
     assert set(data.keys()) == set(['union', 'union_statut', 'enfants'])
     assert data['union']['id'] == second_id
-    assert data['union_statut'] == 'pacs'
+    assert data['union_statut'] == 'pacs/mariage'
     assert len(data['enfants']) == 1
     assert data['enfants'][0]['id'] == enfant_id
 

zoo/zoo_nanterre/api_views.py

@@ -449,7 +449,7 @@ class DeclarationUnionSerializer(serializers.Serializer):
     individu_id_2 = serializers.IntegerField()
     adresse_commune = serializers.ChoiceField(choices=[1, 2])
     statut = serializers.ChoiceField(
-        choices=['pacs', 'mariage', 'unionlibre'])
+        choices=['pacs/mariage', 'unionlibre'])
 
 
 class DeclarationUnion(APIView):
@@ -636,7 +636,7 @@ declaration_adresse_principale = DeclarationAdressePrincipaleView.as_view()
 
 class ChangementDeSituationMaritaleSerializer(serializers.Serializer):
     statut = serializers.ChoiceField(
-        choices=['pacs', 'mariage', 'unionlibre'])
+        choices=['pacs/mariage', 'unionlibre'])
 
 
 class ChangementDeSituationMaritaleView(APIView):

zoo/zoo_nanterre/fixtures/rsu.json

@@ -227,8 +227,7 @@
                "statut" : {
                   "type" : "string",
                   "enum" : [
-                     "pacs",
-                     "mariage",
+                     "pacs/mariage",
                      "unionlibre"
                   ]
                }

zoo/zoo_nanterre/scripts/load-dump.py

@@ -183,9 +183,9 @@ for label, relationtype, responsibleid, subjectid in cursor.fetchall():
         seen.add(key)
         schema = union_schema
         if label == 'Marie':
-            kind = 'mariage'
+            kind = 'pacs/mariage'
         elif label == 'Pacse':
-            kind = 'pacs'
+            kind = 'pacs/mariage'
         elif label == 'UnionLibre':
             kind = 'unionlibre'
         else: