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
166 lines
5.2 KiB
Python
166 lines
5.2 KiB
Python
from typing import Any, AsyncIterator, ClassVar, List, Optional
|
|
|
|
from pydantic import field_validator, Field
|
|
from common import ApiModel
|
|
|
|
from products import Product
|
|
from units import ALL_UNITS
|
|
|
|
|
|
class Ingredient(ApiModel):
|
|
KEYS: ClassVar[List[str]] = [
|
|
"id",
|
|
"name",
|
|
"line",
|
|
"preparation",
|
|
"unit",
|
|
"quantity",
|
|
"product_id",
|
|
"recipe_id",
|
|
"meal_id",
|
|
]
|
|
id: int = -1
|
|
name: str
|
|
line: str
|
|
unit: str = Field(
|
|
title="Unit",
|
|
description="Measurement unit (enum values are advisory; runtime accepts any string)",
|
|
json_schema_extra={"enum": [u.name for u in ALL_UNITS]},
|
|
)
|
|
quantity: float | str
|
|
preparation: str
|
|
product_id: Optional[int] = None
|
|
recipe_id: Optional[int] = None
|
|
meal_id: Optional[int] = None
|
|
product: Optional[Product] = None
|
|
|
|
# Ensure quantity is stored as a float even if provided as a string in tests
|
|
@field_validator("quantity", mode="before")
|
|
@classmethod
|
|
def _coerce_quantity(cls, v: Any) -> Any:
|
|
if isinstance(v, str):
|
|
try:
|
|
return float(v)
|
|
except ValueError:
|
|
return v
|
|
return v
|
|
|
|
|
|
async def create(conn):
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS Ingredient (
|
|
id INTEGER PRIMARY KEY,
|
|
name TEXT,
|
|
line TEXT,
|
|
preparation TEXT,
|
|
unit TEXT,
|
|
quantity REAL,
|
|
product_id INTEGER,
|
|
recipe_id INTEGER,
|
|
meal_id INTEGER,
|
|
FOREIGN KEY (product_id) REFERENCES Product(id),
|
|
FOREIGN KEY (recipe_id) REFERENCES Recipe(id),
|
|
FOREIGN KEY (meal_id) REFERENCES Meal(id)
|
|
);"""
|
|
)
|
|
|
|
|
|
async def insert_ingredient(conn, ingredient: Ingredient):
|
|
if ingredient.product:
|
|
ingredient.product_id = ingredient.product.id
|
|
|
|
if ingredient.product_id is None or ingredient.product_id < 0:
|
|
ingredient.product_id = None
|
|
|
|
async with conn.execute(
|
|
"""
|
|
INSERT INTO Ingredient (name, line, preparation, unit, quantity, product_id, recipe_id, meal_id)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
""",
|
|
(
|
|
ingredient.name,
|
|
ingredient.line,
|
|
ingredient.preparation,
|
|
ingredient.unit,
|
|
ingredient.quantity,
|
|
ingredient.product_id,
|
|
ingredient.recipe_id,
|
|
ingredient.meal_id,
|
|
),
|
|
) as cursor:
|
|
ingredient.id = cursor.lastrowid
|
|
|
|
|
|
async def find_ingredient_by_id(conn, ingredient_id: int) -> Optional[Ingredient]:
|
|
ingredient_cols = [f"ingredient.{key}" for key in Ingredient.KEYS]
|
|
product_cols = [f"product.{key}" for key in Product.KEYS]
|
|
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(ingredient_cols + product_cols)} FROM Ingredient
|
|
LEFT JOIN Product ON Ingredient.product_id = Product.id
|
|
WHERE Ingredient.id = ?
|
|
""",
|
|
(ingredient_id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
product_map = {k: v for k, v in zip(Product.KEYS, row[len(Ingredient.KEYS) :])}
|
|
product = Product(**product_map) if product_map["id"] else None
|
|
return Ingredient(
|
|
**{k: v for k, v in zip(Ingredient.KEYS, row[: len(Ingredient.KEYS)])},
|
|
product=product,
|
|
)
|
|
return None
|
|
|
|
|
|
async def find_ingredients_by_recipe_id(conn, recipe_id: int) -> AsyncIterator[Ingredient]:
|
|
ingredient_cols = [f"ingredient.{key}" for key in Ingredient.KEYS]
|
|
product_cols = [f"product.{key}" for key in Product.KEYS]
|
|
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(ingredient_cols + product_cols)} FROM Ingredient
|
|
LEFT JOIN Product ON Ingredient.product_id = Product.id
|
|
WHERE recipe_id = ?
|
|
""",
|
|
(recipe_id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
product_map = {k: v for k, v in zip(Product.KEYS, row[len(Ingredient.KEYS) :])}
|
|
product = Product(**product_map) if product_map["id"] else None
|
|
yield Ingredient(
|
|
**{k: v for k, v in zip(Ingredient.KEYS, row[: len(Ingredient.KEYS)])},
|
|
product=product,
|
|
)
|
|
|
|
|
|
async def find_ingredients_by_meal_id(conn, meal_id: int) -> AsyncIterator[Ingredient]:
|
|
ingredient_cols = [f"ingredient.{key}" for key in Ingredient.KEYS]
|
|
product_cols = [f"product.{key}" for key in Product.KEYS]
|
|
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(ingredient_cols + product_cols)} FROM Ingredient
|
|
LEFT JOIN Product ON Ingredient.product_id = Product.id
|
|
WHERE meal_id = ?
|
|
""",
|
|
(meal_id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
product_map = {k: v for k, v in zip(Product.KEYS, row[len(Ingredient.KEYS) :])}
|
|
product = Product(**product_map) if product_map["id"] else None
|
|
yield Ingredient(
|
|
**{k: v for k, v in zip(Ingredient.KEYS, row[: len(Ingredient.KEYS)])},
|
|
product=product,
|
|
)
|
|
|
|
|
|
async def delete_ingredients_by_meal_id(conn, meal_id: int):
|
|
await conn.execute(
|
|
"""
|
|
DELETE FROM Ingredient
|
|
WHERE meal_id = ?
|
|
""",
|
|
(meal_id,),
|
|
)
|