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
145 lines
3.6 KiB
Python
145 lines
3.6 KiB
Python
import json
|
|
from typing import AsyncIterator, ClassVar, List, Optional
|
|
|
|
from common import ApiModel
|
|
|
|
|
|
class Product(ApiModel):
|
|
KEYS: ClassVar[List[str]] = [
|
|
"id",
|
|
"product_id",
|
|
"shop_code",
|
|
"link",
|
|
"name",
|
|
"quantity",
|
|
"unit",
|
|
"img_small",
|
|
"img_large",
|
|
]
|
|
NON_INSERT_KEYS: ClassVar[List[str]] = ["id"]
|
|
|
|
id: int = -1
|
|
product_id: str
|
|
shop_code: str
|
|
link: str
|
|
name: str
|
|
quantity: int
|
|
unit: str
|
|
img_small: str
|
|
img_large: str
|
|
# Non-persisted field used in tests and insert helper
|
|
raw_data: Optional[dict] = None
|
|
|
|
|
|
async def create(conn):
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS Product (
|
|
id INTEGER PRIMARY KEY,
|
|
product_id TEXT UNIQUE NOT NULL,
|
|
shop_code TEXT NOT NULL,
|
|
link TEXT NOT NULL,
|
|
name TEXT NOT NULL,
|
|
quantity INTEGER NOT NULL,
|
|
unit TEXT NOT NULL,
|
|
img_small TEXT,
|
|
img_large TEXT,
|
|
raw_data TEXT
|
|
);"""
|
|
)
|
|
|
|
await conn.execute(
|
|
"""
|
|
CREATE TABLE IF NOT EXISTS ProductTag (
|
|
food_item_id INTEGER,
|
|
tag TEXT COLLATE NOCASE,
|
|
PRIMARY KEY (food_item_id, tag),
|
|
FOREIGN KEY (food_item_id) REFERENCES Product(id)
|
|
);"""
|
|
)
|
|
|
|
|
|
async def find_product_by_tag(conn, tag: str) -> AsyncIterator[Product]:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Product.KEYS)} FROM Product
|
|
WHERE id IN (
|
|
SELECT food_item_id FROM ProductTag
|
|
WHERE tag = ?
|
|
)
|
|
""",
|
|
(tag,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
yield Product(**{k: v for k, v in zip(Product.KEYS, row)})
|
|
|
|
|
|
async def find_product_by_id(conn, product_id: int) -> Optional[Product]:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Product.KEYS)} FROM Product
|
|
WHERE id = ?
|
|
LIMIT 1
|
|
""",
|
|
(product_id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
return Product(**{k: v for k, v in zip(Product.KEYS, row)})
|
|
return None
|
|
|
|
|
|
async def find_product_by_key(conn, shop_code: str, product_id: str) -> Optional[Product]:
|
|
async with conn.execute(
|
|
f"""
|
|
SELECT {','.join(Product.KEYS)} FROM Product
|
|
WHERE shop_code = ? AND product_id = ?
|
|
LIMIT 1
|
|
""",
|
|
(
|
|
shop_code,
|
|
product_id,
|
|
),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
return Product(**{k: v for k, v in zip(Product.KEYS, row)})
|
|
return None
|
|
|
|
|
|
async def insert_product(conn, product: Product, data: dict):
|
|
insert_keys = [k for k in Product.KEYS if k not in Product.NON_INSERT_KEYS]
|
|
insert_values = [getattr(product, k) for k in insert_keys]
|
|
|
|
async with conn.execute(
|
|
f"""
|
|
INSERT INTO Product ({','.join(insert_keys)}, raw_data)
|
|
VALUES ({','.join(['?'] * len(insert_keys))}, ?)
|
|
""",
|
|
(*insert_values, json.dumps(data)),
|
|
) as cursor:
|
|
product.id = cursor.lastrowid
|
|
|
|
await conn.commit()
|
|
|
|
|
|
async def add_tag(conn, product: Product, tag: str):
|
|
await conn.execute(
|
|
"""
|
|
INSERT INTO ProductTag (food_item_id, tag)
|
|
VALUES (?, ?)
|
|
""",
|
|
(product.id, tag),
|
|
)
|
|
|
|
await conn.commit()
|
|
|
|
|
|
async def get_tags(conn, product: Product) -> AsyncIterator[str]:
|
|
async with conn.execute(
|
|
"""
|
|
SELECT tag FROM ProductTag
|
|
WHERE food_item_id = ?
|
|
""",
|
|
(product.id,),
|
|
) as cursor:
|
|
async for row in cursor:
|
|
yield row[0]
|