diff --git a/apps/py-metadata/db/repository.py b/apps/py-metadata/db/repository.py index 413e45be..a3d52ab4 100644 --- a/apps/py-metadata/db/repository.py +++ b/apps/py-metadata/db/repository.py @@ -1,4 +1,3 @@ -from datetime import datetime import json from typing import Optional from db.database import Database @@ -6,6 +5,7 @@ from models.enums import TaskStatus from models.event import MetadataSearchResultEvent from models.task import MetadataSearchPayload, Task, MetadataSearchTask, MetadataSearchData from utils.logger import logger +from utils.time import utc_now def fetch_next_task(db: Database) -> Optional[Task]: db.validate() @@ -65,7 +65,7 @@ def claim_task(db: Database, task_id: str, worker_id: str) -> bool: SET CLAIMED=1, CLAIMED_BY=%s, LAST_CHECK_IN=%s WHERE TASK_ID=%s AND CLAIMED=0 AND CONSUMED=0 """, - (worker_id, datetime.now(), task_id) + (worker_id, utc_now(), task_id) ) db.conn.commit() return cursor.rowcount > 0 @@ -98,7 +98,7 @@ def persist_event_and_mark_consumed(db: Database, event: MetadataSearchResultEve str(event.eventId), event_name, as_data, - datetime.now().isoformat() + utc_now().isoformat() ) ) diff --git a/apps/py-metadata/tests/test_poller.py b/apps/py-metadata/tests/test_poller.py index 719e680a..8b65469d 100644 --- a/apps/py-metadata/tests/test_poller.py +++ b/apps/py-metadata/tests/test_poller.py @@ -5,7 +5,7 @@ from worker.poller import run_worker, run_iteration from models.task import MetadataSearchTask, MetadataSearchData from models.enums import TaskStatus import uuid -from datetime import datetime +from utils.time import utc_now import time def make_dummy_event(): @@ -13,11 +13,11 @@ def make_dummy_event(): referenceId=uuid.uuid4(), eventId=uuid.uuid4(), metadata=EventMetadata( - created=datetime.now(), + created=utc_now(), derivedFromId={uuid.uuid4()} ), results=[], - persistedAt=datetime.now(), + persistedAt=utc_now(), recommended=None, # fyll inn med en gyldig bool status="Completed" # eller enum hvis modellen krever det ) @@ -34,7 +34,7 @@ def make_task(): claimedBy=None, consumed=False, lastCheckIn=None, - persistedAt=datetime.now() + persistedAt=utc_now() ) def test_run_worker_processes_one(monkeypatch): diff --git a/apps/py-metadata/tests/test_processor.py b/apps/py-metadata/tests/test_processor.py index 8b99abcd..d9034f28 100644 --- a/apps/py-metadata/tests/test_processor.py +++ b/apps/py-metadata/tests/test_processor.py @@ -1,6 +1,6 @@ import asyncio import uuid -from datetime import datetime +from utils.time import utc_now import pytest import worker.processor as processor @@ -31,7 +31,7 @@ def make_dummy_task(): claimedBy=None, consumed=False, lastCheckIn=None, - persistedAt=datetime.now() + persistedAt=utc_now() ) # --- Tests --- diff --git a/apps/py-metadata/tests/test_repository.py b/apps/py-metadata/tests/test_repository.py index f8fbd9d4..1fc69947 100644 --- a/apps/py-metadata/tests/test_repository.py +++ b/apps/py-metadata/tests/test_repository.py @@ -1,6 +1,7 @@ import json import uuid from datetime import datetime +from utils.time import utc_now import pytest from db import repository from models.event import MetadataSearchResultEvent, EventMetadata, SearchResult, MetadataResult, Summary @@ -38,7 +39,7 @@ def make_event() -> MetadataSearchResultEvent: referenceId=uuid.uuid4(), eventId=uuid.uuid4(), metadata=EventMetadata( - created=datetime.now(), + created=utc_now(), derivedFromId={uuid.uuid4()} ), results=[], @@ -86,7 +87,7 @@ def make_row(task_id, ref_id): "CLAIMED_BY": None, "CONSUMED": False, "LAST_CHECK_IN": None, - "PERSISTED_AT": datetime.now().isoformat() + "PERSISTED_AT": utc_now().isoformat() } def test_fetch_next_task_maps_correctly(monkeypatch): diff --git a/apps/py-metadata/worker/processor.py b/apps/py-metadata/worker/processor.py index 330379f0..f6dacd10 100644 --- a/apps/py-metadata/worker/processor.py +++ b/apps/py-metadata/worker/processor.py @@ -1,5 +1,5 @@ import uuid -from datetime import datetime +from utils.time import utc_now from tabulate import tabulate from models.metadata import Metadata @@ -105,7 +105,7 @@ async def process_task(db, task: MetadataSearchTask) -> MetadataSearchResultEven # 4) Bygg event core_metadata = EventMetadata( - created=datetime.now(), + created=utc_now(), derivedFromId={task.referenceId, task.taskId} )