Skip to content

Commit 1c066e7

Browse files
alainabbasalainabbas
committed
separation
1 parent 11aeb61 commit 1c066e7

File tree

2 files changed

+138
-131
lines changed

2 files changed

+138
-131
lines changed

‎config.yml‎

Lines changed: 119 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
2-
taiga_etd.json:
3-
mapping:
4-
inetOrgPerson.cn:
2+
taiga_etd.json:
3+
mapping:
4+
inetOrgPerson.cn:
55
- "nom"
66
- "prenom"
7-
inetOrgPerson.displayName:
7+
inetOrgPerson.displayName:
88
- "prenom"
99
- "nom"
1010
inetOrgPerson.sn: "nom"
1111
inetOrgPerson.givenName: "prenom"
1212
additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
1313
inetOrgPerson.employeeNumber: "id_coord"
14-
"$setOnInsert.inetOrgPerson.uid":
14+
$setOnInsert.inetOrgPerson.uid:
1515
- "prenom"
1616
- "nom"
1717
additionalFields.attributes.supannPerson.supannRefId: "id_coord"
18-
"$setOnInsert.inetOrgPerson.mail":
18+
$setOnInsert.inetOrgPerson.mail:
1919
- "prenom"
2020
- "nom"
2121
inetOrgPerson.mobile: "tel_mob"
22-
inetOrgPerson.postalAddress:
22+
inetOrgPerson.postalAddress:
2323
- "adresse"
2424
- "CP"
2525
- "Ville"
@@ -28,130 +28,132 @@ taiga_etd.json:
2828
additionalFields.attributes.supannPerson.supannNomdeNaissance: "nom_marital"
2929
additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance: "nss_date"
3030
additionalFields.attributes.supannPerson.supannAutreMail: "email2"
31-
additionalFields:
32-
additionalFields.objectClasses:
31+
additionalFields:
32+
additionalFields.objectClasses:
3333
- "supannPerson"
3434
additionalFields.attributes.supannPerson.supannTypeEntiteAffectation: "etd"
3535
state: -1
3636
inetOrgPerson.employeeType: "TAIGA"
3737
inetOrgPerson.departmentNumber: "etd"
38-
additionalFields.attributes.supannPerson.supannEtablissement: "{UAI}0690184A"
39-
transforms:
38+
additionalFields.attributes.supannPerson.supannEtablissement: "{UAI}A123456"
39+
transforms:
4040
inetOrgPerson.cn: "join(delimiter=' ')"
4141
inetOrgPerson.displayName: "join(delimiter=' ')"
4242
inetOrgPerson.postalAddress: "join(delimiter=',')"
43-
"$setOnInsert.inetOrgPerson.uid":
43+
$setOnInsert.inetOrgPerson.uid:
4444
- "join(delimiter='.')"
4545
- "remove_accents"
4646
- "lower"
4747
- "replace(old=' ',new='-')"
4848
# - "regex(pattern='(?<=\\b\\w)([a-zA-Z0-9_\\-]+\\.)', replace='')"
49-
"$setOnInsert.inetOrgPerson.mail":
49+
$setOnInsert.inetOrgPerson.mail:
5050
- "join(delimiter='.')"
5151
- "lower"
52+
- "remove_accents"
53+
- "replace(old=' ',new='-')"
54+
- "suffix(string='@lyon.archi.fr')"
55+
taiga_adm.json:
56+
mapping:
57+
inetOrgPerson.cn:
58+
- "nom"
59+
- "prenom"
60+
inetOrgPerson.displayName:
61+
- "prenom"
62+
- "nom"
63+
inetOrgPerson.sn: "nom"
64+
inetOrgPerson.givenName: "prenom"
65+
additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
66+
inetOrgPerson.employeeNumber: "id_coord"
67+
$setOnInsert.inetOrgPerson.uid:
68+
- "prenom"
69+
- "nom"
70+
additionalFields.attributes.supannPerson.supannEmpId: "id_coord"
71+
$setOnInsert.inetOrgPerson.mail:
72+
- "prenom"
73+
- "nom"
74+
inetOrgPerson.mobile: "tel_mob"
75+
inetOrgPerson.postalAddress:
76+
- "adresse"
77+
- "CP"
78+
- "Ville"
79+
additionalFields.attributes.supannPerson.supanncivilite: "civilite"
80+
additionalFields.attributes.supannPerson.supannOIDCGenre: "civilite"
81+
additionalFields.attributes.supannPerson.supannNomdeNaissance: "nom_marital"
82+
additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance: "nss_date"
83+
additionalFields.attributes.supannPerson.supannAutreMail: "email2"
84+
additionalFields:
85+
additionalFields.objectClasses:
86+
- "supannPerson"
87+
additionalFields.attributes.supannPerson.supannTypeEntiteAffectation: "adm"
88+
additionalFields.attributes.supannPerson.supannEtablissement: "{UAI}A123456"
89+
inetOrgPerson.employeeType: "TAIGA"
90+
inetOrgPerson.departmentNumber: "adm"
91+
state: -1
92+
transforms:
93+
inetOrgPerson.cn: "join(delimiter=' ')"
94+
inetOrgPerson.displayName: "join(delimiter=' ')"
95+
inetOrgPerson.postalAddress: "join(delimiter=',')"
96+
$setOnInsert.inetOrgPerson.uid:
97+
- "join(delimiter='.')"
98+
- "remove_accents"
99+
- "lower"
100+
- "replace(old=' ',new='-')"
101+
# - "regex(pattern='(?<=\\b\\w)([a-zA-Z0-9_\\-]+\\.)', replace='')"
102+
$setOnInsert.inetOrgPerson.mail:
103+
- "join(delimiter='.')"
104+
- "remove_accents"
105+
- "lower"
106+
- "replace(old=' ',new='-')"
107+
- "suffix(string='@lyon.archi.fr')"
108+
taiga_esn.json:
109+
mapping:
110+
inetOrgPerson.cn:
111+
- "nom"
112+
- "prenom"
113+
inetOrgPerson.displayName:
114+
- "prenom"
115+
- "nom"
116+
inetOrgPerson.sn: "nom"
117+
inetOrgPerson.givenName: "prenom"
118+
additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
119+
inetOrgPerson.employeeNumber: "id_coord"
120+
$setOnInsert.inetOrgPerson.uid:
121+
- "prenom"
122+
- "nom"
123+
additionalFields.attributes.supannPerson.supannEmpId: "id_coord"
124+
$setOnInsert.inetOrgPerson.mail:
125+
- "prenom"
126+
- "nom"
127+
inetOrgPerson.mobile: "tel_mob"
128+
inetOrgPerson.postalAddress:
129+
- "adresse"
130+
- "CP"
131+
- "Ville"
132+
additionalFields.attributes.supannPerson.supanncivilite: "civilite"
133+
additionalFields.attributes.supannPerson.supannOIDCGenre: "civilite"
134+
additionalFields.attributes.supannPerson.supannNomdeNaissance: "nom_marital"
135+
additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance: "nss_date"
136+
additionalFields.attributes.supannPerson.supannAutreMail: "email2"
137+
additionalFields:
138+
additionalFields.objectClasses:
139+
- "supannPerson"
140+
additionalFields.attributes.supannPerson.supannTypeEntiteAffectation: "esn"
141+
additionalFields.attributes.supannPerson.supannEtablissement: "{UAI}A123456"
142+
inetOrgPerson.departmentNumber: "esn"
143+
inetOrgPerson.employeeType: "TAIGA"
144+
state: -1
145+
transforms:
146+
inetOrgPerson.cn: "join(delimiter=' ')"
147+
inetOrgPerson.displayName: "join(delimiter=' ')"
148+
inetOrgPerson.postalAddress: "join(delimiter=',')"
149+
$setOnInsert.inetOrgPerson.uid:
150+
- "join(delimiter='.')"
151+
- "remove_accents"
152+
- "lower"
153+
# - "regex(pattern='(?<=\\b\\w)([a-zA-Z0-9_\\-]+\\.)', replace='')"
154+
$setOnInsert.inetOrgPerson.mail:
155+
- "join(delimiter='.')"
52156
- "remove_accents"
157+
- "lower"
53158
- "replace(old=' ',new='-')"
54-
- "suffix(string='@sesame.local')"
55-
# taiga_adm.json:
56-
# mapping:
57-
# inetOrgPerson.cn:
58-
# - "nom"
59-
# - "prenom"
60-
# inetOrgPerson.displayName:
61-
# - "prenom"
62-
# - "nom"
63-
# inetOrgPerson.sn: "nom"
64-
# inetOrgPerson.givenName: "prenom"
65-
# additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
66-
# inetOrgPerson.employeeNumber: "id_coord"
67-
# $setOnInsert.inetOrgPerson.uid:
68-
# - "prenom"
69-
# - "nom"
70-
# additionalFields.attributes.supannPerson.supannEmpId: "id_coord"
71-
# $setOnInsert.inetOrgPerson.mail:
72-
# - "prenom"
73-
# - "nom"
74-
# inetOrgPerson.mobile: "tel_mob"
75-
# inetOrgPerson.postalAddress:
76-
# - "adresse"
77-
# - "CP"
78-
# - "Ville"
79-
# additionalFields.attributes.supannPerson.supanncivilite: "civilite"
80-
# additionalFields.attributes.supannPerson.supannOIDCGenre: "civilite"
81-
# additionalFields.attributes.supannPerson.supannNomdeNaissance: "nom_marital"
82-
# additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance: "nss_date"
83-
# additionalFields.attributes.supannPerson.supannAutreMail: "email2"
84-
# additionalFields:
85-
# additionalFields.objectClasses:
86-
# - "supannPerson"
87-
# additionalFields.attributes.supannPerson.supannTypeEntiteAffectation: "adm"
88-
# inetOrgPerson.employeeType: "TAIGA"
89-
# inetOrgPerson.departmentNumber: "adm"
90-
# state: -1
91-
# transforms:
92-
# inetOrgPerson.cn: "join(delimiter=' ')"
93-
# inetOrgPerson.displayName: "join(delimiter=' ')"
94-
# inetOrgPerson.postalAddress: "join(delimiter=',')"
95-
# $setOnInsert.inetOrgPerson.uid:
96-
# - "join(delimiter='.')"
97-
# - "remove_accents"
98-
# - "lower"
99-
# - "replace(old=' ',new='-')"
100-
# # - "regex(pattern='(?<=\\b\\w)([a-zA-Z0-9_\\-]+\\.)', replace='')"
101-
# $setOnInsert.inetOrgPerson.mail:
102-
# - "join(delimiter='.')"
103-
# - "remove_accents"
104-
# - "lower"
105-
# - "replace(old=' ',new='-')"
106-
# - "suffix(string='@sesame.local')"
107-
# taiga_esn.json:
108-
# mapping:
109-
# inetOrgPerson.cn:
110-
# - "nom"
111-
# - "prenom"
112-
# inetOrgPerson.displayName:
113-
# - "prenom"
114-
# - "nom"
115-
# inetOrgPerson.sn: "nom"
116-
# inetOrgPerson.givenName: "prenom"
117-
# additionalFields.attributes.supannPerson.supannPrenomsEtatCivil: "prenom"
118-
# inetOrgPerson.employeeNumber: "id_coord"
119-
# $setOnInsert.inetOrgPerson.uid:
120-
# - "prenom"
121-
# - "nom"
122-
# additionalFields.attributes.supannPerson.supannEmpId: "id_coord"
123-
# $setOnInsert.inetOrgPerson.mail:
124-
# - "prenom"
125-
# - "nom"
126-
# inetOrgPerson.mobile: "tel_mob"
127-
# inetOrgPerson.postalAddress:
128-
# - "adresse"
129-
# - "CP"
130-
# - "Ville"
131-
# additionalFields.attributes.supannPerson.supanncivilite: "civilite"
132-
# additionalFields.attributes.supannPerson.supannOIDCGenre: "civilite"
133-
# additionalFields.attributes.supannPerson.supannNomdeNaissance: "nom_marital"
134-
# additionalFields.attributes.supannPerson.supannOIDCDatedeNaissance: "nss_date"
135-
# additionalFields.attributes.supannPerson.supannAutreMail: "email2"
136-
# additionalFields:
137-
# additionalFields.objectClasses:
138-
# - "supannPerson"
139-
# additionalFields.attributes.supannPerson.supannTypeEntiteAffectation: "esn"
140-
# inetOrgPerson.departmentNumber: "esn"
141-
# inetOrgPerson.employeeType: "TAIGA"
142-
# state: -1
143-
# transforms:
144-
# inetOrgPerson.cn: "join(delimiter=' ')"
145-
# inetOrgPerson.displayName: "join(delimiter=' ')"
146-
# inetOrgPerson.postalAddress: "join(delimiter=',')"
147-
# $setOnInsert.inetOrgPerson.uid:
148-
# - "join(delimiter='.')"
149-
# - "remove_accents"
150-
# - "lower"
151-
# # - "regex(pattern='(?<=\\b\\w)([a-zA-Z0-9_\\-]+\\.)', replace='')"
152-
# $setOnInsert.inetOrgPerson.mail:
153-
# - "join(delimiter='.')"
154-
# - "remove_accents"
155-
# - "lower"
156-
# - "replace(old=' ',new='-')"
157-
# - "suffix(string='@sesame.local')"
159+
- "suffix(string='@lyon.archi.fr')"

‎main.py‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import os
55
from dotenv import load_dotenv
66
import hashlib
7+
import sys
78
from datetime import datetime
89

910
from src.a_moins_b import a_moins_b
@@ -65,23 +66,27 @@
6566
]
6667

6768

68-
async def main():
69-
logger.info("Starting Taiga crawler...")
70-
await a_moins_b(url, 0, -1, headers)
71-
collection_tasks = [col.get('function')(url, col, headers) for col in collections]
72-
await asyncio.gather(*collection_tasks)
73-
print("Taiga crawler ended successful !!!")
74-
75-
print("Starting import_ind...")
76-
start_time = datetime.now()
77-
await import_ind()
78-
end_time = datetime.now()
79-
execution_time = end_time - start_time
80-
print(f"import_ind completed in {execution_time}")
69+
async def main(args):
70+
run = ""
71+
if len(args) == 2:
72+
run = args[1]
73+
if run == 'taiga' or run == '':
74+
logger.info("Starting Taiga crawler...")
75+
await a_moins_b(url, 0, -1, headers)
76+
collection_tasks = [col.get('function')(url, col, headers) for col in collections]
77+
await asyncio.gather(*collection_tasks)
78+
print("Taiga crawler ended successful !!!")
79+
if run == 'sesame' or run == '':
80+
print("Starting import_ind...")
81+
start_time = datetime.now()
82+
await import_ind()
83+
end_time = datetime.now()
84+
execution_time = end_time - start_time
85+
print(f"import_ind completed in {execution_time}")
8186

8287
if __name__ == '__main__':
8388
loop = asyncio.get_event_loop()
8489
try:
85-
loop.run_until_complete(main())
90+
loop.run_until_complete(main(sys.argv))
8691
finally:
8792
loop.close()

0 commit comments

Comments
 (0)