[#1788] Process PR feedback

Author: pi-sigma

src/open_inwoner/cms/cases/urls.py

@@ -1,5 +1,4 @@
 from django.urls import path
-from django.views.generic import RedirectView
 
 from open_inwoner.accounts.views.contactmoments import (
     KlantContactMomentDetailView,
@@ -54,7 +53,6 @@
         CaseDocumentUploadFormView.as_view(),
         name="case_detail_document_form",
     ),
-    path("open/", RedirectView.as_view(), name="redirect"),
     path("content/", InnerCaseListView.as_view(), name="cases_content"),
     path("", OuterCaseListView.as_view(), name="index"),
 ]

src/open_inwoner/cms/cases/views/cases.py

@@ -1,34 +1,26 @@
 from django.urls import reverse
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
-from view_breadcrumbs import BaseBreadcrumbMixin
-
 from open_inwoner.htmx.mixins import RequiresHtmxMixin
 from open_inwoner.openzaak.cases import fetch_cases, preprocess_data
 from open_inwoner.openzaak.formapi import fetch_open_submissions
 from open_inwoner.openzaak.models import OpenZaakConfig
+from open_inwoner.openzaak.types import UniformCase
 from open_inwoner.utils.mixins import PaginationMixin
 from open_inwoner.utils.views import CommonPageMixin
 
 from .mixins import CaseAccessMixin, CaseLogMixin, OuterCaseAccessMixin
 
 
-class OuterCaseListView(
-    OuterCaseAccessMixin, CommonPageMixin, BaseBreadcrumbMixin, TemplateView
-):
-    """View on case list while being loaded"""
+class OuterCaseListView(OuterCaseAccessMixin, CommonPageMixin, TemplateView):
+    """View on the case list while content is loaded via htmx"""
 
     template_name = "pages/cases/list_outer.html"
 
     def page_title(self):
         return _("Mijn aanvragen")
 
-    @cached_property
-    def crumbs(self):
-        return [(_("Mijn aanvragen"), reverse("cases:redirect"))]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
@@ -44,8 +36,6 @@ class InnerCaseListView(
     PaginationMixin,
     TemplateView,
 ):
-    """View on case list"""
-
     template_name = "pages/cases/list_inner.html"
     paginate_by = 9
 
@@ -67,9 +57,9 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         config = OpenZaakConfig.get_solo()
 
-        # update ctx with cases + submissions
-        preprocessed_cases = self.get_cases()
-        open_submissions = self.get_submissions()
+        # update ctx with submissions + cases
+        open_submissions: list[UniformCase] = self.get_submissions()
+        preprocessed_cases: list[UniformCase] = self.get_cases()
         paginator_dict = self.paginate_with_context(
             [*open_submissions, *preprocessed_cases]
         )

src/open_inwoner/cms/cases/views/mixins.py

@@ -18,22 +18,21 @@
 class CaseLogMixin(LogMixin):
     def log_access_cases(self, cases: list[dict]):
         """
-        Log access to cases on the list view (create single log for all cases)
+        Log access to cases on the list view
+
+        Creates a single log for all cases
         """
-        case_ids = (case["identificatie"] for case in cases)
+        case_ids = (case["identification"] for case in cases)
 
         self.log_user_action(
             self.request.user,
-            _("Zaaken bekeken: {cases}").format(cases=", ".join(case_ids)),
+            _("Zaken bekeken: {cases}").format(cases=", ".join(case_ids)),
         )
 
     def log_access_case_detail(self, case: UniformCase):
-        """
-        Log access to a particular case
-        """
         self.log_user_action(
             self.request.user,
-            _("Zaak bekeken: {case}").format(case=case.identificatie),
+            _("Zaak bekeken: {case}").format(case=case.identification),
         )
 
 

src/open_inwoner/cms/cases/views/status.py

@@ -136,9 +136,7 @@ def get_context_data(self, **kwargs):
 
             context["case"] = {
                 "id": str(self.case.uuid),
-                "identification": self.case.format_zaak_identificatie(
-                    self.case.identificatie, config
-                ),
+                "identification": self.case.identification,
                 "initiator": self.get_initiator_display(self.case),
                 "result": self.get_result_display(self.case),
                 "start_date": self.case.startdatum,

src/open_inwoner/openzaak/api_models.py

@@ -38,7 +38,7 @@ class Zaak(ZGWModel):
     #    zaakgeometrie: dict
 
     @staticmethod
-    def _reformat_esuite_zaak_identificatie(identificatie: str):
+    def _reformat_esuite_zaak_identificatie(identificatie: str) -> str:
         """
         0014ESUITE66392022 -> 6639-2022
 
@@ -52,28 +52,29 @@ def _reformat_esuite_zaak_identificatie(identificatie: str):
         year = m.group("year")
         return f"{num}-{year}"
 
-    def format_zaak_identificatie(
-        self,
-        identificatie: str,
-        zaak_config: "OpenZaakConfig",
-    ):
+    def _format_zaak_identificatie(self) -> str:
+        from open_inwoner.openzaak.models import OpenZaakConfig
+
+        zaak_config = OpenZaakConfig.get_solo()
+
         if zaak_config.reformat_esuite_zaak_identificatie:
             return self._reformat_esuite_zaak_identificatie(self.identificatie)
-        return identificatie
+        return self.identificatie
 
-    def process_data(self):
+    @property
+    def identification(self) -> str:
+        return self._format_zaak_identificatie()
+
+    def process_data(self) -> dict:
         """
         Prepare data for template
         """
-        from open_inwoner.openzaak.models import OpenZaakConfig, StatusTranslation
+        from open_inwoner.openzaak.models import StatusTranslation
 
-        zaak_config = OpenZaakConfig.get_solo()
         status_translate = StatusTranslation.objects.get_lookup()
 
         return {
-            "identificatie": self.format_zaak_identificatie(
-                self.identificatie, zaak_config
-            ),
+            "identification": self.identification,
             "uuid": str(self.uuid),
             "start_date": self.startdatum,
             "end_date": getattr(self, "einddatum", None),
@@ -82,6 +83,7 @@ def process_data(self):
                 self, "status.statustype.omschrijving", default=""
             ),
             "statustype_config": getattr(self, "statustype_config", None),
+            "case_type": "Zaak",
         }
 
 

src/open_inwoner/openzaak/cases.py

@@ -293,21 +293,16 @@ def connect_case_with_document(case_url: str, document_url: str) -> Optional[dic
     return response
 
 
-def resolve_zaak_type(cases: list[Zaak]) -> None:
+def resolve_zaak_type(case: Zaak) -> None:
     """
-    Resolve zaaktype for each case
-    """
-    case_types = {}
-    case_types_set = {case.zaaktype for case in cases}
-
-    # fetch unique case types
-    for case_type_url in case_types_set:
-        # todo parallel
-        case_types[case_type_url] = fetch_single_case_type(case_type_url)
+    Resolve `case.zaaktype` (`str`) to a `ZaakType(ZGWModel)` object
 
-    # set resolved case types
-    for case in cases:
-        case.zaaktype = case_types[case.zaaktype]
+    Note: the result of `fetch_single_case_type` is cached, hence a request
+          is only made for new case type urls
+    """
+    case_type_url = case.zaaktype
+    case_type = fetch_single_case_type(case_type_url)
+    case.zaaktype = case_type
 
 
 def resolve_status(case: Zaak) -> None:
@@ -317,31 +312,29 @@ def resolve_status(case: Zaak) -> None:
     case.status = fetch_single_status(case.status)
 
 
-def add_status_type_config(case: Zaak):
+def resolve_status_type(case: Zaak) -> None:
     """
-    Add `ZaakTypeStatusTypeConfig` corresponding to the status type url of the case
+    Resolve `case.statustype` (`str`) to a `StatusType(ZGWModel)` object
+    """
+    statustype_url = case.status.statustype
+    case.status.statustype = fetch_single_status_type(statustype_url)
+
 
-    Note: must be called before the call to `resolve_status_type`, since we need
-          the unresolved status type url here
+def add_status_type_config(case: Zaak) -> None:
     """
-    case_statustype_url = case.status.statustype
+    Add `ZaakTypeStatusTypeConfig` corresponding to the status type url of the case
 
+    Note: must be called after `resolve_status_type` since we're getting the
+          status type url from `case.status.statustype`
+    """
     try:
         case.statustype_config = ZaakTypeStatusTypeConfig.objects.get(
-            statustype_url=case_statustype_url
+            statustype_url=case.status.statustype.url
         )
     except ZaakTypeStatusTypeConfig.DoesNotExist:
         pass
 
 
-def resolve_status_type(case: Zaak) -> None:
-    """
-    Resolve `case.statustype` (`str`) to a `StatusType(ZGWModel)` object
-    """
-    statustype_url = case.status.statustype
-    case.status.statustype = fetch_single_status_type(statustype_url)
-
-
 def filter_visible(cases: list[Zaak]) -> list[Zaak]:
     return [case for case in cases if is_zaak_visible(case)]
 
@@ -350,11 +343,12 @@ def preprocess_data(cases: list[Zaak]) -> list[Zaak]:
     """
     Resolve zaaktype and statustype, add status type config, filter for visibility
     """
-    resolve_zaak_type(cases)
+    for case in cases:
+        resolve_zaak_type(case)
 
-    for case in filter(lambda case: case.status, cases):
-        resolve_status(case)
-        add_status_type_config(case)
-        resolve_status_type(case)
+        if case.status:
+            resolve_status(case)
+            resolve_status_type(case)
+            add_status_type_config(case)
 
     return filter_visible(cases)

src/open_inwoner/openzaak/catalog.py

@@ -1,36 +1,22 @@
 import logging
-from typing import List, Optional, Union
-from uuid import UUID
+from typing import List, Optional
 
 from django.conf import settings
 
 from requests import RequestException
-from zds_client import ClientError, get_operation_url
+from zds_client import ClientError
 from zgw_consumers.api_models.base import factory
 from zgw_consumers.api_models.catalogi import Catalogus
 from zgw_consumers.service import get_paginated_results
 
 from ..utils.decorators import cache as cache_result
 from .api_models import InformatieObjectType, ResultaatType, StatusType, ZaakType
 from .clients import build_client
+from .utils import get_retrieve_resource_by_uuid_url
 
 logger = logging.getLogger(__name__)
 
 
-def get_retrieve_resource_by_uuid_url(
-    client, resource: str, uuid: Union[str, UUID]
-) -> str:
-    op_suffix = client.operation_suffix_mapping["retrieve"]
-    operation_id = f"{resource}{op_suffix}"
-    path_kwargs = {
-        "uuid": uuid,
-    }
-    url = get_operation_url(
-        client.schema, operation_id, base_url=client.base_url, **path_kwargs
-    )
-    return url
-
-
 # not cached because only used by tools,
 # and because caching (stale) listings can break lookups
 def fetch_status_types_no_cache(case_type_url: str) -> List[StatusType]:

src/open_inwoner/openzaak/formapi.py

@@ -23,18 +23,22 @@ class OpenSubmission(Model):
     eind_datum_geldigheid: Optional[datetime] = None
 
     @property
-    def identificatie(self):
+    def identification(self) -> str:
         return f"{self.naam}: {self.uuid}"
 
-    def process_data(self):
+    def process_data(self) -> dict:
+        """
+        Prepare data for template
+        """
         return {
+            "identification": self.identification,
             "url": self.url,
             "uuid": self.uuid,
             "naam": self.naam,
-            "identificatie": self.identificatie,
             "vervolg_link": self.vervolg_link,
             "datum_laatste_wijziging": self.datum_laatste_wijziging,
             "eind_datum_geldigheid": self.eind_datum_geldigheid or "Geen",
+            "case_type": "OpenSubmission",
         }
 
 

src/open_inwoner/openzaak/notifications.py

@@ -357,15 +357,13 @@ def send_case_update_email(user: User, case: Zaak):
     """
     send the actual mail
     """
-    config = OpenZaakConfig.get_solo()
-
     case_detail_url = build_absolute_url(
         reverse("cases:case_detail", kwargs={"object_id": str(case.uuid)})
     )
 
     template = find_template("case_notification")
     context = {
-        "identification": case.format_zaak_identificatie(case.identificatie, config),
+        "identification": case.identification,
         "type_description": case.zaaktype.omschrijving,
         "start_date": case.startdatum,
         "case_link": case_detail_url,

src/open_inwoner/openzaak/tests/test_case_detail.py

@@ -33,9 +33,6 @@
 from ...utils.tests.helpers import AssertRedirectsMixin
 from ..api_models import Status, StatusType
 from ..models import OpenZaakConfig
-
-# TODO delete
-# from ..utils import format_zaak_identificatie
 from .factories import CatalogusConfigFactory, ServiceFactory
 from .shared import CATALOGI_ROOT, DOCUMENTEN_ROOT, ZAKEN_ROOT
 
@@ -414,11 +411,13 @@ def test_page_reformats_zaak_identificatie(self, m):
         self._setUpMocks(m)
 
         with patch(
-            "open_inwoner.openzaak.api_models.Zaak.format_zaak_identificatie",
+            "open_inwoner.openzaak.api_models.Zaak._format_zaak_identificatie",
         ) as spy_format:
             self.app.get(self.case_detail_url, user=self.user)
 
-        spy_format.assert_called_once()
+        # _format_zaak_identificatie is called twice on requesting DetailVew:
+        # once for the log, once for adding case to context
+        spy_format.assert_called
 
     def test_page_translates_statuses(self, m):
         st1 = StatusTranslationFactory(