toulouse-maelis: adapt functests with last changes (#74645)

2023-02-10 00:50:22 +01:00 · 2023-02-10 00:50:22 +01:00 · 1fa564c70d
parent 57b9c49afb
commit 1fa564c70d
19 changed files with 97 additions and 23044 deletions
--- a/functests/toulouse_maelis/conftest.py
+++ b/functests/toulouse_maelis/conftest.py
@ -15,6 +15,9 @@ from zeep.helpers import serialize_object
 FAMILY_PAYLOAD = {
    'category': 'BI',
    'situation': 'MARI',
+    'nbChild': '3',
+    'nbTotalChild': '4',
+    'nbAES': '1',
    'rl1': {
        'civility': 'MME',
        'firstname': 'Marge',
@ -327,6 +330,7 @@ def remove_id_on_rlg(conn, rlg):
        rlg['lastname'] = 'N/A'
        remove_extra_indicators(conn, rlg['indicatorList'], 'rl-indicator')
        rlg['indicatorList'].sort(key=lambda x: x['code'])
+        rlg['quotientList'].sort(key=lambda x: (x['yearRev'], x['dateStart']))
        del rlg['indicators']  # order may change


--- a/functests/toulouse_maelis/data/test_child_indicators.json
+++ b/functests/toulouse_maelis/data/test_child_indicators.json
@ -27,8 +27,8 @@
  {
    "id": "AVS",
    "code": "AVS",
-    "text": "Auxiliaire de Vie scolaire",
-    "libelle": "Auxiliaire de Vie scolaire ",
+    "text": "Assistant de Vie scolaire",
+    "libelle": "Assistant de Vie scolaire ",
    "typeDesc": "NONE",
    "isActive": false
  },
--- a/functests/toulouse_maelis/data/test_create_child.json
+++ b/functests/toulouse_maelis/data/test_create_child.json
@ -7,7 +7,8 @@
    "dateBirth": "2016-05-09T00:00:00+02:00",
    "place": null,
    "communeCode": null,
-    "countryCode": null
+    "countryCode": null,
+    "cdDepartment": null
  },
  "dietcode": null,
  "bPhoto": false,
--- a/functests/toulouse_maelis/data/test_create_family.json
+++ b/functests/toulouse_maelis/data/test_create_family.json
@ -3,9 +3,9 @@
  "category": "BI",
  "situation": "MARI",
  "flagCom": true,
-  "nbChild": null,
-  "nbTotalChild": null,
-  "nbAES": null,
+  "nbChild": 3,
+  "nbTotalChild": 4,
+  "nbAES": "1",
  "RL1": {
    "num": "N/A",
    "firstname": "MARGE",
@ -17,7 +17,8 @@
      "dateBirth": "1950-10-01T00:00:00+01:00",
      "place": null,
      "communeCode": null,
-      "countryCode": null
+      "countryCode": null,
+      "cdDepartment": null
    },
    "adresse": {
      "idStreet": "2317",
@ -57,7 +58,8 @@
        "dateBirth": "2014-04-01T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_AV",
      "bPhoto": true,
@ -186,7 +188,8 @@
        "dateBirth": "2018-12-17T00:00:00+01:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_PAI",
      "bPhoto": false,
@ -219,7 +222,8 @@
        "dateBirth": "2018-04-01T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_AV",
      "bPhoto": false,
--- a/functests/toulouse_maelis/data/test_create_rl2.json
+++ b/functests/toulouse_maelis/data/test_create_rl2.json
@ -9,7 +9,8 @@
    "dateBirth": "1956-05-12T00:00:00+01:00",
    "place": null,
    "communeCode": null,
-    "countryCode": null
+    "countryCode": null,
+    "cdDepartment": null
  },
  "adresse": {
    "idStreet": null,
--- a/functests/toulouse_maelis/data/test_read_child-indicator_list.json
+++ b/functests/toulouse_maelis/data/test_read_child-indicator_list.json
@ -1,4 +1,12 @@
 [
+  {
+    "id": "AVS",
+    "code": "AVS",
+    "text": "Assistant de Vie scolaire",
+    "libelle": "Assistant de Vie scolaire ",
+    "typeDesc": "NONE",
+    "choiceList": []
+  },
  {
    "id": "AUTRE",
    "code": "AUTRE",
@ -15,14 +23,6 @@
    "typeDesc": "NONE",
    "choiceList": []
  },
-  {
-    "id": "AVS",
-    "code": "AVS",
-    "text": "Auxiliaire de Vie scolaire",
-    "libelle": "Auxiliaire de Vie scolaire ",
-    "typeDesc": "NONE",
-    "choiceList": []
-  },
  {
    "id": "ETABSPEC",
    "code": "ETABSPEC",
--- a/functests/toulouse_maelis/data/test_read_document_list.json
+++ b/functests/toulouse_maelis/data/test_read_document_list.json
@ -219,7 +219,7 @@
  {
    "id": "37",
    "code": "37",
-    "rang": "FAMILY",
+    "rang": "PERSON",
    "text": "D\u00e9claration conjointe sign\u00e9e des parents",
    "libelle": "D\u00e9claration conjointe sign\u00e9e des parents"
  },
@ -261,14 +261,14 @@
  {
    "id": "64",
    "code": "64",
-    "rang": "FAMILY",
+    "rang": "PERSON",
    "text": "Jugement des affaires familiales",
    "libelle": "Jugement des affaires familiales"
  },
  {
    "id": "65",
    "code": "65",
-    "rang": "FAMILY",
+    "rang": "PERSON",
    "text": "Jugement mise sous tutelle",
    "libelle": "Jugement mise sous tutelle"
  },
--- a/functests/toulouse_maelis/data/test_read_rl-indicator_list.json
+++ b/functests/toulouse_maelis/data/test_read_rl-indicator_list.json
@ -1,4 +1,12 @@
 [
+  {
+    "id": "AVS",
+    "code": "AVS",
+    "text": "Assistant de Vie scolaire",
+    "libelle": "Assistant de Vie scolaire ",
+    "typeDesc": "NONE",
+    "choiceList": []
+  },
  {
    "id": "AVL",
    "code": "AVL",
@ -7,14 +15,6 @@
    "typeDesc": "NONE",
    "choiceList": []
  },
-  {
-    "id": "AVS",
-    "code": "AVS",
-    "text": "Auxiliaire de Vie scolaire",
-    "libelle": "Auxiliaire de Vie scolaire ",
-    "typeDesc": "NONE",
-    "choiceList": []
-  },
  {
    "id": "ETABSPEC",
    "code": "ETABSPEC",
--- a/functests/toulouse_maelis/data/test_read_street_list.json
+++ b/functests/toulouse_maelis/data/test_read_street_list.json
--- a/functests/toulouse_maelis/data/test_rl_indicators.json
+++ b/functests/toulouse_maelis/data/test_rl_indicators.json
@ -10,8 +10,8 @@
  {
    "id": "AVS",
    "code": "AVS",
-    "text": "Auxiliaire de Vie scolaire",
-    "libelle": "Auxiliaire de Vie scolaire ",
+    "text": "Assistant de Vie scolaire",
+    "libelle": "Assistant de Vie scolaire ",
    "typeDesc": "NONE",
    "isActive": false
  },
--- a/functests/toulouse_maelis/data/test_update_child.json
+++ b/functests/toulouse_maelis/data/test_update_child.json
@ -7,7 +7,8 @@
    "dateBirth": "1970-01-01T00:00:00+01:00",
    "place": null,
    "communeCode": null,
-    "countryCode": null
+    "countryCode": null,
+    "cdDepartment": null
  },
  "dietcode": "MENU_AV",
  "bPhoto": false,
--- a/functests/toulouse_maelis/data/test_update_family.json
+++ b/functests/toulouse_maelis/data/test_update_family.json
@ -3,9 +3,9 @@
  "category": "BI",
  "situation": "MARI",
  "flagCom": true,
-  "nbChild": null,
-  "nbTotalChild": null,
-  "nbAES": null,
+  "nbChild": 3,
+  "nbTotalChild": 4,
+  "nbAES": "1",
  "RL1": {
    "num": "N/A",
    "firstname": "MARGE",
@ -17,7 +17,8 @@
      "dateBirth": "1950-10-01T00:00:00+01:00",
      "place": null,
      "communeCode": null,
-      "countryCode": null
+      "countryCode": null,
+      "cdDepartment": null
    },
    "adresse": {
      "idStreet": "2317",
@ -56,7 +57,8 @@
      "dateBirth": "1956-05-12T00:00:00+01:00",
      "place": null,
      "communeCode": null,
-      "countryCode": null
+      "countryCode": null,
+      "cdDepartment": null
    },
    "adresse": {
      "idStreet": null,
@ -127,7 +129,8 @@
        "dateBirth": "2014-04-01T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_AV",
      "bPhoto": true,
@ -250,7 +253,8 @@
        "dateBirth": "2016-05-09T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_SV",
      "bPhoto": false,
@ -283,7 +287,8 @@
        "dateBirth": "2018-12-17T00:00:00+01:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_PAI",
      "bPhoto": false,
@ -316,7 +321,8 @@
        "dateBirth": "2018-04-01T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_AV",
      "bPhoto": false,
--- a/functests/toulouse_maelis/data/test_update_family_ras.json
+++ b/functests/toulouse_maelis/data/test_update_family_ras.json
@ -3,9 +3,9 @@
  "category": "AUTR",
  "situation": "AUTR",
  "flagCom": true,
-  "nbChild": null,
-  "nbTotalChild": null,
-  "nbAES": null,
+  "nbChild": 0,
+  "nbTotalChild": 0,
+  "nbAES": "0",
  "RL1": {
    "num": "N/A",
    "firstname": "MARGE",
@ -17,7 +17,8 @@
      "dateBirth": "1950-10-01T00:00:00+01:00",
      "place": null,
      "communeCode": null,
-      "countryCode": null
+      "countryCode": null,
+      "cdDepartment": null
    },
    "adresse": {
      "idStreet": null,
@ -55,7 +56,8 @@
      "dateBirth": "1956-05-12T00:00:00+01:00",
      "place": null,
      "communeCode": null,
-      "countryCode": null
+      "countryCode": null,
+      "cdDepartment": null
    },
    "adresse": {
      "idStreet": null,
@ -111,7 +113,8 @@
        "dateBirth": "1970-01-01T00:00:00+01:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": null,
      "bPhoto": false,
@ -183,7 +186,8 @@
        "dateBirth": "2016-05-09T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_SV",
      "bPhoto": false,
@ -216,7 +220,8 @@
        "dateBirth": "2018-12-17T00:00:00+01:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_PAI",
      "bPhoto": false,
@ -249,7 +254,8 @@
        "dateBirth": "2018-04-01T00:00:00+02:00",
        "place": null,
        "communeCode": null,
-        "countryCode": null
+        "countryCode": null,
+        "cdDepartment": null
      },
      "dietcode": "MENU_AV",
      "bPhoto": false,
--- a/functests/toulouse_maelis/data/test_update_quotient.json
+++ b/functests/toulouse_maelis/data/test_update_quotient.json
@ -1,13 +1,4 @@
 [
-  {
-    "yearRev": 2021,
-    "dateStart": "2022-01-02T00:00:00+01:00",
-    "dateEnd": "2022-12-31T00:00:00+01:00",
-    "mtt": 1500.33,
-    "cdquo": "1",
-    "codeUti": null,
-    "cdquo_text": "Revenus fiscaux"
-  },
  {
    "yearRev": 2020,
    "dateStart": "2022-01-02T00:00:00+01:00",
@ -25,5 +16,14 @@
    "cdquo": "1",
    "codeUti": null,
    "cdquo_text": "Revenus fiscaux"
+  },
+  {
+    "yearRev": 2021,
+    "dateStart": "2022-01-02T00:00:00+01:00",
+    "dateEnd": "2022-12-31T00:00:00+01:00",
+    "mtt": 1500.33,
+    "cdquo": "1",
+    "codeUti": null,
+    "cdquo_text": "Revenus fiscaux"
  }
 ]
--- a/functests/toulouse_maelis/data/test_update_rl1.json
+++ b/functests/toulouse_maelis/data/test_update_rl1.json
@ -9,7 +9,8 @@
    "dateBirth": "1950-10-01T00:00:00+01:00",
    "place": null,
    "communeCode": null,
-    "countryCode": null
+    "countryCode": null,
+    "cdDepartment": null
  },
  "adresse": {
    "idStreet": "2317",
--- a/functests/toulouse_maelis/data/test_update_rl2.json
+++ b/functests/toulouse_maelis/data/test_update_rl2.json
@ -9,7 +9,8 @@
    "dateBirth": "1956-05-12T00:00:00+01:00",
    "place": null,
    "communeCode": null,
-    "countryCode": null
+    "countryCode": null,
+    "cdDepartment": null
  },
  "adresse": {
    "idStreet": null,
--- a/functests/toulouse_maelis/test_data.py
+++ b/functests/toulouse_maelis/test_data.py
@ -34,4 +34,5 @@ def test_referentials(conn, referentials, ref):
    for item in res['data']:
        assert 'id' in item
        assert 'text' in item
-    assert diff(res['data'], 'test_read_%s_list.json' % ref)
+    if ref not in ['street']:
+        assert diff(res['data'], 'test_read_%s_list.json' % ref)
--- a/functests/toulouse_maelis/test_family.py
+++ b/functests/toulouse_maelis/test_family.py
@ -9,6 +9,9 @@ from .conftest import diff, diff_child, diff_family, diff_rlg, link, read_family
 FAMILY_RESET_PAYLOAD = {
    'category': 'AUTR',
    'situation': 'AUTR',
+    'nbChild': '',
+    'nbTotalChild': '',
+    'nbAES': '',
    'rl1': {
        'civility': 'MR',  # no effect
        'firstname': 'Marge',  # must be
@ -230,7 +233,7 @@ def test_create_family(conn, create_data, update_data):
    res = resp.json()
    assert res['err'] == 1
    assert 'Il existe déjà un Responsable Légal correspondant' in res['err_desc']
-    assert res['err_class'] == 'passerelle.utils.soap.SOAPFault'
+    assert res['err_class'] == 'passerelle.utils.jsonresponse.APIError'

    # RL1 already exists (on update_data, as RL2) error
    payload['rl1']['firstname'] = 'Homer'
@ -240,7 +243,7 @@ def test_create_family(conn, create_data, update_data):
    res = resp.json()
    assert res['err'] == 1
    assert 'Il existe déjà un Responsable Légal correspondant' in res['err_desc']
-    assert res['err_class'] == 'passerelle.utils.soap.SOAPFault'
+    assert res['err_class'] == 'passerelle.utils.jsonresponse.APIError'


 def test_is_rl_exists(conn, update_data):
@ -918,7 +921,7 @@ def test_add_supplied_document(conn, create_data):
    res = resp.json()
    assert res['err'] == 0

-    # push on childe
+    # push on child
    payload['numPerson'] = create_data['bart_num']
    url = conn + '/add-supplied-document?NameID=%s' % create_data['name_id']
    resp = requests.post(url, json=payload)
--- a/functests/toulouse_maelis/test_invoice.py
+++ b/functests/toulouse_maelis/test_invoice.py
@ -9,7 +9,7 @@ def test_direct_debit_order(conn, create_data):

    url = conn + '/add-rl1-direct-debit-order?NameID=%s' % create_data['name_id']
    payload = {
-        'codeRegie': '1',
+        'codeRegie': '102',
        'bank/bankBIC': 'BDFEFR2T',
        'bank/bankIBAN': 'FR7630001007941234567890185',
        'bank/bankRUM': 'xxx',
@ -26,7 +26,7 @@ def test_direct_debit_order(conn, create_data):

    url = conn + '/get-rl1-direct-debit-order?NameID=%s' % create_data['name_id']
    params = {
-        'codeRegie': '1',
+        'codeRegie': '102',
        'dateRef': '2023-01-01',
    }
    resp = requests.get(url, params=params)