dipex 5.0.2__tar.gz → 5.1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dipex-5.0.2 → dipex-5.1.0}/PKG-INFO +1 -1
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/config.py +3 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/fix_departments.py +64 -78
- dipex-5.1.0/integrations/SD_Lon/sdlon/log.py +28 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_changed_at.py +147 -148
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_config.py +1 -0
- dipex-5.1.0/integrations/SD_Lon/tests/test_log.py +12 -0
- {dipex-5.0.2 → dipex-5.1.0}/pyproject.toml +1 -1
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/gql_lora_cache_async.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/lc_for_jobs_db.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/lora_cache.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/lora_gql_equivalence_tester.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/main.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/old_lora_cache.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/sql_export.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/sql_table_defs.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/sql_url.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/sql_export/trigger.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/exporters/utils/priority_by_class.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/date_utils.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/employees.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/engagement.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/exceptions.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/graphql.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/it_systems.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/main.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/models.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/scripts/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/scripts/fix_monthly_hourly_divide.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/scripts/fix_status8.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/scripts/generate_org_unit_level_uuid.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_changed_at_redo.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_cli.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_common.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_fixup.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_importer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_log_analyzer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sd_to_pydantic.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/skip.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/sync_job_id.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/test_mo_against_sd.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdlon/test_sd_connectivity.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdtool/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdtool/config.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/sdtool/main.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/fixtures.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/org_manipulations.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/sdtool/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/sdtool/test_app.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/sdtool/test_config.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/sdtool/utils.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_date_utils.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_employee.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_engagement.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_fix_departments.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_graphql.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_it_systems.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_main.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sd_changed_at.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sd_common.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sd_importer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sd_log_analyzer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sd_to_pydantic.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_skip.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/SD_Lon/tests/test_sync_job_id.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/config.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/dar_helper.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/initial.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/initial_classes.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_files.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_import.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_leder.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_org.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_pers.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/los_stam.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/conftest.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/helpers.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/strategies.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_config.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_initial.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_files.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_import.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_leder.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_org.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_pers.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_los_stam.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/tests/test_util.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/util.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/aarhus/uuids.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_common.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_exceptions.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_fix_enddate.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_jinja_filters.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_life_cycle.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_logger.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_reader.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_sync.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_template_engine.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_templates.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/ad_writer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/import_ad_group_into_mo.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/mo_to_ad_sync.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/read_ad_conf_settings.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/sync_mo_uuid_to_ad.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/test_connectivity.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/mocks.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/name_simulator.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_common.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_fix_enddate.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_jinja_filters.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_life_cycle.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_logger.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_reader.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_sync.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_ad_writer.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_dot_mapping.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_first_included.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_import_ad_group_into_mo.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_location_element.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_mo_data_source.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_mo_to_ad_sync.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_morestsource.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_read_ad_conf_settings.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_recursive_dict_update.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_sync_mo_uuid_to_ad.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_usernames.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/tests/test_utils.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/user_names.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/username_rules/method_2.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/ad_integration/utils.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/calculate_primary.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/common.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/default.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/opus.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/sd.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/tests/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/calculate_primary/tests/test_primary.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/cpr_mapper.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/dawa_helper.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/kle/__init__.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/kle/kle_import.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/kle/kle_import_export.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/kle/kle_xlsx.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/kle/payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/clear_and_import_opus.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/opus_diff_import.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/opus_exceptions.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/opus_file_reader.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/opus_helpers.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/opus_reimport_one.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/org_tree_print/main.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/payloads.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/tests/test_opus_diff_import.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/tests/test_opus_file_reader.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/opus/tests/test_opus_helpers.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/rundb/db_overview.py +0 -0
- {dipex-5.0.2 → dipex-5.1.0}/integrations/rundb/tests/test_db_overview.py +0 -0
|
@@ -24,6 +24,7 @@ from pydantic import UUID4
|
|
|
24
24
|
from ra_utils.load_settings import load_settings
|
|
25
25
|
from ra_utils.job_settings import JobSettings
|
|
26
26
|
|
|
27
|
+
from .log import LogLevel
|
|
27
28
|
from .models import JobFunction
|
|
28
29
|
|
|
29
30
|
|
|
@@ -63,6 +64,8 @@ class CommonSettings(BaseSettings): # type: ignore
|
|
|
63
64
|
"/opt/dipex/os2mo-data-import-and-export/settings/cpr_uuid_map.csv"
|
|
64
65
|
)
|
|
65
66
|
|
|
67
|
+
log_level: LogLevel = LogLevel.DEBUG
|
|
68
|
+
|
|
66
69
|
job_settings: JobSettings = JobSettings()
|
|
67
70
|
|
|
68
71
|
|
|
@@ -2,6 +2,7 @@ import datetime
|
|
|
2
2
|
import json
|
|
3
3
|
import logging
|
|
4
4
|
import sys
|
|
5
|
+
import structlog
|
|
5
6
|
from typing import Any
|
|
6
7
|
from typing import Optional
|
|
7
8
|
from typing import List
|
|
@@ -22,28 +23,12 @@ from . import sd_payloads
|
|
|
22
23
|
from .config import ChangedAtSettings
|
|
23
24
|
from .config import get_changed_at_settings
|
|
24
25
|
from .exceptions import NoCurrentValdityException
|
|
26
|
+
from .log import setup_logging
|
|
25
27
|
from .sd_common import mora_assert
|
|
26
28
|
from .sd_common import sd_lookup
|
|
27
29
|
|
|
28
30
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
logger = logging.getLogger("fixDepartments")
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
def setup_logging():
|
|
35
|
-
detail_logging = ("sdCommon", "fixDepartments")
|
|
36
|
-
for name in logging.root.manager.loggerDict:
|
|
37
|
-
if name in detail_logging:
|
|
38
|
-
logging.getLogger(name).setLevel(LOG_LEVEL)
|
|
39
|
-
else:
|
|
40
|
-
logging.getLogger(name).setLevel(logging.ERROR)
|
|
41
|
-
|
|
42
|
-
logging.basicConfig(
|
|
43
|
-
format="%(levelname)s %(asctime)s %(name)s %(message)s",
|
|
44
|
-
level=LOG_LEVEL,
|
|
45
|
-
stream=sys.stdout,
|
|
46
|
-
)
|
|
31
|
+
logger = structlog.get_logger(__name__)
|
|
47
32
|
|
|
48
33
|
|
|
49
34
|
class FixDepartments:
|
|
@@ -61,12 +46,10 @@ class FixDepartments:
|
|
|
61
46
|
try:
|
|
62
47
|
self.org_uuid = self.helper.read_organisation()
|
|
63
48
|
except requests.exceptions.RequestException as e:
|
|
64
|
-
logger.error(e)
|
|
65
|
-
print(e)
|
|
49
|
+
logger.error("Problem getting the MO organization", err=e)
|
|
66
50
|
exit()
|
|
67
51
|
except json.decoder.JSONDecodeError as e:
|
|
68
|
-
logger.error(e)
|
|
69
|
-
print(e)
|
|
52
|
+
logger.error("Problem decoding response JSON", err=e)
|
|
70
53
|
exit()
|
|
71
54
|
|
|
72
55
|
logger.info("Read org_unit types")
|
|
@@ -115,7 +98,7 @@ class FixDepartments:
|
|
|
115
98
|
parent_uuid: The parent UUID of the department in SD
|
|
116
99
|
"""
|
|
117
100
|
logger.info(
|
|
118
|
-
|
|
101
|
+
"Create department", sd_dep_uuid=department["DepartmentUUIDIdentifier"]
|
|
119
102
|
)
|
|
120
103
|
|
|
121
104
|
effective_parent_uuid = (
|
|
@@ -126,21 +109,18 @@ class FixDepartments:
|
|
|
126
109
|
if unit_level["user_key"] == department["DepartmentLevelIdentifier"]:
|
|
127
110
|
unit_level_uuid = unit_level["uuid"]
|
|
128
111
|
|
|
129
|
-
logger.debug("SD department
|
|
112
|
+
logger.debug("SD department", department=department)
|
|
130
113
|
payload = sd_payloads.create_single_org_unit(
|
|
131
114
|
department=department,
|
|
132
115
|
unit_type=self.unit_type["uuid"],
|
|
133
116
|
unit_level=unit_level_uuid,
|
|
134
117
|
parent=effective_parent_uuid,
|
|
135
118
|
)
|
|
136
|
-
logger.debug("Create
|
|
137
|
-
if self.dry_run:
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
response.raise_for_status()
|
|
142
|
-
logger.info("Created unit {}".format(department["DepartmentIdentifier"]))
|
|
143
|
-
logger.debug("Create response status: {}".format(response.status_code))
|
|
119
|
+
logger.debug("Create MO department (ou/create)", payload=payload)
|
|
120
|
+
if not self.dry_run:
|
|
121
|
+
response = self.helper._mo_post("ou/create", payload)
|
|
122
|
+
response.raise_for_status()
|
|
123
|
+
logger.info("Created unit")
|
|
144
124
|
|
|
145
125
|
def _create_org_unit_if_missing_in_mo(
|
|
146
126
|
self, department: OrderedDict, parent_uuid: Optional[str]
|
|
@@ -191,14 +171,15 @@ class FixDepartments:
|
|
|
191
171
|
if unit_level["user_key"] == department_level_identifier:
|
|
192
172
|
unit_level_uuid = unit_level["uuid"]
|
|
193
173
|
if unit_level_uuid is None:
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
174
|
+
logger.exception(
|
|
175
|
+
"Unknown department level!!",
|
|
176
|
+
department_level_identifier=department_level_identifier,
|
|
177
|
+
)
|
|
178
|
+
raise Exception("Unknown department level!!")
|
|
197
179
|
|
|
198
180
|
parent = parent_uuid if parent_uuid is not None else self.org_uuid
|
|
199
181
|
|
|
200
|
-
|
|
201
|
-
logger.info(msg.format(from_date, parent))
|
|
182
|
+
logger.info("Unit parent at from_date", from_date=from_date, parent_uuid=parent)
|
|
202
183
|
|
|
203
184
|
payload = sd_payloads.edit_org_unit(
|
|
204
185
|
user_key=shortname,
|
|
@@ -210,16 +191,14 @@ class FixDepartments:
|
|
|
210
191
|
from_date=from_date,
|
|
211
192
|
to_date=to_date,
|
|
212
193
|
)
|
|
213
|
-
logger.debug("Edit payload to fix unit
|
|
214
|
-
if self.dry_run:
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
else:
|
|
222
|
-
response.raise_for_status()
|
|
194
|
+
logger.debug("Edit payload to fix unit (details/edit)", payload=payload)
|
|
195
|
+
if not self.dry_run:
|
|
196
|
+
response = self.helper._mo_post("details/edit", payload)
|
|
197
|
+
logger.debug("Edit response status: {}".format(response.status_code))
|
|
198
|
+
if response.status_code == 400:
|
|
199
|
+
assert response.text.find("raise to a new registration") > 0
|
|
200
|
+
else:
|
|
201
|
+
response.raise_for_status()
|
|
223
202
|
|
|
224
203
|
def fix_department(self, unit_uuid: str, validity_date: datetime.date) -> None:
|
|
225
204
|
"""
|
|
@@ -228,8 +207,7 @@ class FixDepartments:
|
|
|
228
207
|
:param validity_date: The validity date to read the department info from SD.
|
|
229
208
|
"""
|
|
230
209
|
|
|
231
|
-
|
|
232
|
-
logger.info(msg.format(unit_uuid, validity_date))
|
|
210
|
+
logger.info("Fix department", unit_uuid=unit_uuid, validity_date=validity_date)
|
|
233
211
|
validity = {
|
|
234
212
|
"from_date": validity_date.strftime("%d.%m.%Y"),
|
|
235
213
|
"to_date": datetime_to_sd_date(parse_datetime(SD_INFINITY)),
|
|
@@ -318,8 +296,11 @@ class FixDepartments:
|
|
|
318
296
|
relevant_engagement = mo_eng
|
|
319
297
|
|
|
320
298
|
if relevant_engagement is None:
|
|
321
|
-
|
|
322
|
-
|
|
299
|
+
logger.info(
|
|
300
|
+
"Fruitlessly searched for employment_id in MO engagements",
|
|
301
|
+
employment_id=job_id,
|
|
302
|
+
mo_engagements=mo_engagements,
|
|
303
|
+
)
|
|
323
304
|
return relevant_engagement
|
|
324
305
|
|
|
325
306
|
def _read_department_engagements(self, unit_uuid, validity_date):
|
|
@@ -341,8 +322,9 @@ class FixDepartments:
|
|
|
341
322
|
}
|
|
342
323
|
department = self.get_department(sd_validity, uuid=unit_uuid)[0]
|
|
343
324
|
if not department["DepartmentLevelIdentifier"] in too_deep:
|
|
344
|
-
|
|
345
|
-
|
|
325
|
+
logger.info(
|
|
326
|
+
"Enhed regnes ikke som et SD afdelingsniveau", unit_uuid=unit_uuid
|
|
327
|
+
)
|
|
346
328
|
return {}
|
|
347
329
|
|
|
348
330
|
params = {
|
|
@@ -359,7 +341,7 @@ class FixDepartments:
|
|
|
359
341
|
time_deltas = [0, 90, 365]
|
|
360
342
|
|
|
361
343
|
all_people = {}
|
|
362
|
-
logger.debug("Perform GetEmployments,
|
|
344
|
+
logger.debug("Perform GetEmployments", time_deltas=time_deltas)
|
|
363
345
|
for time_delta in time_deltas:
|
|
364
346
|
effective_date = validity_date + datetime.timedelta(days=time_delta)
|
|
365
347
|
params["EffectiveDate"] = (effective_date.strftime("%d.%m.%Y"),)
|
|
@@ -375,7 +357,7 @@ class FixDepartments:
|
|
|
375
357
|
cpr = person["PersonCivilRegistrationIdentifier"]
|
|
376
358
|
if cpr not in all_people:
|
|
377
359
|
all_people[cpr] = person
|
|
378
|
-
logger.debug("Department engagements
|
|
360
|
+
logger.debug("Department engagements", all_people=all_people.keys())
|
|
379
361
|
return all_people
|
|
380
362
|
|
|
381
363
|
def fix_NY_logic(self, unit_uuid, validity_date):
|
|
@@ -397,9 +379,9 @@ class FixDepartments:
|
|
|
397
379
|
mo_unit = self.helper.read_ou(unit_uuid)
|
|
398
380
|
while mo_unit["org_unit_level"]["user_key"] in too_deep:
|
|
399
381
|
mo_unit = mo_unit["parent"]
|
|
400
|
-
logger.debug("Parent unit
|
|
382
|
+
logger.debug("Parent unit", parent_uuid=mo_unit["uuid"])
|
|
401
383
|
destination_unit = mo_unit["uuid"]
|
|
402
|
-
logger.debug("Destination found
|
|
384
|
+
logger.debug("Destination found", destination_unit=destination_unit)
|
|
403
385
|
|
|
404
386
|
all_people = self._read_department_engagements(unit_uuid, validity_date)
|
|
405
387
|
|
|
@@ -414,9 +396,7 @@ class FixDepartments:
|
|
|
414
396
|
|
|
415
397
|
for employment in person["Employment"]:
|
|
416
398
|
job_id = employment["EmploymentIdentifier"]
|
|
417
|
-
|
|
418
|
-
print(msg.format(job_id))
|
|
419
|
-
logger.info(msg.format(job_id))
|
|
399
|
+
logger.info("Checking job-id", employment_id=job_id)
|
|
420
400
|
sd_uuid = employment["EmploymentDepartment"]["DepartmentUUIDIdentifier"]
|
|
421
401
|
if not sd_uuid == unit_uuid:
|
|
422
402
|
# This employment is not from the current department,
|
|
@@ -426,8 +406,9 @@ class FixDepartments:
|
|
|
426
406
|
|
|
427
407
|
mo_person = self.helper.read_user(user_cpr=cpr, org_uuid=self.org_uuid)
|
|
428
408
|
if mo_person is None:
|
|
429
|
-
|
|
430
|
-
|
|
409
|
+
logger.warning(
|
|
410
|
+
"MO person is None for employment_id", employment_id=job_id
|
|
411
|
+
)
|
|
431
412
|
continue
|
|
432
413
|
|
|
433
414
|
mo_engagements = self.helper.read_user_engagement(
|
|
@@ -438,8 +419,11 @@ class FixDepartments:
|
|
|
438
419
|
# future rows.
|
|
439
420
|
mo_engagement = self._find_engagement(mo_engagements, job_id)
|
|
440
421
|
if mo_engagement is None:
|
|
441
|
-
|
|
442
|
-
|
|
422
|
+
logger.warning(
|
|
423
|
+
"MO engagement is None",
|
|
424
|
+
employment_id=job_id,
|
|
425
|
+
mo_person_uuid=mo_person["uuid"],
|
|
426
|
+
)
|
|
443
427
|
continue
|
|
444
428
|
for eng in mo_engagements:
|
|
445
429
|
if not eng["uuid"] == mo_engagement["uuid"]:
|
|
@@ -460,12 +444,12 @@ class FixDepartments:
|
|
|
460
444
|
"validity": eng["validity"],
|
|
461
445
|
}
|
|
462
446
|
payload = sd_payloads.engagement(data, mo_engagement)
|
|
463
|
-
logger.debug(
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
447
|
+
logger.debug(
|
|
448
|
+
"Move engagement payload (details/edit)", payload=payload
|
|
449
|
+
)
|
|
450
|
+
if not self.dry_run:
|
|
451
|
+
response = self.helper._mo_post("details/edit", payload)
|
|
452
|
+
mora_assert(response)
|
|
469
453
|
|
|
470
454
|
def get_parent(self, unit_uuid, validity_date) -> Optional[str]:
|
|
471
455
|
"""
|
|
@@ -489,8 +473,11 @@ class FixDepartments:
|
|
|
489
473
|
"GetDepartmentParent20190701", settings=self.settings, params=params
|
|
490
474
|
)
|
|
491
475
|
if "DepartmentParent" not in parent_response:
|
|
492
|
-
|
|
493
|
-
|
|
476
|
+
logger.error(
|
|
477
|
+
"No parent found at this date",
|
|
478
|
+
unit_uuid=unit_uuid,
|
|
479
|
+
validity_date=validity_date,
|
|
480
|
+
)
|
|
494
481
|
raise NoCurrentValdityException()
|
|
495
482
|
parent = parent_response["DepartmentParent"]["DepartmentUUIDIdentifier"]
|
|
496
483
|
if parent == self.institution_uuid:
|
|
@@ -528,8 +515,7 @@ class FixDepartments:
|
|
|
528
515
|
uuid = department["DepartmentUUIDIdentifier"]
|
|
529
516
|
department_branch.append((shortname, uuid))
|
|
530
517
|
current_uuid = self.get_parent(current_uuid, validity_date=validity_date)
|
|
531
|
-
|
|
532
|
-
logger.debug(msg.format(shortname, uuid, level))
|
|
518
|
+
logger.debug("Department", shortname=shortname, uuid=uuid, level=level)
|
|
533
519
|
return department_branch
|
|
534
520
|
|
|
535
521
|
def sd_uuid_from_short_code(self, validity_date, shortname):
|
|
@@ -543,17 +529,17 @@ class FixDepartments:
|
|
|
543
529
|
|
|
544
530
|
def unit_fixer(ou_uuid: UUID):
|
|
545
531
|
"""Sync SD department information to MO."""
|
|
546
|
-
setup_logging()
|
|
547
|
-
|
|
548
532
|
settings = get_changed_at_settings()
|
|
533
|
+
setup_logging(settings.log_level)
|
|
534
|
+
|
|
549
535
|
unit_fixer = FixDepartments(settings)
|
|
550
536
|
|
|
551
537
|
today = datetime.datetime.today().date()
|
|
552
538
|
|
|
553
|
-
logger.info(
|
|
539
|
+
logger.info("Calling fix_departments", ou_uuid=ou_uuid)
|
|
554
540
|
unit_fixer.fix_department(str(ou_uuid), today)
|
|
555
541
|
|
|
556
|
-
logger.info(
|
|
542
|
+
logger.info("Calling fix_NY_logic", ou_uuid=ou_uuid)
|
|
557
543
|
unit_fixer.fix_NY_logic(str(ou_uuid), today)
|
|
558
544
|
|
|
559
545
|
logger.info("unit_fixer done!")
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import logging
|
|
2
|
+
import re
|
|
3
|
+
from enum import Enum
|
|
4
|
+
|
|
5
|
+
import structlog
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
CPR_REGEX = re.compile("[0-9]{10}")
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class LogLevel(str, Enum):
|
|
12
|
+
DEBUG = "DEBUG"
|
|
13
|
+
INFO = "INFO"
|
|
14
|
+
WARNING = "WARNING"
|
|
15
|
+
ERROR = "ERROR"
|
|
16
|
+
CRITICAL = "CRITICAL"
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def anonymize_cpr(cpr: str) -> str:
|
|
20
|
+
assert CPR_REGEX.match(cpr)
|
|
21
|
+
return cpr[:6] + "xxxx"
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
def setup_logging(log_level: LogLevel) -> None:
|
|
25
|
+
log_level_value = logging.getLevelName(log_level.value)
|
|
26
|
+
structlog.configure(
|
|
27
|
+
wrapper_class=structlog.make_filtering_bound_logger(log_level_value)
|
|
28
|
+
)
|