From 43701dd132985c5745162476fa851848f25f0482 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Tue, 15 Mar 2022 18:46:19 +0100
Subject: [PATCH] feat(api): FOSS search-errors by name and message feat(api):
 EE search-errors by name and message

---
 api/chalicelib/core/errors.py    |  8 ++++++--
 api/chalicelib/core/sessions.py  |  6 +++---
 api/schemas.py                   |  1 +
 ee/api/chalicelib/core/errors.py | 10 +++++++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/api/chalicelib/core/errors.py b/api/chalicelib/core/errors.py
index 4d568dc59..c1f5633de 100644
--- a/api/chalicelib/core/errors.py
+++ b/api/chalicelib/core/errors.py
@@ -490,8 +490,12 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False):
         if data.bookmarked:
             pg_sub_query.append("ufe.user_id = %(userId)s")
             extra_join += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)"
-        main_pg_query = f"""\
-                            SELECT full_count,
+        if data.query is not None and len(data.query) > 0:
+            pg_sub_query.append("(pe.name ILIKE %(error_query)s OR pe.message ILIKE %(error_query)s)")
+            params["error_query"] = helper.values_for_operator(value=data.query,
+                                                               op=schemas.SearchEventOperator._contains)
+
+        main_pg_query = f"""SELECT full_count,
                                    error_id,
                                    name,
                                    message,
diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index 45a1bd52c..074629f97 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -169,7 +169,7 @@ def _isUndefined_operator(op: schemas.SearchEventOperator):
 
 @dev.timed
 def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, errors_only=False,
-               error_status="ALL", count_only=False, issue=None):
+               error_status=schemas.ErrorStatus.all, count_only=False, issue=None):
     full_args, query_part, sort = search_query_parts(data=data, error_status=error_status, errors_only=errors_only,
                                                      favorite_only=data.bookmarked, issue=issue, project_id=project_id,
                                                      user_id=user_id)
@@ -962,9 +962,9 @@ def search_query_parts(data, error_status, errors_only, favorite_only, issue, pr
         extra_from += f" INNER JOIN {events.event_type.ERROR.table} AS er USING (session_id) INNER JOIN public.errors AS ser USING (error_id)"
         extra_constraints.append("ser.source = 'js_exception'")
         extra_constraints.append("ser.project_id = %(project_id)s")
-        if error_status != "ALL":
+        if error_status != schemas.ErrorStatus.all:
             extra_constraints.append("ser.status = %(error_status)s")
-            full_args["error_status"] = error_status.lower()
+            full_args["error_status"] = error_status
         if favorite_only:
             extra_from += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)"
             extra_constraints.append("ufe.user_id = %(userId)s")
diff --git a/api/schemas.py b/api/schemas.py
index 76fc754bb..1d0e18dfb 100644
--- a/api/schemas.py
+++ b/api/schemas.py
@@ -700,6 +700,7 @@ class ErrorStatus(str, Enum):
 class SearchErrorsSchema(SessionsSearchPayloadSchema):
     density: Optional[int] = Field(7)
     status: Optional[ErrorStatus] = Field(default=ErrorStatus.all)
+    query: Optional[str] = Field(default=None)
 
 
 class MetricPayloadSchema(BaseModel):
diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors.py
index 2705a1115..407e94052 100644
--- a/ee/api/chalicelib/core/errors.py
+++ b/ee/api/chalicelib/core/errors.py
@@ -530,8 +530,12 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False):
         if data.bookmarked:
             pg_sub_query.append("ufe.user_id = %(userId)s")
             extra_join += " INNER JOIN public.user_favorite_errors AS ufe USING (error_id)"
-        main_pg_query = f"""\
-                            SELECT full_count,
+        if data.query is not None and len(data.query) > 0:
+            pg_sub_query.append("(pe.name ILIKE %(error_query)s OR pe.message ILIKE %(error_query)s)")
+            params["error_query"] = helper.values_for_operator(value=data.query,
+                                                               op=schemas.SearchEventOperator._contains)
+
+        main_pg_query = f"""SELECT full_count,
                                    error_id,
                                    name,
                                    message,
@@ -635,7 +639,7 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False):
     }
 
 
-# refactor this function after clickhouse structure changes
+# refactor this function after clickhouse structure changes (missing search by query)
 def search_deprecated(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False):
     empty_response = {"data": {
         'total': 0,