diff --git a/mobilizon_reshare/storage/query/read.py b/mobilizon_reshare/storage/query/read.py index 67a9bf6..87baa20 100644 --- a/mobilizon_reshare/storage/query/read.py +++ b/mobilizon_reshare/storage/query/read.py @@ -93,7 +93,7 @@ async def publications_with_status( event_mobilizon_id: Optional[UUID] = None, from_date: Optional[Arrow] = None, to_date: Optional[Arrow] = None, -) -> dict[UUID, Publication]: +) -> Publication: query = Publication.filter(status=status) if event_mobilizon_id: @@ -103,10 +103,7 @@ async def publications_with_status( query = _add_date_window(query, "timestamp", from_date, to_date) - publications_list = ( - await query.prefetch_related("publisher").order_by("timestamp").distinct() - ) - return {pub.id: pub for pub in publications_list} + return await query.prefetch_related("publisher").order_by("timestamp").distinct() async def events_without_publications( diff --git a/tests/storage/test_query.py b/tests/storage/test_query.py index d42007c..dbbbf93 100644 --- a/tests/storage/test_query.py +++ b/tests/storage/test_query.py @@ -5,7 +5,6 @@ import arrow import pytest from mobilizon_reshare.event.event import MobilizonEvent, EventPublicationStatus -from mobilizon_reshare.models.event import Event from mobilizon_reshare.models.publication import PublicationStatus from mobilizon_reshare.storage.query.read import ( get_published_events, @@ -83,7 +82,7 @@ async def test_publications_with_status( to_date=to_date, ) - assert publications == {pub.id: pub for pub in expected_result} + assert publications == expected_result @pytest.mark.asyncio