Skip to content

Commit 7e791b7

Browse files
tacxoutacxou
committed
Refactor send_request function to include additional filters in the request
1 parent f3c5fbc commit 7e791b7

File tree

2 files changed

+43
-37
lines changed

2 files changed

+43
-37
lines changed

‎config.yml‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,25 @@
44
"inetOrgPerson.cn": "nom",
55
"inetOrgPerson.sn": "prenom",
66
"inetOrgPerson.givenName": "prenom",
7-
"additionalFields.attributes.supann.supannPrenomsEtatCivil": "prenom",
8-
"inetOrgPerson.uid": "id_coord",
9-
"additionalFields.attributes.supann.supannRefId": "id_coord",
7+
"additionalFields.attributes.supannPerson.supannPrenomsEtatCivil": "prenom",
8+
"$setOnInsert.inetOrgPerson.uid": "email1",
9+
"inetOrgPerson.employeeNumber": "id_coord",
10+
"additionalFields.attributes.supannPerson.supannRefId": "id_coord",
1011
"inetOrgPerson.mail": "email1",
1112
"inetOrgPerson.mobile": "tel_mob",
1213
"inetOrgPerson.postalAddress": "adresse",
1314
"inetOrgPerson.userPassword": "mot_de_passe_ldap",
14-
"additionalFields.attributes.supann.supanncivilite": "civilite",
15-
"additionalFields.attributes.supann.supannOIDCGenre": "civilite",
16-
"additionalFields.attributes.supann.supannNomdeNaissance": "nom_marital",
17-
"additionalFields.attributes.supann.supannOIDCDatedeNaissance": "nss_date",
18-
"additionalFields.attributes.supann.supannCodeINSEEPaysDeNaissance": "nns_pays",
19-
"additionalFields.attributes.supann.supannCodeINSEEVilleDeNaissance": "nss_ville",
20-
"additionalFields.attributes.supann.supannAutreMail": "email2"
15+
"additionalFields.attributes.supannPerson.supanncivilite": "civilite",
16+
"additionalFields.attributes.supannPerson.supannOIDCGenre": "civilite",
17+
"additionalFields.attributes.supannPerson.supannNomdeNaissance": "nom_marital",
18+
"additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance": "nss_date",
19+
"additionalFields.attributes.supannPerson.supannCodeINSEEPaysDeNaissance": "nns_pays",
20+
"additionalFields.attributes.supannPerson.supannCodeINSEEVilleDeNaissance": "nss_ville",
21+
"additionalFields.attributes.supannPerson.supannAutreMail": "email2"
2122
},
2223
"additionalFields": {
23-
"additionalFields.objectClasses": ["supann"],
24-
"additionalFields.attributes.supann.supannTypeEntiteAffectation": "etd",
24+
"additionalFields.objectClasses": ["supannPerson"],
25+
"additionalFields.attributes.supannPerson.supannTypeEntiteAffectation": "etd",
2526
"state": -1
2627
}
2728
},
@@ -30,25 +31,25 @@
3031
"inetOrgPerson.cn": "nom",
3132
"inetOrgPerson.sn": "prenom",
3233
"inetOrgPerson.givenName": "prenom",
33-
"additionalFields.attributes.supann.supannPrenomsEtatCivil": "prenom",
34-
"inetOrgPerson.uid": "email2",
34+
"additionalFields.attributes.supannPerson.supannPrenomsEtatCivil": "prenom",
35+
"$setOnInsert.inetOrgPerson.uid": "email1",
3536
"inetOrgPerson.employeeNumber": "id_coord",
36-
"additionalFields.attributes.supann.supannEmpId": "id_coord",
37+
"additionalFields.attributes.supannPerson.supannEmpId": "id_coord",
3738
"inetOrgPerson.mail": "email1",
3839
"inetOrgPerson.mobile": "tel_mob",
3940
"inetOrgPerson.postalAddress": "adresse",
4041
"inetOrgPerson.userPassword": "mot_de_passe_ldap",
41-
"additionalFields.attributes.supann.supanncivilite": "civilite",
42-
"additionalFields.attributes.supann.supannOIDCGenre": "civilite",
43-
"additionalFields.attributes.supann.supannNomdeNaissance": "nom_marital",
44-
"additionalFields.attributes.supann.supannOIDCDatedeNaissance": "nss_date",
45-
"additionalFields.attributes.supann.supannCodeINSEEPaysDeNaissance": "nns_pays",
46-
"additionalFields.attributes.supann.supannCodeINSEEVilleDeNaissance": "nss_ville",
47-
"additionalFields.attributes.supann.supannAutreMail": "email2"
42+
"additionalFields.attributes.supannPerson.supanncivilite": "civilite",
43+
"additionalFields.attributes.supannPerson.supannOIDCGenre": "civilite",
44+
"additionalFields.attributes.supannPerson.supannNomdeNaissance": "nom_marital",
45+
"additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance": "nss_date",
46+
"additionalFields.attributes.supannPerson.supannCodeINSEEPaysDeNaissance": "nns_pays",
47+
"additionalFields.attributes.supannPerson.supannCodeINSEEVilleDeNaissance": "nss_ville",
48+
"additionalFields.attributes.supannPerson.supannAutreMail": "email2"
4849
},
4950
"additionalFields": {
50-
"additionalFields.objectClasses": ["supann"],
51-
"additionalFields.attributes.supann.supannTypeEntiteAffectation": "adm",
51+
"additionalFields.objectClasses": ["supannPerson"],
52+
"additionalFields.attributes.supannPerson.supannTypeEntiteAffectation": "adm",
5253
"state": -1
5354
}
5455
},
@@ -57,24 +58,25 @@
5758
"inetOrgPerson.cn": "nom",
5859
"inetOrgPerson.sn": "prenom",
5960
"inetOrgPerson.givenName": "prenom",
60-
"additionalFields.attributes.supann.supannPrenomsEtatCivil": "prenom",
61-
"inetOrgPerson.uid": "id_coord",
62-
"additionalFields.attributes.supann.supannEmpId": "id_coord",
61+
"additionalFields.attributes.supannPerson.supannPrenomsEtatCivil": "prenom",
62+
"$setOnInsert.inetOrgPerson.uid": "email1",
63+
"inetOrgPerson.employeeNumber": "id_coord",
64+
"additionalFields.attributes.supannPerson.supannEmpId": "id_coord",
6365
"inetOrgPerson.mail": "email1",
6466
"inetOrgPerson.mobile": "tel_mob",
6567
"inetOrgPerson.postalAddress": "adresse",
6668
"inetOrgPerson.userPassword": "mot_de_passe_ldap",
67-
"additionalFields.attributes.supann.supanncivilite": "civilite",
68-
"additionalFields.attributes.supann.supannOIDCGenre": "civilite",
69-
"additionalFields.attributes.supann.supannNomdeNaissance": "nom_marital",
70-
"additionalFields.attributes.supann.supannOIDCDatedeNaissance": "nss_date",
71-
"additionalFields.attributes.supann.supannCodeINSEEPaysDeNaissance": "nns_pays",
72-
"additionalFields.attributes.supann.supannCodeINSEEVilleDeNaissance": "nss_ville",
73-
"additionalFields.attributes.supann.supannAutreMail": "email2"
69+
"additionalFields.attributes.supannPerson.supanncivilite": "civilite",
70+
"additionalFields.attributes.supannPerson.supannOIDCGenre": "civilite",
71+
"additionalFields.attributes.supannPerson.supannNomdeNaissance": "nom_marital",
72+
"additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance": "nss_date",
73+
"additionalFields.attributes.supannPerson.supannCodeINSEEPaysDeNaissance": "nns_pays",
74+
"additionalFields.attributes.supannPerson.supannCodeINSEEVilleDeNaissance": "nss_ville",
75+
"additionalFields.attributes.supannPerson.supannAutreMail": "email2"
7476
},
7577
"additionalFields": {
76-
"additionalFields.objectClasses": ["supann"],
77-
"additionalFields.attributes.supann.supannTypeEntiteAffectation": "esn",
78+
"additionalFields.objectClasses": ["supannPerson"],
79+
"additionalFields.attributes.supannPerson.supannTypeEntiteAffectation": "esn",
7880
"state": -1
7981
}
8082
}

‎src/import_ind.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,14 @@ async def send_request(session, url, json):
3232
"Authorization": f"Bearer {sesame_api_token}",
3333
"Content-Type": "application/json; charset=utf-8",
3434
}
35+
params = {
36+
"filters[inetOrgPerson.employeeNumber]": f"{json.get('inetOrgPerson', {}).get('employeeNumber')}",
37+
"filters[inetOrgPerson.employeeType]": "TAIGA",
38+
}
3539

3640
try:
3741

38-
async with session.post(url, json=json, headers=headers) as response:
42+
async with session.post(url, json=json, headers=headers, params=params) as response:
3943
print(f"Request to {url} successful: {response.status}")
4044
await read_response(response)
4145
response.raise_for_status() # Raises error for 4xx/5xx responses

0 commit comments

Comments
 (0)