Refactor config.yml and import_ind.py to remove redundant employeeNumber entries and enhance request handling for missing values

Author: tacxou

config.yml

@@ -15,8 +15,6 @@ taiga_etd.json:
     additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
     $setOnInsert.inetOrgPerson.employeeNumber:
     - "id_coord"
-    inetOrgPerson.employeeNumber:
-    - "id_coord"
     customFields.photo: "photo_nom"
     $setOnInsert.inetOrgPerson.uid:
     - "prenom"
@@ -101,8 +99,6 @@ taiga_adm.json:
     additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
     $setOnInsert.inetOrgPerson.employeeNumber:
     - "id_coord"
-    inetOrgPerson.employeeNumber:
-    - "id_coord"
     customFields.photo: "photo_nom"
     $setOnInsert.inetOrgPerson.uid:
     - "prenom"
@@ -185,8 +181,6 @@ taiga_esn.json:
     additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
     $setOnInsert.inetOrgPerson.employeeNumber:
     - "id_coord"
-    inetOrgPerson.employeeNumber:
-    - "id_coord"
     customFileds.photo: "photo_nom"
     $setOnInsert.inetOrgPerson.uid:
     - "prenom"
@@ -231,7 +225,9 @@ taiga_esn.json:
     $setOnInsert.additionalFields.attributes.eduPerson.edupersonprimaryaffiliation: "teacher"
     $setOnInsert.additionalFields.attributes.sogxuser.sogxdisableflag: 0
   transforms:
-    additionalFields.attributes.supannPerson.supannRefId: "parse_type(typename='string')"
+    inetOrgPerson.cn: "join(delimiter=' ')"
+    additionalFields.attributes.supannPerson.supannRefId: "parse_type(typename='str')"
+    additionalFields.attributes.supannPerson.supannEmpId: "parse_type(typename='str')"
     inetOrgPerson.displayName: "join(delimiter=' ')"
     inetOrgPerson.postalAddress: "join(delimiter=',')"
     $setOnInsert.inetOrgPerson.uid:

src/import_ind.py

@@ -29,8 +29,8 @@ async def read_response(response):
     print(jsonMessage)
 
 async def send_request(session, url,exclusions, json):
-    if (json.get('inetOrgPerson', {}).get('employeeNumber') == None):
-        print(f"MISSING employeeNumber {json.get('inetOrgPerson', {})}")
+    if (json.get('inetOrgPerson', {}).get('employeeNumber') == None and json.get('$setOnInsert', {}).get('inetOrgPerson', {}).get('employeeNumber') == None):
+        print(f"MISSING employeeNumber -> $set: {json.get('inetOrgPerson', {})}, $setOnInsert: {json.get('$setOnInsert', {}).get('inetOrgPerson', {})}")
         return
 
     headers = {
@@ -42,7 +42,7 @@ async def send_request(session, url,exclusions, json):
         "filters[inetOrgPerson.employeeType]": "TAIGA",
     }
 
-    employeeNumber = json.get('inetOrgPerson', {}).get('employeeNumber')
+    employeeNumber = json.get('inetOrgPerson', {}).get('employeeNumber') or json.get('$setOnInsert', {}).get('inetOrgPerson', {}).get('employeeNumber')
 
     if isinstance(employeeNumber, list):
         params["filters[inetOrgPerson.employeeNumber][]"] = employeeNumber
@@ -58,8 +58,7 @@ async def send_request(session, url,exclusions, json):
                     print(f"EXCLUDED {json.get('inetOrgPerson', {}).get('employeeNumber')} {json.get('inetOrgPerson', {}).get('cn')}")
                     return
     try:
-
-        print(params)
+        print(f"Sending request to {url} with query: {params}")
 
         async with session.post(url, json=json, headers=headers, params=params) as response:
             #print(f"Request to {url} successful: {response.status}")