From dfddb8f6e82cd4268998bb4916ad927921699d94 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Tue, 14 Nov 2023 12:59:14 +0100 Subject: [PATCH] :recycle: [#1838] Store zaaktype.url on category instead of identificatie task: https://taiga.maykinmedia.nl/project/open-inwoner/task/1838 to avoid having to resolve a lot of zaaktypes when personalizing the category list --- src/open_inwoner/pdc/admin/category.py | 2 +- src/open_inwoner/pdc/managers.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/open_inwoner/pdc/admin/category.py b/src/open_inwoner/pdc/admin/category.py index 33c90b3447..7acc4cdf02 100644 --- a/src/open_inwoner/pdc/admin/category.py +++ b/src/open_inwoner/pdc/admin/category.py @@ -41,7 +41,7 @@ def __init__(self, *args, **kwargs): f"{zaaktype.catalogus.domein} - {zaaktype.catalogus.rsin}" ].append( ( - zaaktype.identificatie, + zaaktype.url, zaaktype.omschrijving, ) ) diff --git a/src/open_inwoner/pdc/managers.py b/src/open_inwoner/pdc/managers.py index e43fcf388c..720c3a7260 100644 --- a/src/open_inwoner/pdc/managers.py +++ b/src/open_inwoner/pdc/managers.py @@ -48,16 +48,14 @@ def filter_for_user_with_zaken(self, user: User): months_since_last_zaak_per_zaaktype = {} for case in cases: - resolve_zaak_type(case) - duration_since_start = relativedelta(date.today(), case.startdatum) if ( - case.zaaktype.identificatie not in months_since_last_zaak_per_zaaktype - or months_since_last_zaak_per_zaaktype[case.zaaktype.identificatie] + case.zaaktype not in months_since_last_zaak_per_zaaktype + or months_since_last_zaak_per_zaaktype[case.zaaktype] > duration_since_start.months ): months_since_last_zaak_per_zaaktype[ - case.zaaktype.identificatie + case.zaaktype ] = duration_since_start.months zaaktype_ids = list(months_since_last_zaak_per_zaaktype.keys()) @@ -70,9 +68,12 @@ def filter_for_user_with_zaken(self, user: User): pks.append(category.pk) continue - for identificatie in category.zaaktypen: + for url in category.zaaktypen: + if url not in months_since_last_zaak_per_zaaktype: + continue + if ( - months_since_last_zaak_per_zaaktype[identificatie] + months_since_last_zaak_per_zaaktype[url] <= category.relevante_zaakperiode ): pks.append(category.pk)