Normalize repository pagination defensively

这个提交存在于:
YokiiroBW 2026-07-05 20:12:52 +08:00
父节点 2339c80462
当前提交 d80d23c3dc
共有 6 个文件被更改,包括 108 次插入 和 8 次删除

查看文件

@ -133,7 +133,9 @@ class JobRepository:
where.append(f"profile_id = {placeholder}")
params.append(profile_id)
where_clause = f"WHERE {' AND '.join(where)}" if where else ""
offset = max(page - 1, 0) * page_size
normalized_page = _page(page)
normalized_page_size = _page_size(page_size)
offset = (normalized_page - 1) * normalized_page_size
conn = self.database.connect()
try:
total_row = conn.execute(
@ -148,7 +150,7 @@ class JobRepository:
ORDER BY created_at DESC
LIMIT {placeholder} OFFSET {placeholder}
""",
tuple(params + [page_size, offset]),
tuple(params + [normalized_page_size, offset]),
).fetchall()
finally:
conn.close()
@ -270,6 +272,22 @@ def _limit(value: int) -> int:
return min(max(limit, 1), 100)
def _page(value: Any) -> int:
try:
page = int(value)
except (TypeError, ValueError):
page = 1
return max(page, 1)
def _page_size(value: Any) -> int:
try:
page_size = int(value)
except (TypeError, ValueError):
page_size = 30
return min(max(page_size, 1), 100)
def _json_loads(value: str | None) -> dict[str, Any]:
if not value:
return {}

查看文件

@ -213,7 +213,9 @@ class MaterialRepository:
like = f"%{keyword}%"
params.extend([like, like])
where_clause = f"WHERE {' AND '.join(where)}"
offset = max(page - 1, 0) * page_size
normalized_page = _page(page)
normalized_page_size = _page_size(page_size)
offset = (normalized_page - 1) * normalized_page_size
conn = self.database.connect()
try:
total_row = conn.execute(
@ -228,7 +230,7 @@ class MaterialRepository:
ORDER BY created_at DESC
LIMIT {placeholder} OFFSET {placeholder}
""",
tuple(params + [page_size, offset]),
tuple(params + [normalized_page_size, offset]),
).fetchall()
finally:
conn.close()
@ -314,6 +316,22 @@ def _json_or_none(value: Any | None) -> str | None:
return json.dumps(value, ensure_ascii=False, sort_keys=True)
def _page(value: Any) -> int:
try:
page = int(value)
except (TypeError, ValueError):
page = 1
return max(page, 1)
def _page_size(value: Any) -> int:
try:
page_size = int(value)
except (TypeError, ValueError):
page_size = 30
return min(max(page_size, 1), 100)
def _json_loads(value: str | None) -> dict[str, Any]:
if not value:
return {}

查看文件

@ -118,7 +118,9 @@ class ProfileRepository:
keyword=keyword,
status=status,
)
offset = max(page - 1, 0) * page_size
normalized_page = _page(page)
normalized_page_size = _page_size(page_size)
offset = (normalized_page - 1) * normalized_page_size
conn = self.database.connect()
try:
count_row = conn.execute(
@ -131,7 +133,7 @@ class ProfileRepository:
FROM character_profiles
{where}
ORDER BY updated_at DESC, created_at DESC
LIMIT {int(page_size)} OFFSET {int(offset)}
LIMIT {normalized_page_size} OFFSET {offset}
""",
tuple(params),
).fetchall()
@ -139,8 +141,8 @@ class ProfileRepository:
conn.close()
return ProfileListResult(
items=[_row_to_profile(row) for row in rows],
page=page,
page_size=page_size,
page=normalized_page,
page_size=normalized_page_size,
total=int(count_row["total"] if count_row else 0),
)
@ -247,3 +249,19 @@ def _json_or_none(value: Any | None) -> str | None:
if value is None:
return None
return json.dumps(value, ensure_ascii=False, sort_keys=True)
def _page(value: Any) -> int:
try:
page = int(value)
except (TypeError, ValueError):
page = 1
return max(page, 1)
def _page_size(value: Any) -> int:
try:
page_size = int(value)
except (TypeError, ValueError):
page_size = 30
return min(max(page_size, 1), 100)

查看文件

@ -93,6 +93,26 @@ class MaterialServiceTests(unittest.TestCase):
self.ctx,
)
def test_material_repository_pagination_is_normalized(self):
category = self.material_service.create_category({"name": "Upper"}, self.ctx)
for index in range(3):
self.material_service.create_material(
{
"category_id": category.category_id,
"display_name": f"Material {index}",
"image_uri": f"storage://materials/item_{index}.png",
},
self.ctx,
)
zero_items, zero_total = self.material_service.repository.list_materials(page=0, page_size=0)
huge_items, huge_total = self.material_service.repository.list_materials(page=1, page_size=999)
self.assertEqual(len(zero_items), 1)
self.assertEqual(zero_total, 3)
self.assertEqual(len(huge_items), 3)
self.assertEqual(huge_total, 3)
def test_upload_recognize_and_confirm_material(self):
category = self.material_service.create_category({"name": "Upper"}, self.ctx)
uploaded = self.material_service.upload_material(

查看文件

@ -115,6 +115,19 @@ class ProfileServiceTests(unittest.TestCase):
self.assertEqual(result.total, 1)
self.assertEqual(result.items[0].profile_id, own.profile_id)
def test_profile_repository_pagination_is_normalized(self):
for index in range(3):
self.service.create_profile({"name": f"Nova {index}"}, self.ctx)
zero_size = self.service.repository.list(owner_user_id=self.ctx.actor_id, page=0, page_size=0)
huge_size = self.service.repository.list(owner_user_id=self.ctx.actor_id, page=1, page_size=999)
self.assertEqual(zero_size.page, 1)
self.assertEqual(zero_size.page_size, 1)
self.assertEqual(len(zero_size.items), 1)
self.assertEqual(huge_size.page_size, 100)
self.assertEqual(huge_size.total, 3)
def test_create_profile_requires_name(self):
with self.assertRaises(ApiError) as raised:
self.service.create_profile({"name": " "}, self.ctx)

查看文件

@ -86,6 +86,19 @@ class QueueServiceTests(unittest.TestCase):
self.assertEqual(len(repository.recent(limit=-5)), 1)
self.assertEqual(len(repository.recent(limit=999)), 3)
def test_job_repository_pagination_is_normalized(self):
repository = self.queue_service.repository
for index in range(3):
self.queue_service.create_task({"status": "queued", "request": {"index": index}}, self.ctx)
zero_items, zero_total = repository.list(page=0, page_size=0)
huge_items, huge_total = repository.list(page=1, page_size=999)
self.assertEqual(len(zero_items), 1)
self.assertEqual(zero_total, 3)
self.assertEqual(len(huge_items), 3)
self.assertEqual(huge_total, 3)
if __name__ == "__main__":
unittest.main()