fix: Restore Webhook Test Functionality (#3857)

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
Michael Genson
2024-07-06 14:10:01 -05:00
committed by GitHub
parent aa6e109162
commit 6e6ae80c46
7 changed files with 50 additions and 9 deletions

View File

@@ -1,7 +1,7 @@
from datetime import datetime
from functools import cached_property
from fastapi import APIRouter, Depends
from fastapi import APIRouter, BackgroundTasks, Depends
from pydantic import UUID4
from mealie.routes._base.base_controllers import BaseUserController
@@ -10,7 +10,7 @@ from mealie.routes._base.mixins import HttpRepo
from mealie.schema import mapper
from mealie.schema.group.webhook import CreateWebhook, ReadWebhook, SaveWebhook, WebhookPagination
from mealie.schema.response.pagination import PaginationQuery
from mealie.services.scheduler.tasks.post_webhooks import post_group_webhooks
from mealie.services.scheduler.tasks.post_webhooks import post_group_webhooks, post_single_webhook
router = APIRouter(prefix="/groups/webhooks", tags=["Groups: Webhooks"])
@@ -52,6 +52,11 @@ class ReadWebhookController(BaseUserController):
def get_one(self, item_id: UUID4):
return self.mixins.get_one(item_id)
@router.post("/{item_id}/test")
def test_one(self, item_id: UUID4, bg_tasks: BackgroundTasks):
webhook = self.mixins.get_one(item_id)
bg_tasks.add_task(post_single_webhook, webhook, "Test Webhook")
@router.put("/{item_id}", response_model=ReadWebhook)
def update_one(self, item_id: UUID4, data: CreateWebhook):
return self.mixins.update_one(data, item_id)

View File

@@ -3,7 +3,7 @@ from datetime import date, datetime
from enum import Enum, auto
from typing import Any
from pydantic import UUID4, field_validator
from pydantic import UUID4, SerializeAsAny, field_validator
from ...schema._mealie.mealie_model import MealieModel
@@ -179,7 +179,7 @@ class Event(MealieModel):
message: EventBusMessage
event_type: EventTypes
integration_id: str
document_data: EventDocumentDataBase
document_data: SerializeAsAny[EventDocumentDataBase]
# set at instantiation
event_id: UUID4 | None = None

View File

@@ -4,10 +4,14 @@ from pydantic import UUID4
from mealie.db.db_setup import session_context
from mealie.repos.all_repositories import get_repositories
from mealie.schema.group.webhook import ReadWebhook
from mealie.schema.response.pagination import PaginationQuery
from mealie.services.event_bus_service.event_bus_listeners import WebhookEventListener
from mealie.services.event_bus_service.event_bus_service import EventBusService
from mealie.services.event_bus_service.event_types import (
INTERNAL_INTEGRATION_ID,
Event,
EventBusMessage,
EventDocumentType,
EventOperation,
EventTypes,
@@ -61,3 +65,24 @@ def post_group_webhooks(start_dt: datetime | None = None, group_id: UUID4 | None
event_type=event_type,
document_data=event_document_data,
)
def post_single_webhook(webhook: ReadWebhook, message: str = "") -> None:
dt = datetime.min.replace(tzinfo=timezone.utc)
event_type = EventTypes.webhook_task
event_document_data = EventWebhookData(
document_type=EventDocumentType.mealplan,
operation=EventOperation.info,
webhook_start_dt=dt,
webhook_end_dt=dt,
)
event = Event(
message=EventBusMessage.from_type(event_type, body=message),
event_type=event_type,
integration_id=INTERNAL_INTEGRATION_ID,
document_data=event_document_data,
)
listener = WebhookEventListener(webhook.group_id)
listener.publish_to_subscribers(event, [webhook])