Add limit to shop search

Author: narumi147

app/core/search.py

@@ -489,7 +489,6 @@ async def search_script(
 async def search_shop(
     conn: AsyncConnection,
     search_param: ShopSearchQueryParams,
-    limit: int = 100,
 ) -> list[MstShop]:
     if not search_param.hasSearchParams():
         raise HTTPException(status_code=400, detail=INSUFFICIENT_QUERY)
@@ -511,14 +510,12 @@ async def search_shop(
         shop_type_ints=shop_type_ints,
         pay_type_ints=pay_type_ints,
         purchase_type_ints=purchase_type_ints,
+        limit=search_param.limit,
     )
 
     if search_param.name:
         matches = [item for item in matches if match_name(search_param.name, item.name)]
 
-    if len(matches) > limit:  # pragma: no cover
-        raise HTTPException(status_code=403, detail=TOO_MANY_RESULTS.format(limit))
-
     return sorted(matches, key=lambda shop: shop.id)
 
 

app/db/helpers/event.py

@@ -72,6 +72,7 @@ async def get_shop_search(
     shop_type_ints: Iterable[int] | None = None,
     pay_type_ints: Iterable[int] | None = None,
     purchase_type_ints: Iterable[int] | None = None,
+    limit: int = 100,
 ) -> list[MstShop]:
     from_clause: Join | Table = mstShop
     where_clause: list[_ColumnExpressionArgument[bool]] = [true()]
@@ -86,7 +87,11 @@ async def get_shop_search(
         where_clause.append(mstShop.c.purchaseType.in_(purchase_type_ints))
 
     shop_search_stmt = (
-        select(mstShop).distinct().select_from(from_clause).where(and_(*where_clause))
+        select(mstShop)
+        .distinct()
+        .select_from(from_clause)
+        .where(and_(*where_clause))
+        .limit(limit)
     )
 
     return [

app/routers/nice.py

@@ -951,7 +951,7 @@ async def find_shop(
     lang: Language = Depends(language_parameter),
 ) -> Response:
     async with get_db(search_param.region) as conn:
-        matches = await search.search_shop(conn, search_param, limit=10000)
+        matches = await search.search_shop(conn, search_param)
         return list_response(
             await get_nice_shops_from_raw(conn, search_param.region, matches, lang)
         )

app/routers/raw.py

@@ -808,7 +808,7 @@ async def find_shop(
     search_param: ShopSearchQueryParams = Depends(ShopSearchQueryParams),
 ) -> Response:
     async with get_db(search_param.region) as conn:
-        matches = await search.search_shop(conn, search_param, limit=10000)
+        matches = await search.search_shop(conn, search_param)
         return list_response(await raw.get_shop_entities(conn, matches))
 
 

app/schemas/search.py

@@ -524,6 +524,7 @@ class ShopSearchQueryParams:
     type: list[NiceShopType] = Query([])
     payType: list[NicePayType] = Query([])
     purchaseType: list[NicePurchaseType] = Query([])
+    limit: int = Query(10000, le=10000)
 
     def hasSearchParams(self) -> bool:
         return any(