✨ [#10] transformed datefield to the correct depiction of a datetime …

…field and changed test class to document from publication

src/woo_search/search_index/documents/publications.py

@@ -24,7 +24,7 @@ class Document(ES_Document):
     # for typing support.
     uuid: M[str] = mapped_field(Text(required=True))
     publicatie: M[str] = mapped_field(Text(required=True))
-    publisher: PublisherType = mapped_field(Object(Publisher, required=True))
+    publisher: M[PublisherType] = mapped_field(Object(Publisher, required=True))
     identifier: M[str] = mapped_field(Text(required=True))
     officiele_titel: M[str] = mapped_field(Text(required=True))
     verkorte_titel: M[str] = mapped_field(Text())

src/woo_search/search_index/tasks/publications.py

@@ -1,6 +1,7 @@
-from datetime import datetime
+from datetime import date, datetime
 
 from woo_search.celery import app
+from woo_search.utils.date import date_to_datetime
 
 from ..client import get_client
 from ..documents import Document
@@ -16,7 +17,7 @@ def index_document(
     officiele_titel: str,
     verkorte_titel: str,
     omschrijving: str,
-    creatiedatum: datetime,
+    creatiedatum: date,
     registratiedatum: datetime,
     laatst_gewijzigd_datum: datetime,
 ):
@@ -29,7 +30,7 @@ def index_document(
         officiele_titel=officiele_titel,
         verkorte_titel=verkorte_titel,
         omschrijving=omschrijving,
-        creatiedatum=creatiedatum,
+        creatiedatum=date_to_datetime(creatiedatum),
         registratiedatum=registratiedatum,
         laatst_gewijzigd_datum=laatst_gewijzigd_datum,
     )

src/woo_search/search_index/tests/test_publications_api.py

@@ -14,7 +14,7 @@
 from .base import ElasticSearchAPITestCase
 
 
-class PublicationsAPITest(APITestCase):
+class DocumentAPITest(APITestCase):
     url = reverse("api:document-list")
 
     @patch("woo_search.search_index.tasks.publications.index_document.delay")

src/woo_search/search_index/tests/test_tasks.py

@@ -1,5 +1,6 @@
-from datetime import datetime, timezone
+from datetime import date, datetime, timezone
 
+from woo_search.utils.date import TIMEZONE_AMS
 from woo_search.utils.tests.vcr import VCRMixin
 
 from ..client import get_client
@@ -23,7 +24,7 @@ def test_index_document_roundtrip(self):
             officiele_titel="A test document",
             verkorte_titel="A document",
             omschrijving="Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
-            creatiedatum=datetime(2026, 1, 1, tzinfo=timezone.utc),
+            creatiedatum=date(2026, 1, 1),
             registratiedatum=datetime(2026, 1, 5, 12, 0, 0, tzinfo=timezone.utc),
             laatst_gewijzigd_datum=datetime(2026, 1, 5, 12, 0, 0, tzinfo=timezone.utc),
         )
@@ -55,7 +56,7 @@ def test_index_document_roundtrip(self):
         )
         # date -> converted to naive datetime
         self.assertEqual(
-            doc.creatiedatum, datetime(2026, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
+            doc.creatiedatum, datetime(2026, 1, 1, 0, 0, 0, tzinfo=TIMEZONE_AMS)
         )
         self.assertEqual(
             doc.registratiedatum,

src/woo_search/search_index/tests/vcr_cassettes/test_publications_api/DocumentApiE2ETest/test_document_creation_happy_flow.yaml

@@ -2,7 +2,7 @@ interactions:
 - request:
     body: '{"uuid":"0c5730c7-17ed-42a7-bc3b-5ee527ef3326","publicatie":"e28fba05-14b3-4d9f-94c1-de95b60cc5b3","publisher":{"uuid":"f8b2b355-1d6e-4c1a-ba18-565f422997da","naam":"Utrecht"},"identifier":"https://example.com/b36519a5-64d9-4316-a042-3ac5406f8f61","officiele_titel":"Een
       erg belangrijk bestand.","verkorte_titel":"Een bestand.","omschrijving":"bla
-      bla bla bla.","creatiedatum":"2025-02-04","registratiedatum":"2025-02-04T15:42:53.646693+01:00","laatst_gewijzigd_datum":"2025-02-04T15:42:53.646700+01:00"}'
+      bla bla bla.","creatiedatum":"2025-02-04T00:00:00+01:00","registratiedatum":"2025-02-04T15:42:53.646693+01:00","laatst_gewijzigd_datum":"2025-02-04T15:42:53.646700+01:00"}'
     headers:
       accept:
       - application/vnd.elasticsearch+json; compatible-with=8
@@ -48,12 +48,12 @@ interactions:
     body:
       string: '{"_index":"document","_id":"0c5730c7-17ed-42a7-bc3b-5ee527ef3326","_version":1,"_seq_no":0,"_primary_term":1,"found":true,"_source":{"uuid":"0c5730c7-17ed-42a7-bc3b-5ee527ef3326","publicatie":"e28fba05-14b3-4d9f-94c1-de95b60cc5b3","publisher":{"uuid":"f8b2b355-1d6e-4c1a-ba18-565f422997da","naam":"Utrecht"},"identifier":"https://example.com/b36519a5-64d9-4316-a042-3ac5406f8f61","officiele_titel":"Een
         erg belangrijk bestand.","verkorte_titel":"Een bestand.","omschrijving":"bla
-        bla bla bla.","creatiedatum":"2025-02-04","registratiedatum":"2025-02-04T15:42:53.646693+01:00","laatst_gewijzigd_datum":"2025-02-04T15:42:53.646700+01:00"}}'
+        bla bla bla.","creatiedatum":"2025-02-04T00:00:00+01:00","registratiedatum":"2025-02-04T15:42:53.646693+01:00","laatst_gewijzigd_datum":"2025-02-04T15:42:53.646700+01:00"}}'
     headers:
       X-elastic-product:
       - Elasticsearch
       content-length:
-      - '637'
+      - '652'
       content-type:
       - application/vnd.elasticsearch+json;compatible-with=8
     status:

src/woo_search/search_index/tests/vcr_cassettes/test_tasks/DocumentTaskTest/test_index_document_roundtrip.yaml

@@ -2,7 +2,7 @@ interactions:
 - request:
     body: '{"uuid":"0095704d-4216-4de3-83d2-20dba551b0dc","publicatie":"d481bea6-335b-4d90-9b27-ac49f7196633","publisher":{"uuid":"f8b2b355-1d6e-4c1a-ba18-565f422997da","naam":"Utrecht"},"identifier":"https://www.example.com/1","officiele_titel":"A
       test document","verkorte_titel":"A document","omschrijving":"Lorem ipsum dolor
-      sit amet, consectetur adipiscing elit.","creatiedatum":"2026-01-01T00:00:00+00:00","registratiedatum":"2026-01-05T12:00:00+00:00","laatst_gewijzigd_datum":"2026-01-05T12:00:00+00:00"}'
+      sit amet, consectetur adipiscing elit.","creatiedatum":"2026-01-01T00:00:00+01:00","registratiedatum":"2026-01-05T12:00:00+00:00","laatst_gewijzigd_datum":"2026-01-05T12:00:00+00:00"}'
     headers:
       accept:
       - application/vnd.elasticsearch+json; compatible-with=8
@@ -48,7 +48,7 @@ interactions:
     body:
       string: '{"_index":"document","_id":"0095704d-4216-4de3-83d2-20dba551b0dc","_version":1,"_seq_no":0,"_primary_term":1,"found":true,"_source":{"uuid":"0095704d-4216-4de3-83d2-20dba551b0dc","publicatie":"d481bea6-335b-4d90-9b27-ac49f7196633","publisher":{"uuid":"f8b2b355-1d6e-4c1a-ba18-565f422997da","naam":"Utrecht"},"identifier":"https://www.example.com/1","officiele_titel":"A
         test document","verkorte_titel":"A document","omschrijving":"Lorem ipsum dolor
-        sit amet, consectetur adipiscing elit.","creatiedatum":"2026-01-01T00:00:00+00:00","registratiedatum":"2026-01-05T12:00:00+00:00","laatst_gewijzigd_datum":"2026-01-05T12:00:00+00:00"}}'
+        sit amet, consectetur adipiscing elit.","creatiedatum":"2026-01-01T00:00:00+01:00","registratiedatum":"2026-01-05T12:00:00+00:00","laatst_gewijzigd_datum":"2026-01-05T12:00:00+00:00"}}'
     headers:
       X-elastic-product:
       - Elasticsearch

src/woo_search/search_index/typing.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from typing import TypedDict
 
 
@@ -15,6 +15,6 @@ class DocumentType(TypedDict):
     officiele_titel: str
     verkorte_titel: str
     omschrijving: str
-    creatiedatum: datetime
+    creatiedatum: date
     registratiedatum: datetime
     laatst_gewijzigd_datum: datetime

src/woo_search/utils/date.py

@@ -0,0 +1,9 @@
+from datetime import date, datetime
+from zoneinfo import ZoneInfo
+
+TIMEZONE_AMS = ZoneInfo("Europe/Amsterdam")
+
+
+def date_to_datetime(value: date, timezone: ZoneInfo = TIMEZONE_AMS) -> datetime:
+    """return the date as datetime of specific timezone, default timezone is Europe/Amsterdam"""
+    return datetime.combine(value, datetime.min.time(), tzinfo=timezone)