From adc715ed8e9cde5fc1c69e4d17cf6d0e5f110890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brage=20Skj=C3=B8nborg?= Date: Thu, 22 Jan 2026 19:21:05 +0100 Subject: [PATCH] Removed Zulu --- apps/py-metadata/db/repository.py | 2 +- apps/py-metadata/tests/test_repository.py | 2 +- apps/py-metadata/utils/time.py | 14 ++++---------- apps/py-watcher/models/event.py | 2 +- apps/py-watcher/utils/time.py | 14 ++++---------- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/apps/py-metadata/db/repository.py b/apps/py-metadata/db/repository.py index a3d52ab4..830b0524 100644 --- a/apps/py-metadata/db/repository.py +++ b/apps/py-metadata/db/repository.py @@ -98,7 +98,7 @@ def persist_event_and_mark_consumed(db: Database, event: MetadataSearchResultEve str(event.eventId), event_name, as_data, - utc_now().isoformat() + utc_now() ) ) diff --git a/apps/py-metadata/tests/test_repository.py b/apps/py-metadata/tests/test_repository.py index 1fc69947..37351075 100644 --- a/apps/py-metadata/tests/test_repository.py +++ b/apps/py-metadata/tests/test_repository.py @@ -87,7 +87,7 @@ def make_row(task_id, ref_id): "CLAIMED_BY": None, "CONSUMED": False, "LAST_CHECK_IN": None, - "PERSISTED_AT": utc_now().isoformat() + "PERSISTED_AT": utc_now() } def test_fetch_next_task_maps_correctly(monkeypatch): diff --git a/apps/py-metadata/utils/time.py b/apps/py-metadata/utils/time.py index 31807ce1..0081fa6c 100644 --- a/apps/py-metadata/utils/time.py +++ b/apps/py-metadata/utils/time.py @@ -2,15 +2,9 @@ from datetime import datetime, timezone def utc_now(): """ - Returnerer et offset-aware UTC datetime-objekt. - Brukes for alle timestamps som skal inn i databasen. + Returnerer en UTC-basert LocalDateTime uten Z eller offset, + med nanosekund-lignende presisjon (mikrosekunder + padding). """ - return datetime.now(timezone.utc) + dt = datetime.now(timezone.utc).replace(tzinfo=None) + return dt.strftime("%Y-%m-%dT%H:%M:%S.") + f"{dt.microsecond:06d}000" - -def utc_iso(): - """ - Returnerer en ISO8601-streng i UTC, f.eks. '2025-01-22T12:34:56.789012+00:00' - Perfekt for JSON-serialisering og DB-felter som lagres som tekst. - """ - return utc_now().isoformat() diff --git a/apps/py-watcher/models/event.py b/apps/py-watcher/models/event.py index d66ba588..55dc3069 100644 --- a/apps/py-watcher/models/event.py +++ b/apps/py-watcher/models/event.py @@ -36,6 +36,6 @@ def create_event(event_cls, file_name: str, file_uri: str, reference_id: Optiona return event_cls( referenceId=reference_id or str(uuid.uuid4()), eventId=str(uuid.uuid4()), - metadata=Metadata(created=utc_now().isoformat()), + metadata=Metadata(created=utc_now()), data=FileInfo(fileName=file_name, fileUri=file_uri) ) diff --git a/apps/py-watcher/utils/time.py b/apps/py-watcher/utils/time.py index 31807ce1..0081fa6c 100644 --- a/apps/py-watcher/utils/time.py +++ b/apps/py-watcher/utils/time.py @@ -2,15 +2,9 @@ from datetime import datetime, timezone def utc_now(): """ - Returnerer et offset-aware UTC datetime-objekt. - Brukes for alle timestamps som skal inn i databasen. + Returnerer en UTC-basert LocalDateTime uten Z eller offset, + med nanosekund-lignende presisjon (mikrosekunder + padding). """ - return datetime.now(timezone.utc) + dt = datetime.now(timezone.utc).replace(tzinfo=None) + return dt.strftime("%Y-%m-%dT%H:%M:%S.") + f"{dt.microsecond:06d}000" - -def utc_iso(): - """ - Returnerer en ISO8601-streng i UTC, f.eks. '2025-01-22T12:34:56.789012+00:00' - Perfekt for JSON-serialisering og DB-felter som lagres som tekst. - """ - return utc_now().isoformat()