storage: publications_with_status: Return a list[Publication].
This commit is contained in:
parent
a079241801
commit
64c9d168c3
|
@ -93,7 +93,7 @@ async def publications_with_status(
|
||||||
event_mobilizon_id: Optional[UUID] = None,
|
event_mobilizon_id: Optional[UUID] = None,
|
||||||
from_date: Optional[Arrow] = None,
|
from_date: Optional[Arrow] = None,
|
||||||
to_date: Optional[Arrow] = None,
|
to_date: Optional[Arrow] = None,
|
||||||
) -> dict[UUID, Publication]:
|
) -> Publication:
|
||||||
query = Publication.filter(status=status)
|
query = Publication.filter(status=status)
|
||||||
|
|
||||||
if event_mobilizon_id:
|
if event_mobilizon_id:
|
||||||
|
@ -103,10 +103,7 @@ async def publications_with_status(
|
||||||
|
|
||||||
query = _add_date_window(query, "timestamp", from_date, to_date)
|
query = _add_date_window(query, "timestamp", from_date, to_date)
|
||||||
|
|
||||||
publications_list = (
|
return await query.prefetch_related("publisher").order_by("timestamp").distinct()
|
||||||
await query.prefetch_related("publisher").order_by("timestamp").distinct()
|
|
||||||
)
|
|
||||||
return {pub.id: pub for pub in publications_list}
|
|
||||||
|
|
||||||
|
|
||||||
async def events_without_publications(
|
async def events_without_publications(
|
||||||
|
|
|
@ -5,7 +5,6 @@ import arrow
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from mobilizon_reshare.event.event import MobilizonEvent, EventPublicationStatus
|
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.models.publication import PublicationStatus
|
||||||
from mobilizon_reshare.storage.query.read import (
|
from mobilizon_reshare.storage.query.read import (
|
||||||
get_published_events,
|
get_published_events,
|
||||||
|
@ -83,7 +82,7 @@ async def test_publications_with_status(
|
||||||
to_date=to_date,
|
to_date=to_date,
|
||||||
)
|
)
|
||||||
|
|
||||||
assert publications == {pub.id: pub for pub in expected_result}
|
assert publications == expected_result
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
|
|
Loading…
Reference in New Issue