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

Merge remote-tracking branch 'upstream/mealie-next' into pr/mrth2/5184

Browse source
This commit is contained in:
Michael Genson 2025-06-18 20:02:28 +00:00
commit c834877084
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/composables/use-group-recipe-actions.ts
View file

@ -1,5 +1,6 @@
import { useStoreActions } from "./partials/use-actions-factory";
import { useUserApi } from "~/composables/api";
import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";
import type { GroupRecipeActionOut, GroupRecipeActionType } from "~/lib/api/types/household";
import type { RequestResponse } from "~/lib/api/types/non-generated";
import type { Recipe } from "~/lib/api/types/recipe";
@ -67,7 +68,7 @@ export const useGroupRecipeActions = function (
window.open(url, "_blank")?.focus();
return;
case "post":
return await api.groupRecipeActions.triggerAction(action.id, recipe.slug || "");
return await api.groupRecipeActions.triggerAction(action.id, recipe.slug || "", useScaledAmount(recipe.recipeServings || 1, recipeScale).scaledAmount);
default:
break;
}

4
frontend/lib/api/user/group-recipe-actions.ts
View file

@ -13,7 +13,7 @@ export class GroupRecipeActionsAPI extends BaseCRUDAPI<CreateGroupRecipeAction,
baseRoute = routes.groupRecipeActions;
itemRoute = routes.groupRecipeActionsId;
async triggerAction(id: string | number, recipeSlug: string) {
return await this.requests.post(routes.groupRecipeActionsIdTriggerRecipeSlug(id, recipeSlug), {});
async triggerAction(id: string | number, recipeSlug: string, scaledAmount: number) {
return await this.requests.post(routes.groupRecipeActionsIdTriggerRecipeSlug(id, recipeSlug), {scaledAmount});
}
}

8
mealie/routes/households/controller_group_recipe_actions.py
View file

@ -1,7 +1,7 @@
from functools import cached_property
import requests
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
from fastapi import APIRouter, BackgroundTasks, Body, Depends, HTTPException, status
from fastapi.encoders import jsonable_encoder
from pydantic import UUID4
@ -68,7 +68,9 @@ class GroupRecipeActionController(BaseUserController):
# Actions
@router.post("/{item_id}/trigger/{recipe_slug}", status_code=202)
def trigger_action(self, item_id: UUID4, recipe_slug: str, bg_tasks: BackgroundTasks) -> None:
def trigger_action(
self, item_id: UUID4, recipe_slug: str, bg_tasks: BackgroundTasks, scaled_amount: float = Body(1, embed=True)
) -> None:
recipe_action = self.repos.group_recipe_actions.get_one(item_id)
if not recipe_action:
raise HTTPException(
@ -93,7 +95,7 @@ class GroupRecipeActionController(BaseUserController):
detail=ErrorResponse.respond(message="Not found."),
) from e
payload = GroupRecipeActionPayload(action=recipe_action, content=recipe)
payload = GroupRecipeActionPayload(action=recipe_action, content=recipe, scaled_amount=scaled_amount)
bg_tasks.add_task(
task_action,
url=recipe_action.url,

1
mealie/schema/household/group_recipe_action.py
View file

@ -44,3 +44,4 @@ class GroupRecipeActionPagination(PaginationBase):
class GroupRecipeActionPayload(MealieModel):
action: GroupRecipeActionOut
content: Any
scaled_amount: float

2
tests/integration_tests/user_household_tests/test_group_recipe_actions.py
View file

@ -173,6 +173,7 @@ def test_group_recipe_actions_trigger_post(
response = api_client.post(
api_routes.households_recipe_actions_item_id_trigger_recipe_slug(action_id, recipe_slug),
headers=unique_user.token,
json={"scaled_amount": 1.0},
)
if missing_action or missing_recipe:
@ -189,6 +190,7 @@ def test_group_recipe_actions_trigger_invalid_type(api_client: TestClient, uniqu
response = api_client.post(
api_routes.households_recipe_actions_item_id_trigger_recipe_slug(recipe_action.id, recipe.id),
headers=unique_user.token,
json={"scaled_amount": 1.0},
)
assert response.status_code == 400