Add shop search by purchaseType

Author: narumi147

app/core/search.py

@@ -30,6 +30,7 @@
     ITEM_BG_TYPE_REVERSE,
     ITEM_TYPE_REVERSE,
     PAY_TYPE_NAME_REVERSE,
+    PURCHASE_TYPE_NAME_REVERSE,
     QUEST_FLAG_REVERSE,
     QUEST_TYPE_REVERSE,
     SHOP_TYPE_NAME_REVERSE,
@@ -499,12 +500,17 @@ async def search_shop(
     pay_type_ints = {
         PAY_TYPE_NAME_REVERSE[pay_type] for pay_type in search_param.payType
     }
+    purchase_type_ints = {
+        PURCHASE_TYPE_NAME_REVERSE[purchase_type]
+        for purchase_type in search_param.purchaseType
+    }
 
     matches = await get_shop_search(
         conn,
         event_ids=search_param.eventId,
         shop_type_ints=shop_type_ints,
         pay_type_ints=pay_type_ints,
+        purchase_type_ints=purchase_type_ints,
     )
 
     if search_param.name:

app/db/helpers/event.py

@@ -71,6 +71,7 @@ async def get_shop_search(
     event_ids: Iterable[int] | None = None,
     shop_type_ints: Iterable[int] | None = None,
     pay_type_ints: Iterable[int] | None = None,
+    purchase_type_ints: Iterable[int] | None = None,
 ) -> list[MstShop]:
     from_clause: Join | Table = mstShop
     where_clause: list[_ColumnExpressionArgument[bool]] = [true()]
@@ -81,6 +82,8 @@ async def get_shop_search(
         where_clause.append(mstShop.c.shopType.in_(shop_type_ints))
     if pay_type_ints:
         where_clause.append(mstShop.c.payType.in_(pay_type_ints))
+    if purchase_type_ints:
+        where_clause.append(mstShop.c.purchaseType.in_(purchase_type_ints))
 
     shop_search_stmt = (
         select(mstShop).distinct().select_from(from_clause).where(and_(*where_clause))

app/schemas/enums.py

@@ -45,6 +45,7 @@
     NiceFuncType,
     NiceGender,
     NicePayType,
+    NicePurchaseType,
     NiceQuestFlag,
     NiceQuestType,
     NiceShopType,
@@ -573,6 +574,10 @@ class EventRewardSceneType(IntEnum):
 
 PAY_TYPE_NAME_REVERSE: dict[NicePayType, int] = {v: k for k, v in PAY_TYPE_NAME.items()}
 
+PURCHASE_TYPE_NAME_REVERSE: dict[NicePurchaseType, int] = {
+    v: k for k, v in PURCHASE_TYPE_NAME.items()
+}
+
 
 ### EventPointActivity.objectType ###
 

app/schemas/search.py

@@ -25,6 +25,7 @@
     NiceGender,
     NiceItemType,
     NicePayType,
+    NicePurchaseType,
     NiceQuestFlag,
     NiceQuestType,
     NiceShopType,
@@ -522,6 +523,7 @@ class ShopSearchQueryParams:
     eventId: list[int] = Query([])
     type: list[NiceShopType] = Query([])
     payType: list[NicePayType] = Query([])
+    purchaseType: list[NicePurchaseType] = Query([])
 
     def hasSearchParams(self) -> bool:
         return any(
@@ -530,6 +532,7 @@ def hasSearchParams(self) -> bool:
                 self.eventId,
                 self.type,
                 self.payType,
+                self.purchaseType,
             ]
         )