Fix usdc search filter (#6188)

AudiusProject · Sep 30, 2023 · a174986 · a174986
1 parent 857f43b
commit a174986
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/discovery-provider/src/api/v1/helpers.py b/discovery-provider/src/api/v1/helpers.py
@@ -816,7 +816,7 @@ def add_auth_headers_to_parser(parser):
 full_search_parser.add_argument(
     "includePurchaseable",
     required=False,
-    type=bool,
+    type=str,
     description="Whether or not to include purchaseable content",
 )
 

diff --git a/discovery-provider/src/api/v1/search.py b/discovery-provider/src/api/v1/search.py
@@ -8,6 +8,7 @@
     full_search_parser,
     get_current_user_id,
     make_full_response,
+    parse_bool_param,
     success_response,
 )
 from src.api.v1.models.search import search_model
@@ -43,6 +44,7 @@ def get(self):
         offset = format_offset(args)
         limit = format_limit(args)
         current_user_id = get_current_user_id(args)
+        include_purchaseable = parse_bool_param(args.get("includePurchaseable"))
 
         search_args = {
             "is_auto_complete": False,
@@ -53,7 +55,7 @@ def get(self):
             "limit": limit,
             "offset": offset,
             "only_downloadable": False,
-            "include_purchaseable": args.get("includePurchaseable", False),
+            "include_purchaseable": include_purchaseable,
         }
         resp = search(search_args)
         return success_response(resp)
@@ -84,6 +86,7 @@ def get(self):
         offset = format_offset(args)
         limit = format_limit(args)
         current_user_id = get_current_user_id(args)
+        include_purchaseable = parse_bool_param(args.get("includePurchaseable"))
 
         search_args = {
             "is_auto_complete": True,
@@ -94,7 +97,7 @@ def get(self):
             "limit": limit,
             "offset": offset,
             "only_downloadable": False,
-            "include_purchaseable": args.get("includePurchaseable", False),
+            "include_purchaseable": include_purchaseable,
         }
         resp = search(search_args)
         return success_response(resp)
diff --git a/discovery-provider/src/api/v1/utils/extend_notification.py b/discovery-provider/src/api/v1/utils/extend_notification.py
@@ -464,7 +464,9 @@ def extend_usdc_purchase_seller(action: NotificationAction):
             "buyer_user_id": encode_int_id(data["buyer_user_id"]),
             "seller_user_id": encode_int_id(data["seller_user_id"]),
             "amount": str(data["amount"]),
-            "extra_amount": str(data["extra_amount"]),
+            "extra_amount": str(data["extra_amount"])
+            if "extra_amount" in data
+            else "0",
             "content_id": encode_int_id(data["content_id"]),
         },
     }
@@ -484,7 +486,9 @@ def extend_usdc_purchase_buyer(action: NotificationAction):
             "buyer_user_id": encode_int_id(data["buyer_user_id"]),
             "seller_user_id": encode_int_id(data["seller_user_id"]),
             "amount": str(data["amount"]),
-            "extra_amount": str(data["extra_amount"]),
+            "extra_amount": str(data["extra_amount"])
+            if "extra_amount" in data
+            else "0",
             "content_id": encode_int_id(data["content_id"]),
         },
     }

diff --git a/discovery-provider/src/queries/search_es.py b/discovery-provider/src/queries/search_es.py
@@ -175,7 +175,7 @@ def tag_match(fieldname, sort_by):
             "query": {
                 "bool": {
                     "must": [{"match": {fieldname: {"query": q}}}],
-                    "must_not": [],
+                    "must_not": [{"term": {"purchaseable": {"value": True}}}],
                     "should": [],
                 }
             },