UTC
This commit is contained in:
parent
78237ed004
commit
4044c04118
@ -1,4 +1,3 @@
|
|||||||
from datetime import datetime
|
|
||||||
import json
|
import json
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from db.database import Database
|
from db.database import Database
|
||||||
@ -6,6 +5,7 @@ from models.enums import TaskStatus
|
|||||||
from models.event import MetadataSearchResultEvent
|
from models.event import MetadataSearchResultEvent
|
||||||
from models.task import MetadataSearchPayload, Task, MetadataSearchTask, MetadataSearchData
|
from models.task import MetadataSearchPayload, Task, MetadataSearchTask, MetadataSearchData
|
||||||
from utils.logger import logger
|
from utils.logger import logger
|
||||||
|
from utils.time import utc_now
|
||||||
|
|
||||||
def fetch_next_task(db: Database) -> Optional[Task]:
|
def fetch_next_task(db: Database) -> Optional[Task]:
|
||||||
db.validate()
|
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
|
SET CLAIMED=1, CLAIMED_BY=%s, LAST_CHECK_IN=%s
|
||||||
WHERE TASK_ID=%s AND CLAIMED=0 AND CONSUMED=0
|
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()
|
db.conn.commit()
|
||||||
return cursor.rowcount > 0
|
return cursor.rowcount > 0
|
||||||
@ -98,7 +98,7 @@ def persist_event_and_mark_consumed(db: Database, event: MetadataSearchResultEve
|
|||||||
str(event.eventId),
|
str(event.eventId),
|
||||||
event_name,
|
event_name,
|
||||||
as_data,
|
as_data,
|
||||||
datetime.now().isoformat()
|
utc_now().isoformat()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@ from worker.poller import run_worker, run_iteration
|
|||||||
from models.task import MetadataSearchTask, MetadataSearchData
|
from models.task import MetadataSearchTask, MetadataSearchData
|
||||||
from models.enums import TaskStatus
|
from models.enums import TaskStatus
|
||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime
|
from utils.time import utc_now
|
||||||
import time
|
import time
|
||||||
|
|
||||||
def make_dummy_event():
|
def make_dummy_event():
|
||||||
@ -13,11 +13,11 @@ def make_dummy_event():
|
|||||||
referenceId=uuid.uuid4(),
|
referenceId=uuid.uuid4(),
|
||||||
eventId=uuid.uuid4(),
|
eventId=uuid.uuid4(),
|
||||||
metadata=EventMetadata(
|
metadata=EventMetadata(
|
||||||
created=datetime.now(),
|
created=utc_now(),
|
||||||
derivedFromId={uuid.uuid4()}
|
derivedFromId={uuid.uuid4()}
|
||||||
),
|
),
|
||||||
results=[],
|
results=[],
|
||||||
persistedAt=datetime.now(),
|
persistedAt=utc_now(),
|
||||||
recommended=None, # fyll inn med en gyldig bool
|
recommended=None, # fyll inn med en gyldig bool
|
||||||
status="Completed" # eller enum hvis modellen krever det
|
status="Completed" # eller enum hvis modellen krever det
|
||||||
)
|
)
|
||||||
@ -34,7 +34,7 @@ def make_task():
|
|||||||
claimedBy=None,
|
claimedBy=None,
|
||||||
consumed=False,
|
consumed=False,
|
||||||
lastCheckIn=None,
|
lastCheckIn=None,
|
||||||
persistedAt=datetime.now()
|
persistedAt=utc_now()
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_run_worker_processes_one(monkeypatch):
|
def test_run_worker_processes_one(monkeypatch):
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime
|
from utils.time import utc_now
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import worker.processor as processor
|
import worker.processor as processor
|
||||||
@ -31,7 +31,7 @@ def make_dummy_task():
|
|||||||
claimedBy=None,
|
claimedBy=None,
|
||||||
consumed=False,
|
consumed=False,
|
||||||
lastCheckIn=None,
|
lastCheckIn=None,
|
||||||
persistedAt=datetime.now()
|
persistedAt=utc_now()
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- Tests ---
|
# --- Tests ---
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import json
|
import json
|
||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from utils.time import utc_now
|
||||||
import pytest
|
import pytest
|
||||||
from db import repository
|
from db import repository
|
||||||
from models.event import MetadataSearchResultEvent, EventMetadata, SearchResult, MetadataResult, Summary
|
from models.event import MetadataSearchResultEvent, EventMetadata, SearchResult, MetadataResult, Summary
|
||||||
@ -38,7 +39,7 @@ def make_event() -> MetadataSearchResultEvent:
|
|||||||
referenceId=uuid.uuid4(),
|
referenceId=uuid.uuid4(),
|
||||||
eventId=uuid.uuid4(),
|
eventId=uuid.uuid4(),
|
||||||
metadata=EventMetadata(
|
metadata=EventMetadata(
|
||||||
created=datetime.now(),
|
created=utc_now(),
|
||||||
derivedFromId={uuid.uuid4()}
|
derivedFromId={uuid.uuid4()}
|
||||||
),
|
),
|
||||||
results=[],
|
results=[],
|
||||||
@ -86,7 +87,7 @@ def make_row(task_id, ref_id):
|
|||||||
"CLAIMED_BY": None,
|
"CLAIMED_BY": None,
|
||||||
"CONSUMED": False,
|
"CONSUMED": False,
|
||||||
"LAST_CHECK_IN": None,
|
"LAST_CHECK_IN": None,
|
||||||
"PERSISTED_AT": datetime.now().isoformat()
|
"PERSISTED_AT": utc_now().isoformat()
|
||||||
}
|
}
|
||||||
|
|
||||||
def test_fetch_next_task_maps_correctly(monkeypatch):
|
def test_fetch_next_task_maps_correctly(monkeypatch):
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import uuid
|
import uuid
|
||||||
from datetime import datetime
|
from utils.time import utc_now
|
||||||
|
|
||||||
from tabulate import tabulate
|
from tabulate import tabulate
|
||||||
from models.metadata import Metadata
|
from models.metadata import Metadata
|
||||||
@ -105,7 +105,7 @@ async def process_task(db, task: MetadataSearchTask) -> MetadataSearchResultEven
|
|||||||
|
|
||||||
# 4) Bygg event
|
# 4) Bygg event
|
||||||
core_metadata = EventMetadata(
|
core_metadata = EventMetadata(
|
||||||
created=datetime.now(),
|
created=utc_now(),
|
||||||
derivedFromId={task.referenceId, task.taskId}
|
derivedFromId={task.referenceId, task.taskId}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user