Cristin64

cristin_ms/cristin_xml.py

@@ -62,9 +62,10 @@ def add_organization(
         root: ET.Element,
         orgmap: typing.Dict[int, Orgenhet],
         context: CristinMsContext,
-) -> None:
+) -> typing.List:
     """Add organization to the Element"""
     organisasjon = ET.SubElement(root, 'organisasjon')
+    stedskoder = []
     for org in orgmap.values():
         parent = get_org_parent(orgmap, org)
         if parent is None:
@@ -114,15 +115,39 @@ def add_organization(
         for k, v in values_none_okay.items():
             if v is not None:
                 set_text(enhet, k, v)
+        stedskoder.append(str(avd) + str(undavd) + str(gruppe))
+
+    return stedskoder
 
 
 def add_persons(root: ET.Element,
                 persons: typing.List[dict],
                 organizations: typing.Dict[int, Orgenhet],
-                context: CristinMsContext) -> None:
+                context: CristinMsContext,
+                stedskoder: typing.List = []) -> None:
     """Add persons to the Element"""
     personer = ET.SubElement(root, 'personer')
     for person_data in persons:
+        if '_stillinger' in person_data and len(person_data['_stillinger']) > 0:
+            for stilling in person_data['_stillinger']:
+                stil_model = Stilling(**stilling)
+                if not stilling_validate_fields(stil_model):
+                    logger.warning(
+                        "Employee %s has insufficient employment info in db."
+                        " Skipping employment info.",
+                        person_data["id"])
+                    continue
+                org_enhet_nr = int(stil_model.organisasjon_id)
+                if org_enhet_nr not in organizations:
+                    logger.warning("No orgenhet found for stilling %r",
+                                   stilling)
+                    continue
+                org = organizations[org_enhet_nr]
+                avd, undavd, gruppe = get_stedkode(context, org.id)
+                stedskode = str(avd) + str(undavd) + str(gruppe)
+                if not stedskode in stedskoder:
+                    continue
+
         # Validate and adjust values if possible, otherwise skip person
         values = {
             "etternavn": person_data['etternavn'],
@@ -197,8 +222,9 @@ def add_persons(root: ET.Element,
                          stil_model.innehaver[0].innehaver_startdato)
                 set_text(ansettelse, 'datoTil',
                          stil_model.innehaver[0].innehaver_sluttdato)
-                set_text(ansettelse, 'stillingsbetegnelse',
-                         stil_model.stillingsnavn)
+                if stil_model.stillingsnavn is not None:
+                    set_text(ansettelse, 'stillingsbetegnelse',
+                             stil_model.stillingsnavn)
                 # set_text(ansettelse, 'stillingsandel', ???)
 
 
@@ -232,12 +258,12 @@ def generate_tree(
     """Generate the whole tree"""
     root = make_root_element()
     add_source_info(root, context.config.source_info)
-    add_organization(root, organizations, context)
+    stedskoder = add_organization(root, organizations, context)
 
     # Exit if no OUs added
     check_org_okay(root)
 
-    add_persons(root, persons, organizations, context)
+    add_persons(root, persons, organizations, context, stedskoder)
     return root