dipex 4.5.0__tar.gz → 4.5.2__tar.gz

{dipex-4.5.0 → dipex-4.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dipex
-Version: 4.5.0
+Version: 4.5.2
 Summary: OS2mo-data-import-and-export
 Home-page: https://magenta.dk/
 License: MPL-2.0

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/sdlon/date_utils.py

@@ -35,7 +35,7 @@ def format_date(date_time: datetime) -> str:
     return date_time.strftime("%Y-%m-%d").zfill(10)
 
 
-def parse_date(date_str: str) -> datetime:
+def parse_datetime(date_str: str) -> datetime:
     return datetime.strptime(date_str, "%Y-%m-%d")
 
 
@@ -71,15 +71,15 @@ def _get_employment_from_date(employment: OrderedDict) -> datetime:
     )
 
     return max(
-        parse_date(employment_date),
-        parse_date(employment_department_date),
-        parse_date(employment_status_date),
-        parse_date(profession_date),
-        parse_date(working_time_date),
+        parse_datetime(employment_date),
+        parse_datetime(employment_department_date),
+        parse_datetime(employment_status_date),
+        parse_datetime(profession_date),
+        parse_datetime(working_time_date),
     )
 
 
-def get_employment_dates(employment: OrderedDict) -> Tuple[datetime, datetime]:
+def get_employment_datetimes(employment: OrderedDict) -> Tuple[datetime, datetime]:
     """
     Get the "from" and "to" date from the SD employment
 
@@ -93,17 +93,17 @@ def get_employment_dates(employment: OrderedDict) -> Tuple[datetime, datetime]:
     status = EmploymentStatus(employment["EmploymentStatus"]["EmploymentStatusCode"])
 
     if status in EmploymentStatus.let_go():
-        date_from = parse_date(employment["EmploymentDate"])
+        datetime_from = parse_datetime(employment["EmploymentDate"])
         termination_date = str(
             sd_to_mo_termination_date(employment["EmploymentStatus"]["ActivationDate"])
         )
-        date_to = parse_date(termination_date)
-        return date_from, date_to
+        datetime_to = parse_datetime(termination_date)
+        return datetime_from, datetime_to
 
-    date_from = _get_employment_from_date(employment)
-    date_to = parse_date(employment["EmploymentStatus"]["DeactivationDate"])
+    datetime_from = _get_employment_from_date(employment)
+    datetime_to = parse_datetime(employment["EmploymentStatus"]["DeactivationDate"])
 
-    return date_from, date_to
+    return datetime_from, datetime_to
 
 
 # TODO: Create "MoValidity" and "SdValidity" classes based on the RA Models

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/sdlon/fix_departments.py

@@ -14,7 +14,7 @@ from os2mo_helpers.mora_helpers import MoraHelper
 
 from .date_utils import (
     datetime_to_sd_date,
-    parse_date,
+    parse_datetime,
     SD_INFINITY,
     MO_INFINITY,
     format_date,
@@ -221,14 +221,14 @@ class FixDepartments:
         logger.info(msg.format(unit_uuid, validity_date))
         validity = {
             "from_date": validity_date.strftime("%d.%m.%Y"),
-            "to_date": datetime_to_sd_date(parse_date(SD_INFINITY)),
+            "to_date": datetime_to_sd_date(parse_datetime(SD_INFINITY)),
         }
 
         departments = self.get_department(validity, uuid=unit_uuid)
         for department in departments:
             # Get the UUID of the parent unit
             parent_lookup_date = max(
-                validity_date.date(), parse_date(department["ActivationDate"]).date()
+                validity_date, parse_datetime(department["ActivationDate"]).date()
             )
             parent_uuid = self.get_parent(unit_uuid, parent_lookup_date)
 

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/sdlon/sd_changed_at.py

@@ -686,7 +686,7 @@ class ChangeAtSD:
         logger.debug(msg.format(job_id, org_unit, validity))
         too_deep = self.settings.sd_import_too_deep
         # Move users and make associations according to NY logic
-        today = datetime.datetime.today()
+        today = datetime.datetime.today().date()
         ou_info = self.helper.read_ou(org_unit, use_cache=False)
         if "status" in ou_info:
             # This unit does not exist, read its state in the not-too
@@ -699,7 +699,7 @@ class ChangeAtSD:
                 #       is eliminated, right now it serves to ensure solely that
                 #       the SD integration does not crash due to the bad code.
                 #       The solution will then be to fix all the issues using SDTool.
-                logger.warning("Unable to apply NY-logic", org_unit)
+                logger.warning("Unable to apply NY-logic on unit %s", org_unit)
                 return org_unit
 
         if ou_info["org_unit_level"]["user_key"] in too_deep:

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/sdlon/sd_importer.py

@@ -24,8 +24,8 @@ from .config import get_changed_at_settings
 from .config import get_importer_settings
 from .config import ImporterSettings
 from .date_utils import format_date, date_to_datetime
-from .date_utils import get_employment_dates
-from .date_utils import parse_date
+from .date_utils import get_employment_datetimes
+from .date_utils import parse_datetime
 from .models import JobFunction
 from .sd_common import calc_employment_id
 from .sd_common import EmploymentStatus
@@ -631,17 +631,17 @@ class SdImport:
             emp_dep = employment["EmploymentDepartment"]
             unit = emp_dep["DepartmentUUIDIdentifier"]
 
-            date_from_engagement, date_to = get_employment_dates(employment)
+            datetime_from_engagement, datetime_to = get_employment_datetimes(employment)
             # Use org unit start date if engagement starts *before*
             # the org unit start date
-            org_unit_date_from = parse_date(
+            org_unit_datetime_from = parse_datetime(
                 self.importer.organisation_units[unit].date_from
             )
-            date_from = max(date_from_engagement, org_unit_date_from)
+            datetime_from = max(datetime_from_engagement, org_unit_datetime_from)
 
-            date_from_str = format_date(date_from)
-            date_to_str = format_date(date_to)
-            if date_to == datetime.datetime(9999, 12, 31, 0, 0):
+            date_from_str = format_date(datetime_from)
+            date_to_str = format_date(datetime_to)
+            if datetime_to == datetime.datetime(9999, 12, 31, 0, 0):
                 date_to_str = None
 
             sd_employment_id = employment_id["id"]
@@ -650,7 +650,7 @@ class SdImport:
                 f"to: {date_to_str}"
             )
 
-            if date_to <= date_from:
+            if datetime_to <= datetime_from:
                 logger.warning(f"Skip creating employment for id: {sd_employment_id}")
                 continue
 
@@ -700,15 +700,15 @@ class SdImport:
             # Add historic dummy engagement if the start date of the engagement
             # is older than the start date of the corresponding org unit
             # (see https://redmine.magenta-aps.dk/issues/51898)
-            if date_from_engagement < org_unit_date_from:
-                dummy_eng_date_to = org_unit_date_from - datetime.timedelta(days=1)
+            if datetime_from_engagement < org_unit_datetime_from:
+                dummy_eng_date_to = org_unit_datetime_from - datetime.timedelta(days=1)
                 dummy_eng_date_to_str = format_date(dummy_eng_date_to)
                 self.importer.add_engagement(
                     employee=cpr,
                     organisation_unit=self.historic_org_unit_uuid,
                     job_function_ref=HISTORIC,
                     engagement_type_ref="historisk",
-                    date_from=format_date(date_from_engagement),
+                    date_from=format_date(datetime_from_engagement),
                     date_to=dummy_eng_date_to_str,
                 )
 

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/tests/test_date_utils.py

@@ -15,7 +15,7 @@ from sdlon.date_utils import format_date
 from sdlon.date_utils import datetime_to_sd_date
 from sdlon.date_utils import gen_cut_dates
 from sdlon.date_utils import gen_date_intervals
-from sdlon.date_utils import get_employment_dates
+from sdlon.date_utils import get_employment_datetimes
 from sdlon.date_utils import is_midnight
 from sdlon.date_utils import sd_to_mo_termination_date
 from sdlon.date_utils import to_midnight
@@ -158,7 +158,7 @@ def test_get_from_date_always_return_date():
 def test_get_employment_from_date_when_status_is_leave(
     emp_date,
     act_date,
-    exp_date,
+    exp_datetime,
 ):
     employment = OrderedDict(
         [
@@ -192,9 +192,9 @@ def test_get_employment_from_date_when_status_is_leave(
         ]
     )
 
-    date_from, date_to = get_employment_dates(employment)
+    datetime_from, datetime_to = get_employment_datetimes(employment)
 
-    assert date_from == exp_date
+    assert datetime_from == exp_datetime
 
 
 @parameterized.expand(
@@ -205,7 +205,7 @@ def test_get_employment_from_date_when_status_is_leave(
 )
 def test_get_employment_to_date_when_status_is_leave(
     deactivation_date,
-    exp_date,
+    exp_datetime,
 ):
     employment = OrderedDict(
         [
@@ -239,9 +239,9 @@ def test_get_employment_to_date_when_status_is_leave(
         ]
     )
 
-    date_from, date_to = get_employment_dates(employment)
+    datetime_from, datetime_to = get_employment_datetimes(employment)
 
-    assert date_to == exp_date
+    assert datetime_to == exp_datetime
 
 
 @parameterized.expand(

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/tests/test_fix_departments.py

@@ -110,7 +110,7 @@ class TestFixDepartment(TestCase):
         instance._create_org_unit_if_missing_in_mo = MagicMock(return_value=False)
         with mock_sd_lookup("GetDepartment20111201", {}, {}):
             instance.fix_department(
-                "99999999-9999-9999-9999-999999999999", datetime(2020, 1, 1)
+                "99999999-9999-9999-9999-999999999999", date(2020, 1, 1)
             )
             instance.helper._mo_post.assert_called_with(
                 "details/edit",
@@ -153,7 +153,7 @@ class TestFixDepartment(TestCase):
             ]
         }
         with mock_sd_lookup("GetDepartment20111201", dict(), sd_response):
-            instance.fix_department("uuid", datetime(2020, 1, 1))
+            instance.fix_department("uuid", date(2020, 1, 1))
 
         call_list = instance.helper._mo_post.mock_calls
 
@@ -203,7 +203,7 @@ class TestFixDepartment(TestCase):
         # Act
         with mock_sd_lookup("GetDepartment20111201", dict(), dict()):
             instance.fix_department(
-                "99999999-9999-9999-9999-999999999999", datetime.today()
+                "99999999-9999-9999-9999-999999999999", datetime.today().date()
             )
 
         # Assert
@@ -230,7 +230,7 @@ class TestFixDepartment(TestCase):
 
         unit_uuid = "11111111-1111-1111-1111-111111111111"
         parent_uuid = "22222222-2222-2222-2222-222222222222"
-        today = datetime.today()
+        today = datetime.today().date()
 
         instance.get_parent = MagicMock(side_effect=[parent_uuid, None])
         instance.get_department = MagicMock(
@@ -303,8 +303,8 @@ class TestFixDepartment(TestCase):
 
         get_parent_calls = instance.get_parent.call_args_list
         assert get_parent_calls == [
-            call("11111111-1111-1111-1111-111111111111", today.date()),
-            call("22222222-2222-2222-2222-222222222222", today.date()),
+            call("11111111-1111-1111-1111-111111111111", today),
+            call("22222222-2222-2222-2222-222222222222", today),
         ]
 
     def test_fix_department_called_recursively(self):
@@ -344,7 +344,7 @@ class TestFixDepartment(TestCase):
         instance._update_org_unit_for_single_sd_dep_registration = MagicMock()
 
         # Act
-        instance.fix_department(str(unit_uuid), datetime(2020, 1, 1))
+        instance.fix_department(str(unit_uuid), date(2020, 1, 1))
 
         # Assert
         create_org_unit_calls = instance._create_org_unit_if_missing_in_mo.mock_calls

{dipex-4.5.0 → dipex-4.5.2}/integrations/SD_Lon/tests/test_sd_changed_at.py

@@ -1,3 +1,4 @@
+import datetime
 import unittest
 import uuid
 from collections import OrderedDict
@@ -1057,6 +1058,22 @@ class Test_sd_changed_at(unittest.TestCase):
             self.assertEqual(params["DeactivationDate"], to_date.strftime("%d.%m.%Y"))
             self.assertEqual(params["DeactivationTime"], to_date.strftime("%H:%M"))
 
+    def test_fix_department_called_with_date(self):
+        # Arrange
+        sd_updater = setup_sd_changed_at()
+        fix_date = datetime.datetime.today() + datetime.timedelta(weeks=80)
+        sd_updater.helper.read_ou.return_value = {"status": "found"}
+
+        # Act
+        sd_updater.apply_NY_logic(
+            "00000000-0000-0000-0000-000000000000", "job_id", None, "person_uuid"
+        )
+
+        # Assert
+        sd_updater.fix_departments_mock.fix_department.assert_called_once_with(
+            "00000000-0000-0000-0000-000000000000", fix_date.date()
+        )
+
 
 def test_read_forced_uuid_use_empty_dict():
     sd_updater = setup_sd_changed_at({"sd_read_forced_uuids": False})

{dipex-4.5.0 → dipex-4.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "DIPEX"
-version = "4.5.0"
+version = "4.5.2"
 authors = ["Magenta ApS <info@magenta.dk>"]
 description = "OS2mo-data-import-and-export"
 license = "MPL-2.0"