itk-dev-shared-components 1.3.0__tar.gz → 2.0.0__tar.gz

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itk_dev_shared_components
-Version: 1.3.0
+Version: 2.0.0
 Summary: Shared components to use in RPA projects
 Author-email: ITK Development <itk-rpa@mkb.aarhus.dk>
 Project-URL: Homepage, https://github.com/itk-dev-rpa/itk-dev-shared-components

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/itk_dev_shared_components/kmd_nova/nova_cases.py

@@ -8,7 +8,7 @@ import urllib.parse
 import requests
 
 from itk_dev_shared_components.kmd_nova.authentication import NovaAccess
-from itk_dev_shared_components.kmd_nova.nova_objects import NovaCase, CaseParty, JournalNote
+from itk_dev_shared_components.kmd_nova.nova_objects import NovaCase, CaseParty, JournalNote, Caseworker, Department
 from itk_dev_shared_components.kmd_nova.util import datetime_from_iso_string
 
 
@@ -83,7 +83,30 @@ def get_cases(nova_access: NovaAccess, cpr: str = None, case_number: str = None,
             },
             "sensitivity": {
                 "sensitivity": True
-            }
+            },
+            "caseworker": {
+                "kspIdentity": {
+                    "novaUserId": True,
+                    "fullName": True,
+                    "racfId": True
+                }
+            },
+            "responsibleDepartment": {
+                "losIdentity": {
+                    "novaUnitId": True,
+                    "administrativeUnitId": True,
+                    "fullName": True,
+                    "userKey": True
+                }
+            },
+            "securityUnit": {
+                "losIdentity": {
+                    "novaUnitId": True,
+                    "administrativeUnitId": True,
+                    "fullName": True,
+                    "userKey": True
+                }
+            },
         }
     }
 
@@ -98,6 +121,7 @@ def get_cases(nova_access: NovaAccess, cpr: str = None, case_number: str = None,
     # Convert json to NovaCase objects
     cases = []
     for case_dict in response.json()['cases']:
+        security_unit, responsible_department = _extract_departments(case_dict)
         case = NovaCase(
             uuid = case_dict['common']['uuid'],
             title = case_dict['caseAttributes']['title'],
@@ -110,7 +134,10 @@ def get_cases(nova_access: NovaAccess, cpr: str = None, case_number: str = None,
             note_count = case_dict['numberOfJournalNotes'],
             kle_number = case_dict['caseClassification']['kleNumber']['code'],
             proceeding_facet = case_dict['caseClassification']['proceedingFacet']['code'],
-            sensitivity = case_dict["sensitivity"]["sensitivity"]
+            sensitivity = case_dict["sensitivity"]["sensitivity"],
+            caseworker = _extract_case_worker(case_dict),
+            security_unit=security_unit,
+            responsible_department=responsible_department
         )
 
         cases.append(case)
@@ -118,6 +145,49 @@ def get_cases(nova_access: NovaAccess, cpr: str = None, case_number: str = None,
     return cases
 
 
+def _extract_departments(case_dict: dict) -> tuple[Department, Department]:
+    """Extract the departments from a HTTP request response.
+
+    Args:
+        case_dict: The dictionary describing the case.
+
+    Returns:
+        The security unit and the responsible department.
+    """
+    security_unit = Department(
+        id=case_dict['securityUnit']['losIdentity']['administrativeUnitId'],
+        name=case_dict['securityUnit']['losIdentity']['fullName'],
+        user_key=case_dict['securityUnit']['losIdentity']['userKey']
+    )
+
+    responsible_department = Department(
+        id=case_dict['responsibleDepartment']['losIdentity']['administrativeUnitId'],
+        name=case_dict['responsibleDepartment']['losIdentity']['fullName'],
+        user_key=case_dict['responsibleDepartment']['losIdentity']['userKey']
+    )
+
+    return security_unit, responsible_department
+
+
+def _extract_case_worker(case_dict: dict) -> Caseworker | None:
+    """Extract the case worker from a HTTP request response.
+
+    Args:
+        case_dict: The dictionary describing the case.
+
+    Returns:
+        A case worker object describing the case worker if any.
+    """
+    if 'caseworker' in case_dict:
+        return Caseworker(
+            uuid = case_dict['caseworker']['kspIdentity']['novaUserId'],
+            name = case_dict['caseworker']['kspIdentity']['fullName'],
+            ident = case_dict['caseworker']['kspIdentity']['racfId']
+        )
+
+    return None
+
+
 def _extract_case_parties(case_dict: dict) -> list[CaseParty]:
     """Extract the case parties from a HTTP request response.
 
@@ -164,7 +234,7 @@ def _extract_journal_notes(case_dict: dict) -> list:
     return notes
 
 
-def add_case(case: NovaCase, nova_access: NovaAccess, security_unit_id: int = 818485, security_unit_name: str = "Borgerservice"):
+def add_case(case: NovaCase, nova_access: NovaAccess):
     """Add a case to KMD Nova. The case will be created as 'Active'.
 
     Args:
@@ -208,8 +278,16 @@ def add_case(case: NovaCase, nova_access: NovaAccess, security_unit_id: int = 81
         ],
         "securityUnit": {
             "losIdentity": {
-                "administrativeUnitId": security_unit_id,
-                "fullName": security_unit_name,
+                "administrativeUnitId": case.security_unit.id,
+                "fullName": case.security_unit.name,
+                "userKey": case.security_unit.user_key
+            }
+        },
+        "responsibleDepartment": {
+            "losIdentity": {
+                "administrativeUnitId": case.responsible_department.id,
+                "fullName": case.responsible_department.name,
+                "userKey": case.responsible_department.user_key
             }
         },
         "SensitivityCtrlBy": "Bruger",
@@ -222,6 +300,14 @@ def add_case(case: NovaCase, nova_access: NovaAccess, security_unit_id: int = 81
         "AvailabilityCtrlBy": "Regler"
     }
 
+    if case.caseworker:
+        payload['caseworker'] = {
+            "kspIdentity": {
+                "racfId": case.caseworker.ident,
+                "fullName": case.caseworker.name
+            }
+        }
+
     headers = {'Content-Type': 'application/json', 'Authorization': f"Bearer {nova_access.get_bearer_token()}"}
 
     response = requests.post(url, params=params, headers=headers, json=payload, timeout=60)

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/itk_dev_shared_components/kmd_nova/nova_objects.py

@@ -8,6 +8,22 @@ from datetime import datetime
 # pylint: disable=too-many-instance-attributes
 
 
+@dataclass(slots=True, kw_only=True)
+class Department:
+    """A dataclass representing a department in a KMD Nova case."""
+    id: int
+    name: str
+    user_key: str
+
+
+@dataclass(slots=True, kw_only=True)
+class Caseworker:
+    """A dataclass representing a caseworker in a KMD Nova case."""
+    uuid: str
+    name: str
+    ident: str
+
+
 @dataclass(slots=True, kw_only=True)
 class CaseParty:
     """A dataclass representing a case party in a KMD Nova case."""
@@ -51,8 +67,7 @@ class Task:
     uuid: str
     title: str
     description: Optional[str] = None
-    case_worker_ident: Optional[str] = None
-    case_worker_uuid: str
+    caseworker: Caseworker
     status_code: Literal['N', 'S', 'F']  # Not Started, Started, Finished
     deadline: datetime
     created_date: Optional[datetime] = None
@@ -70,8 +85,11 @@ class NovaCase:
     active_code: Optional[str] = None
     progress_state: Literal["Opstaaet", "Oplyst", "Afgjort", "Bestilt", "Udfoert", "Afsluttet"]
     case_parties: list[CaseParty]
+    caseworker: Optional[Caseworker] = None
     document_count: Optional[int] = 0
     note_count: Optional[int] = 0
     kle_number: str
     proceeding_facet: str
     sensitivity: Literal["Fortrolige", "IkkeFortrolige", "SærligFølsomme", "Følsomme"]
+    responsible_department: Department
+    security_unit: Department

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/itk_dev_shared_components/kmd_nova/nova_tasks.py

@@ -6,7 +6,7 @@ import urllib.parse
 import requests
 
 from itk_dev_shared_components.kmd_nova.authentication import NovaAccess
-from itk_dev_shared_components.kmd_nova.nova_objects import Task
+from itk_dev_shared_components.kmd_nova.nova_objects import Task, Caseworker
 from itk_dev_shared_components.kmd_nova.util import datetime_from_iso_string, datetime_to_iso_string
 
 
@@ -35,7 +35,7 @@ def attach_task_to_case(case_uuid: str, task: Task, nova_access: NovaAccess) ->
         "caseUuid": case_uuid,
         "title": task.title,
         "description": task.description,  # Optional
-        "caseworkerPersonId": task.case_worker_uuid,  # Optional
+        "caseworkerPersonId": task.caseworker.uuid,  # Optional
         "statusCode": task.status_code,
         "deadline": datetime_to_iso_string(task.deadline),
         "startDate": datetime_to_iso_string(task.started_date),  # Optional
@@ -89,8 +89,7 @@ def get_tasks(case_uuid: str, nova_access: NovaAccess, limit: int = 100) -> list
             uuid = task_dict['taskUuid'],
             title = task_dict['taskTitle'],
             description = task_dict.get('taskDescription'),
-            case_worker_ident = task_dict['caseWorker']['ident'],
-            case_worker_uuid = task_dict['caseWorker']['id'],
+            caseworker = _extract_caseworker(task_dict),
             status_code = task_dict['taskStatusCode'],
             deadline = datetime_from_iso_string(task_dict.get('taskDeadline')),
             created_date = datetime_from_iso_string(task_dict.get('taskCreateDate')),
@@ -102,6 +101,25 @@ def get_tasks(case_uuid: str, nova_access: NovaAccess, limit: int = 100) -> list
     return tasks
 
 
+def _extract_caseworker(task_dict: dict) -> Caseworker | None:
+    """Extract the case worker from a HTTP request response.
+
+    Args:
+        case_dict: The dictionary describing the task.
+
+    Returns:
+        A case worker object describing the case worker if any.
+    """
+    if 'caseWorker' in task_dict:
+        return Caseworker(
+            uuid = task_dict['caseWorker']['id'],
+            ident = task_dict['caseWorker']['ident'],
+            name = task_dict['caseWorker']['name']
+        )
+
+    return None
+
+
 def update_task(task: Task, case_uuid: str, nova_access: NovaAccess):
     """Update a task that already exists in KMD Nova with new
     information.
@@ -125,7 +143,7 @@ def update_task(task: Task, case_uuid: str, nova_access: NovaAccess):
         "caseUuid": case_uuid,
         "title": task.title,
         "description": task.description,
-        "caseworkerPersonId": task.case_worker_uuid,
+        "caseworkerPersonId": task.caseworker.uuid,
         "statusCode": task.status_code,
         "deadline": datetime_to_iso_string(task.deadline),
         "startDate": datetime_to_iso_string(task.started_date),

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/itk_dev_shared_components.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: itk_dev_shared_components
-Version: 1.3.0
+Version: 2.0.0
 Summary: Shared components to use in RPA projects
 Author-email: ITK Development <itk-rpa@mkb.aarhus.dk>
 Project-URL: Homepage, https://github.com/itk-dev-rpa/itk-dev-shared-components

{itk_dev_shared_components-1.3.0 → itk_dev_shared_components-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itk_dev_shared_components"
-version = "1.3.0"
+version = "2.0.0"
 authors = [
   { name="ITK Development", email="itk-rpa@mkb.aarhus.dk" },
 ]