🚧 [#504] Refactor code after rebasing

Author: SilviaAmAm

backend/src/openarchiefbeheer/destruction/destruction_report.py

@@ -13,7 +13,8 @@
     destruction_list_deletion_triggered,
     destruction_list_reviewed,
 )
-from openarchiefbeheer.logging.utils import get_event_template, get_readable_timestamp
+from openarchiefbeheer.logging.utils import get_event_template
+from openarchiefbeheer.utils.formatting import get_readable_timestamp
 from openarchiefbeheer.zaken.api.constants import ZAAK_METADATA_FIELDS_MAPPINGS
 
 from .constants import InternalStatus, ListItemStatus
@@ -61,20 +62,20 @@ def add_general_info_table(self, worksheet: Worksheet, start_row: int = 0) -> No
         worksheet.write_row(start_row, 0, column_names)
 
         log = (
-            TimelineLog.objects.for_object(self)
+            TimelineLog.objects.for_object(self.destruction_list)
             .filter(template=get_event_template(destruction_list_deletion_triggered))
             .order_by("timestamp")
             .last()
         )
-        number_of_cases = self.items.filter(
+        number_of_cases = self.destruction_list.items.filter(
             processing_status=InternalStatus.succeeded,
             status=ListItemStatus.suggested,
         ).count()
 
         general_info_data = [
-            get_readable_timestamp(self.end),
-            format_user(log.extra_data["user"]),
-            format_user_groups(log.extra_data["user_groups"]),
+            get_readable_timestamp(self.destruction_list.end),
+            format_user(log.extra_data["user"]) if log else "",
+            format_user_groups(log.extra_data["user_groups"]) if log else "",
             number_of_cases,
         ]
         worksheet.write_row(start_row + 1, 0, general_info_data)

backend/src/openarchiefbeheer/logging/utils.py

@@ -1,18 +1,7 @@
-from datetime import datetime
 from typing import Callable
 
-from django.utils import timezone
-
 from .logevent import TEMPLATE_FORMAT
 
 
 def get_event_template(logging_func: Callable) -> str:
     return TEMPLATE_FORMAT % {"event": logging_func.__name__}
-
-
-def get_readable_timestamp(
-    timestamp: datetime, separator: str = " ", timespec: str = "minutes"
-) -> str:
-    return timestamp.astimezone(tz=timezone.get_default_timezone()).isoformat(
-        sep=separator, timespec=timespec
-    )

backend/src/openarchiefbeheer/utils/formatting.py

@@ -0,0 +1,11 @@
+from datetime import datetime
+
+from django.utils import timezone
+
+
+def get_readable_timestamp(
+    timestamp: datetime, separator: str = " ", timespec: str = "minutes"
+) -> str:
+    return timestamp.astimezone(tz=timezone.get_default_timezone()).isoformat(
+        sep=separator, timespec=timespec
+    )

backend/src/openarchiefbeheer/zaken/api/constants.py

@@ -5,10 +5,10 @@
     {"name": "Zaaktype Identificatie", "path": "zaaktype.identificatie"},
     {"name": "Zaak Identificatie", "path": "identificatie"},
     {"name": "Zaak Startdatum", "path": "startdatum"},
-    {"name": "Zaak Einddatum", "path": "omschrijving"},
+    {"name": "Zaak Einddatum", "path": "einddatum"},
     {
         "name": "Selectielijst Procestype",
         "path": "zaaktype.selectielijst_procestype.naam",
     },
-    {"name": "Resultaat", "path": "resultaattype.omschrijving"},
+    {"name": "Resultaat", "path": "resultaat.resultaattype.omschrijving"},
 ]