github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-24 07:15:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

simplify data logic since this is only for webhooks

Browse source
This commit is contained in:
Michael Genson 2025-07-27 03:53:15 +00:00
commit 18ba809d5c
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mealie/services/event_bus_service/event_bus_listeners.py
View file

@ -3,7 +3,6 @@ import json
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from collections.abc import Generator from collections.abc import Generator
from datetime import UTC, datetime from datetime import UTC, datetime
from typing import cast
from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
from fastapi.encoders import jsonable_encoder from fastapi.encoders import jsonable_encoder
@ -148,21 +147,23 @@ class WebhookEventListener(EventListenerBase):
def publish_to_subscribers(self, event: Event, subscribers: list[ReadWebhook]) -> None: def publish_to_subscribers(self, event: Event, subscribers: list[ReadWebhook]) -> None:
with self.ensure_repos(self.group_id, self.household_id) as repos: with self.ensure_repos(self.group_id, self.household_id) as repos:
webhook_data = cast(EventWebhookData, event.document_data) if not isinstance(event.document_data, EventWebhookData):
return
match event.document_data.document_type: match event.document_data.document_type:
case EventDocumentType.mealplan: case EventDocumentType.mealplan:
meal_repo = repos.meals meal_repo = repos.meals
meal_data = meal_repo.get_meals_by_date_range( meal_data = meal_repo.get_meals_by_date_range(
webhook_data.webhook_start_dt, webhook_data.webhook_end_dt event.document_data.webhook_start_dt, event.document_data.webhook_end_dt
) )
webhook_data.webhook_body = meal_data or None event.document_data.webhook_body = meal_data or None
case _: case _:
if event.event_type is EventTypes.test_message: if event.event_type is EventTypes.test_message:
# make sure the webhook has a valid body so it gets sent # make sure the webhook has a valid body so it gets sent
webhook_data.webhook_body = webhook_data.webhook_body or [] event.document_data.webhook_body = event.document_data.webhook_body or []
# Only publish to subscribers if we have a webhook body to send # Only publish to subscribers if we have a webhook body to send
if webhook_data.webhook_body is not None: if event.document_data.webhook_body is not None:
self.publisher.publish(event, [webhook.url for webhook in subscribers]) self.publisher.publish(event, [webhook.url for webhook in subscribers])
def get_scheduled_webhooks(self, start_dt: datetime, end_dt: datetime) -> list[ReadWebhook]: def get_scheduled_webhooks(self, start_dt: datetime, end_dt: datetime) -> list[ReadWebhook]: