From 3e1aa1047159d7d6a6742086999a27d3290bf24f Mon Sep 17 00:00:00 2001 From: SilviaAmAm Date: Fri, 17 May 2024 12:06:50 +0200 Subject: [PATCH 1/2] :white_check_mark: [#34] Test null archiefnominatie --- .../zaken/tests/test_tasks.py | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/backend/src/openarchiefbeheer/zaken/tests/test_tasks.py b/backend/src/openarchiefbeheer/zaken/tests/test_tasks.py index 992da40b..3e562796 100644 --- a/backend/src/openarchiefbeheer/zaken/tests/test_tasks.py +++ b/backend/src/openarchiefbeheer/zaken/tests/test_tasks.py @@ -1,4 +1,4 @@ -from django.test import TestCase, TransactionTestCase +from django.test import TestCase, TransactionTestCase, tag from requests_mock import Mocker from zgw_consumers.constants import APITypes @@ -89,6 +89,33 @@ def test_retrieve_and_cache_zaken(self, m): self.assertEqual(zaken.count(), 4) + @tag("gh-34") + def test_retrieve_zaken_with_archiefnominatie_null(self, m): + m.get( + "http://zaken-api.nl/zaken/api/v1/zaken", + json={ + "next": None, + "previous": None, + "results": [ + { + "identificatie": "ZAAK-01", + "url": "http://zaken-api.nl/zaken/api/v1/zaken/75f4c682-1e16-45ea-8f78-99b4474986ac", + "uuid": "75f4c682-1e16-45ea-8f78-99b4474986ac", + "resultaat": "http://zaken-api.nl/zaken/api/v1/resultaten/ffaa6410-0319-4a6b-b65a-fb209798e81c", + "startdatum": "2020-02-01", + "zaaktype": "http://catalogue-api.nl/zaaktypen/111-111-111", + "bronorganisatie": "000000000", + "verantwoordelijkeOrganisatie": "000000000", + "archiefnominatie": None, + } + ], + }, + ) + + retrieve_and_cache_zaken_from_openzaak() + + self.assertEqual(Zaak.objects.all().count(), 1) + PAGE_WITH_EXPAND = { "results": [ From 98fa015b668ef2637122c9303ed23e5268988c7f Mon Sep 17 00:00:00 2001 From: SilviaAmAm Date: Fri, 17 May 2024 12:34:38 +0200 Subject: [PATCH 2/2] :bug: [#34] Make the field in the model In OZ, this charfield also has null=True. So I added it here too --- .../0004_alter_zaak_archiefnominatie.py | 20 +++++++++++++++++++ backend/src/openarchiefbeheer/zaken/models.py | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 backend/src/openarchiefbeheer/zaken/migrations/0004_alter_zaak_archiefnominatie.py diff --git a/backend/src/openarchiefbeheer/zaken/migrations/0004_alter_zaak_archiefnominatie.py b/backend/src/openarchiefbeheer/zaken/migrations/0004_alter_zaak_archiefnominatie.py new file mode 100644 index 00000000..2e4cdcbd --- /dev/null +++ b/backend/src/openarchiefbeheer/zaken/migrations/0004_alter_zaak_archiefnominatie.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.11 on 2024-05-17 10:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("zaken", "0003_zaak__expand_alter_zaak_resultaat_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="zaak", + name="archiefnominatie", + field=models.CharField( + blank=True, max_length=250, null=True, verbose_name="archiefnominatie" + ), + ), + ] diff --git a/backend/src/openarchiefbeheer/zaken/models.py b/backend/src/openarchiefbeheer/zaken/models.py index 3acdc52c..9f9f71a0 100644 --- a/backend/src/openarchiefbeheer/zaken/models.py +++ b/backend/src/openarchiefbeheer/zaken/models.py @@ -41,7 +41,9 @@ class Zaak(models.Model): zaakgeometrie = GeometryField("zaakgeometrie", blank=True, null=True) bronorganisatie = models.CharField("bronorganisatie", max_length=9) publicatiedatum = models.DateField("publicatiedatum", blank=True, null=True) - archiefnominatie = models.CharField("archiefnominatie", max_length=250, blank=True) + archiefnominatie = models.CharField( + "archiefnominatie", max_length=250, blank=True, null=True + ) einddatum_gepland = models.DateField("einddatum_gepland", blank=True, null=True) registratiedatum = models.DateField("registratiedatum", blank=True, null=True) archiefactiedatum = models.DateField("archiefactiedatum", blank=True, null=True)