From 76314e2055003ff94c53c960aa8f805d613e5cbd Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Mon, 14 Mar 2022 19:06:58 +0100
Subject: [PATCH] feat(api): EE pagination for errors feat(api): FOSS
 refactored errors

---
 api/chalicelib/core/errors.py    |  9 +++++----
 ee/api/chalicelib/core/errors.py | 20 ++++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/api/chalicelib/core/errors.py b/api/chalicelib/core/errors.py
index b9780419d..4b6554c2b 100644
--- a/api/chalicelib/core/errors.py
+++ b/api/chalicelib/core/errors.py
@@ -423,6 +423,10 @@ def __get_sort_key(key):
 
 @dev.timed
 def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, status="ALL", favorite_only=False):
+    empty_response = {"data": {
+        'total': 0,
+        'errors': []
+    }}
     status = status.upper()
     if status.lower() not in ['all', 'unresolved', 'resolved', 'ignored']:
         return {"errors": ["invalid error status"]}
@@ -447,10 +451,7 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, s
         statuses = sessions.search2_pg(data=data, project_id=project_id, user_id=user_id, errors_only=True,
                                        error_status=status)
         if len(statuses) == 0:
-            return {"data": {
-                'total': 0,
-                'errors': []
-            }}
+            return empty_response
         error_ids = [e["error_id"] for e in statuses]
     with pg_client.PostgresClient() as cur:
         if data.startDate is None:
diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors.py
index dc4ea17b2..f70ac873e 100644
--- a/ee/api/chalicelib/core/errors.py
+++ b/ee/api/chalicelib/core/errors.py
@@ -483,13 +483,18 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, s
         order = "DESC"
         if data.order is not None:
             order = data.order
-        extra_join = ""
         params = {
             "startDate": data.startDate,
             "endDate": data.endDate,
             "project_id": project_id,
             "userId": user_id,
             "step_size": step_size}
+        if data.limit is not None and data.page is not None:
+            params["errors_offset"] = (data.page - 1) * data.limit
+            params["errors_limit"] = data.limit
+        else:
+            params["errors_offset"] = 0
+            params["errors_limit"] = 200
         if favorite_only:
             cur.execute(cur.mogrify(f"""SELECT error_id 
                                        FROM public.user_favorite_errors
@@ -531,9 +536,10 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, s
                           WHERE {" AND ".join(ch_sub_query)}
                           GROUP BY error_id, name, message
                           ORDER BY {sort} {order}
-                          LIMIT 200) AS details INNER JOIN (SELECT error_id AS error_id, toUnixTimestamp(MAX(datetime))*1000 AS last_occurrence, toUnixTimestamp(MIN(datetime))*1000 AS first_occurrence
-                         FROM errors
-                         GROUP BY error_id) AS time_details
+                          LIMIT %(errors_limit)s OFFSET %(errors_offset)s) AS details 
+                            INNER JOIN (SELECT error_id AS error_id, toUnixTimestamp(MAX(datetime))*1000 AS last_occurrence, toUnixTimestamp(MIN(datetime))*1000 AS first_occurrence
+                                         FROM errors
+                                         GROUP BY error_id) AS time_details
                     ON details.error_id=time_details.error_id
                         INNER JOIN (SELECT error_id, groupArray([timestamp, count]) AS chart
                         FROM (SELECT error_id, toUnixTimestamp(toStartOfInterval(datetime, INTERVAL %(step_size)s second)) * 1000 AS timestamp,
@@ -544,8 +550,10 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False, s
                                 ORDER BY timestamp) AS sub_table
                                 GROUP BY error_id) AS chart_details ON details.error_id=chart_details.error_id;"""
 
-            # print("--------------------")
-            # print(main_ch_query % params)
+            # print("------------")
+            # print(ch.client().substitute_params(main_ch_query, params))
+            # print("------------")
+
             rows = ch.execute(query=main_ch_query, params=params)
             if len(statuses) == 0:
                 query = cur.mogrify(