commit 4189d9f824f681b480f797b109e963762eb22e9c
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:41:57 2025 +1100
Openapi complete
commit bebf8c30cba0b85a889198fe44879614065a0c34
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:35:39 2025 +1100
Removed unversioned api
commit dd9cc2eae75d66fceebe14c918c3ed8498376ee6
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:07:03 2025 +1100
Spec updates
commit b993c4530688f79ea983278283f984e9d8e83860
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:01:50 2025 +1100
docs(spec): update doof-back-spec with v1 RFC7807 422, reusable Problem* responses, and shopping/current aliasing; tests passing; openapi.json refreshed
commit 30bac7e57367b14ce924667a7955845de949d779
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 16:00:13 2025 +1100
openapi polish
commit eb7f7f224f7085fa5b3fadc7716db0ebb7f47eb0
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:54:52 2025 +1100
OpenAPI reusable responses: Added components.responses for `Problem400`, `Problem404`, and `Problem422`; v1 routes reference these consistently.
- Units enum: Exposed advisory enum in schema for `Ingredient.unit` using existing units list (no runtime enforcement).
commit 037037e17d684a89b264f2406377970a0de7ec99
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:43:01 2025 +1100
Add `total` counts to v1 page responses for recipes/persons; push persons name filter into SQL for v1 when `q` is provided.
commit 07e7735076aae8cbd04bb10f9aa324c1a3d80ae4
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:40:17 2025 +1100
Add parameter descriptions for `cursor`, `limit`, and `q` on v1 list endpoints; include example `Page` envelopes in 200 responses.
commit e5bf9396b0fe870501d1b4712cba2555dd2ef9b1
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:36:27 2025 +1100
DB pagination
commit 782315cd2a0c18cc50e4deaf28e7ec6e4b58c6e2
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:29:38 2025 +1100
camelcase tests
commit b207c33e2844c00fc9e531fb9cf8c07a3f5cd543
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:24:57 2025 +1100
OpenAPI enrichment, Error responses
commit dc84681ab743008e5cd8bec7f3ccb0d05b557518
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:16:39 2025 +1100
v1 tests: Added basic tests to assert `Page` envelopes and RFC7807 responses for v1 endpoints without affecting legacy tests.
commit 1524b7a98ffe04af11c2731c8125ac9348751cff
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:14:51 2025 +1100
Pagination
commit 92e91d7acf15c09b14bc76f7b16a7a47e65129ec
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:03:50 2025 +1100
Use middleware for naming case changes
commit c68f964f9b8e3d8f8ef020661e747e0990459c81
Author: jableader <jacobdunk@gmail.com>
Date: Sat Oct 18 15:00:09 2025 +1100
Openapi gen
302 lines
8.4 KiB
Python
302 lines
8.4 KiB
Python
import datetime
|
|
from typing import AsyncIterator, ClassVar, List, Optional
|
|
|
|
from pydantic import Field
|
|
from common import ApiModel
|
|
|
|
import persons
|
|
from ingredients import (
|
|
Ingredient,
|
|
delete_ingredients_by_meal_id,
|
|
find_ingredients_by_meal_id,
|
|
insert_ingredient,
|
|
)
|
|
from persons import Person
|
|
from recipes import Recipe, load_recipe_ingredients, row_to_recipe
|
|
|
|
|
|
class MealRecipe(ApiModel):
|
|
meal_id: int
|
|
recipe_id: int
|
|
servings: float
|
|
|
|
recipe: Optional[Recipe] = None
|
|
|
|
|
|
class Meal(ApiModel):
|
|
KEYS: ClassVar[List[str]] = ["id", "suggested_date", "consumed_date", "purchase_date"]
|
|
id: int = -1
|
|
suggested_date: datetime.datetime
|
|
consumed_date: Optional[datetime.datetime] = None
|
|
|
|
chefs: List[Person] = Field(default_factory=list)
|
|
cleanup: List[Person] = Field(default_factory=list)
|
|
consumers: List[Person] = Field(default_factory=list)
|
|
recipes: List[MealRecipe] = Field(default_factory=list)
|
|
extra_ingredients: List[Ingredient] = Field(default_factory=list)
|
|
|
|
# Set from shopping list
|
|
purchase_date: Optional[datetime.datetime] = None
|
|
|
|
|
|
async def create(conn):
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS Meal (
|
|
id INTEGER PRIMARY KEY,
|
|
suggested_date DATETIME,
|
|
consumed_date DATETIME DEFAULT NULL,
|
|
deleted_date DATETIME DEFAULT NULL,
|
|
purchase_date DATETIME DEFAULT NULL
|
|
);"""
|
|
)
|
|
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS MealParticipant (
|
|
meal_id INTEGER,
|
|
person_id INTEGER,
|
|
role TEXT,
|
|
FOREIGN KEY(meal_id) REFERENCES Meal(id),
|
|
FOREIGN KEY(person_id) REFERENCES Person(id)
|
|
);"""
|
|
)
|
|
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS MealRecipe (
|
|
meal_id INTEGER,
|
|
recipe_id INTEGER,
|
|
servings REAL,
|
|
FOREIGN KEY(meal_id) REFERENCES Meal(id),
|
|
FOREIGN KEY(recipe_id) REFERENCES Recipe(id)
|
|
);"""
|
|
)
|
|
|
|
|
|
async def insert_meal_participant(conn, meal_id: int, person_id: int, role: str):
|
|
await conn.execute(
|
|
"""
|
|
INSERT INTO MealParticipant (meal_id, person_id, role)
|
|
VALUES (?, ?, ?)
|
|
""",
|
|
(meal_id, person_id, role),
|
|
)
|
|
|
|
|
|
async def sync_meal_participants(conn, meal_id: int, participants: List[Person], role: str):
|
|
await conn.execute(
|
|
"""
|
|
DELETE FROM MealParticipant
|
|
WHERE meal_id = ? AND role = ?
|
|
""",
|
|
(meal_id, role),
|
|
)
|
|
|
|
for person in participants:
|
|
await insert_meal_participant(conn, meal_id, person.id, role)
|
|
|
|
|
|
async def insert_meal_recipe(conn, r: MealRecipe):
|
|
if r.meal_id < 0:
|
|
raise ValueError("Meal must be inserted before meal recipe")
|
|
|
|
if r.recipe_id < 0 and r.recipe:
|
|
r.recipe_id = r.recipe.id
|
|
|
|
if r.recipe_id < 0:
|
|
raise ValueError("Recipe must be inserted before meal")
|
|
|
|
await conn.execute(
|
|
"""
|
|
INSERT INTO MealRecipe (meal_id, recipe_id, servings)
|
|
VALUES (?, ?, ?)
|
|
""",
|
|
(r.meal_id, r.recipe_id, r.servings),
|
|
)
|
|
|
|
|
|
async def insert_meal(conn, meal: Meal):
|
|
async with conn.execute(
|
|
"""
|
|
INSERT INTO Meal (suggested_date)
|
|
VALUES (?)
|
|
""",
|
|
(meal.suggested_date.isoformat(),),
|
|
) as cursor:
|
|
meal.id = cursor.lastrowid
|
|
|
|
await sync_meal_participants(conn, meal.id, meal.chefs, "chef")
|
|
await sync_meal_participants(conn, meal.id, meal.cleanup, "cleanup")
|
|
await sync_meal_participants(conn, meal.id, meal.consumers, "consumer")
|
|
|
|
for meal_recipe in meal.recipes:
|
|
meal_recipe.meal_id = meal.id
|
|
|
|
await insert_meal_recipe(conn, meal_recipe)
|
|
|
|
await sync_extra_ingredients(conn, meal.id, meal.extra_ingredients)
|
|
|
|
|
|
async def find_meal_by_id(conn, meal_id: int) -> Optional[Meal]:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Meal.KEYS)} FROM Meal
|
|
WHERE id = ?
|
|
LIMIT 1
|
|
""",
|
|
(meal_id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
meal = Meal(**{k: v for k, v in zip(Meal.KEYS, row)})
|
|
|
|
await load_participants(conn, meal)
|
|
await load_recipes(conn, meal)
|
|
await load_extra_ingredients(conn, meal)
|
|
return meal
|
|
return None
|
|
|
|
|
|
async def find_upcoming_meals_by_date_range(
|
|
conn, start: datetime.datetime, end: datetime.datetime
|
|
) -> AsyncIterator[Meal]:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Meal.KEYS)} FROM Meal
|
|
WHERE suggested_date >= ? AND suggested_date <= ? AND consumed_date IS NULL AND deleted_date IS NULL
|
|
""",
|
|
(start, end),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
yield Meal(**{k: v for k, v in zip(Meal.KEYS, row)})
|
|
|
|
|
|
async def load_participants(conn, meal: Meal) -> None:
|
|
async with conn.execute(
|
|
"""
|
|
SELECT person_id, role FROM MealParticipant
|
|
WHERE meal_id = ?
|
|
""",
|
|
(meal.id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
person = await persons.get_by_id(conn, row[0])
|
|
if row[1] == "chef":
|
|
if person:
|
|
meal.chefs.append(person)
|
|
elif row[1] == "cleanup":
|
|
if person:
|
|
meal.cleanup.append(person)
|
|
elif row[1] == "consumer":
|
|
if person:
|
|
meal.consumers.append(person)
|
|
else:
|
|
raise Exception(f"Unknown role: {row[1]}")
|
|
|
|
|
|
async def load_recipes(conn, meal: Meal) -> None:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Recipe.KEYS)}, MealRecipe.servings as requested_servings
|
|
FROM Recipe
|
|
JOIN MealRecipe ON MealRecipe.recipe_id = Recipe.id
|
|
WHERE MealRecipe.meal_id = ?
|
|
""",
|
|
(meal.id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
recipe = row_to_recipe(list(zip(Recipe.KEYS, row[:-1])))
|
|
await load_recipe_ingredients(conn, recipe)
|
|
|
|
meal.recipes.append(
|
|
MealRecipe(meal_id=meal.id, recipe_id=recipe.id, servings=row[-1], recipe=recipe)
|
|
)
|
|
|
|
|
|
async def load_extra_ingredients(conn, meal: Meal) -> None:
|
|
async for ingredient in find_ingredients_by_meal_id(conn, meal.id):
|
|
meal.extra_ingredients.append(ingredient)
|
|
|
|
|
|
async def delete_meal(conn, meal_id: int) -> None:
|
|
await conn.execute(
|
|
"""
|
|
UPDATE Meal
|
|
SET deleted_date = ?
|
|
WHERE id = ?
|
|
""",
|
|
(datetime.datetime.now().astimezone().isoformat(), meal_id),
|
|
)
|
|
|
|
|
|
async def sync_extra_ingredients(conn, meal_id: int, ingredients: List[Ingredient]) -> None:
|
|
await delete_ingredients_by_meal_id(conn, meal_id)
|
|
|
|
for ingredient in ingredients:
|
|
ingredient.meal_id = meal_id
|
|
ingredient.recipe_id = None
|
|
|
|
await insert_ingredient(conn, ingredient)
|
|
|
|
|
|
async def sync_meal_recipes(conn, meal_id: int, recipes: List[MealRecipe]) -> None:
|
|
await conn.execute(
|
|
"""
|
|
DELETE FROM MealRecipe
|
|
WHERE meal_id = ?
|
|
""",
|
|
(meal_id,),
|
|
)
|
|
|
|
for meal_recipe in recipes:
|
|
if meal_recipe.meal_id >= 0 and meal_recipe.meal_id != meal_id:
|
|
raise ValueError("Already associated with another meal")
|
|
|
|
meal_recipe.meal_id = meal_id
|
|
await insert_meal_recipe(conn, meal_recipe)
|
|
|
|
|
|
async def update_meal(conn, meal: Meal) -> None:
|
|
await conn.execute(
|
|
"""
|
|
UPDATE Meal
|
|
SET suggested_date = ?
|
|
WHERE id = ?
|
|
""",
|
|
(meal.suggested_date.isoformat(), meal.id),
|
|
)
|
|
|
|
await sync_meal_participants(conn, meal.id, meal.chefs, "chef")
|
|
await sync_meal_participants(conn, meal.id, meal.cleanup, "cleanup")
|
|
await sync_meal_participants(conn, meal.id, meal.consumers, "consumer")
|
|
|
|
await sync_extra_ingredients(conn, meal.id, meal.extra_ingredients)
|
|
await sync_meal_recipes(conn, meal.id, meal.recipes)
|
|
|
|
|
|
async def mark_consumed(conn, meal: Meal, date: datetime.datetime) -> None:
|
|
meal.consumed_date = date
|
|
|
|
await conn.execute(
|
|
"""
|
|
UPDATE Meal
|
|
SET consumed_date = ?
|
|
WHERE id = ?
|
|
""",
|
|
(date.isoformat(), meal.id),
|
|
)
|
|
|
|
|
|
async def mark_purchased(conn, meal: Meal) -> Meal:
|
|
meal.purchase_date = datetime.datetime.now().astimezone()
|
|
|
|
await conn.execute(
|
|
"""
|
|
UPDATE Meal
|
|
SET purchase_date = ?
|
|
WHERE id = ?
|
|
""",
|
|
(meal.purchase_date.isoformat(), meal.id),
|
|
)
|
|
|
|
return meal
|