From bffcdf9bca11a4d43cc40e3f382f03088d36f7c6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 2 Dec 2019 12:06:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/services/error_tracking/list_issues_service.rb | 47 +++++-----------------
 1 file changed, 11 insertions(+), 36 deletions(-)

(limited to 'app/services/error_tracking')

diff --git a/app/services/error_tracking/list_issues_service.rb b/app/services/error_tracking/list_issues_service.rb
index a2c8e6e6619..132e9dfa7bd 100644
--- a/app/services/error_tracking/list_issues_service.rb
+++ b/app/services/error_tracking/list_issues_service.rb
@@ -6,37 +6,24 @@ module ErrorTracking
     DEFAULT_LIMIT = 20
     DEFAULT_SORT = 'last_seen'
 
-    def execute
-      return error('Error Tracking is not enabled') unless enabled?
-      return error('Access denied', :unauthorized) unless can_read?
-
-      result = project_error_tracking_setting.list_sentry_issues(
-        issue_status: issue_status,
-        limit: limit,
-        search_term: search_term,
-        sort: sort
-      )
-
-      # our results are not yet ready
-      unless result
-        return error('Not ready. Try again later', :no_content)
-      end
-
-      if result[:error].present?
-        return error(result[:error], http_status_for(result[:error_type]))
-      end
-
-      success(issues: result[:issues])
-    end
-
     def external_url
       project_error_tracking_setting&.sentry_external_url
     end
 
     private
 
+    def fetch
+      project_error_tracking_setting.list_sentry_issues(
+        issue_status: issue_status,
+        limit: limit,
+        search_term: params[:search_term].presence,
+        sort: sort,
+        cursor: params[:cursor].presence
+      )
+    end
+
     def parse_response(response)
-      { issues: response[:issues] }
+      response.slice(:issues, :pagination)
     end
 
     def issue_status
@@ -47,18 +34,6 @@ module ErrorTracking
       params[:limit] || DEFAULT_LIMIT
     end
 
-    def search_term
-      params[:search_term].presence
-    end
-
-    def enabled?
-      project_error_tracking_setting&.enabled?
-    end
-
-    def can_read?
-      can?(current_user, :read_sentry_issue, project)
-    end
-
     def sort
       params[:sort] || DEFAULT_SORT
     end
-- 
cgit v1.2.1