Merge branch 'ajk-281697-error-tracking' into 'master'

Add type annotations for error tracking resolvers

See merge request gitlab-org/gitlab!47682

.rubocop_manual_todo.yml

@@ -44,7 +44,6 @@ Graphql/ResolverType:
     - 'app/graphql/resolvers/base_resolver.rb'
     - 'app/graphql/resolvers/ci/jobs_resolver.rb'
     - 'app/graphql/resolvers/ci/pipeline_stages_resolver.rb'
-    - 'app/graphql/resolvers/error_tracking/sentry_error_stack_trace_resolver.rb'
     - 'app/graphql/resolvers/merge_requests_resolver.rb'
     - 'app/graphql/resolvers/users/group_count_resolver.rb'
     - 'ee/app/graphql/resolvers/geo/merge_request_diff_registries_resolver.rb'

app/graphql/resolvers/error_tracking/sentry_error_stack_trace_resolver.rb

@@ -3,6 +3,8 @@
 module Resolvers
   module ErrorTracking
     class SentryErrorStackTraceResolver < BaseResolver
+      type Types::ErrorTracking::SentryErrorStackTraceType, null: true
+
       argument :id, ::Types::GlobalIDType[::Gitlab::ErrorTracking::DetailedError],
                 required: true,
                 description: 'ID of the Sentry issue'

app/graphql/resolvers/error_tracking/sentry_errors_resolver.rb

@@ -4,19 +4,26 @@ module Resolvers
   module ErrorTracking
     class SentryErrorsResolver < BaseResolver
       type Types::ErrorTracking::SentryErrorType.connection_type, null: true
+      extension Gitlab::Graphql::Extensions::ExternallyPaginatedArrayExtension
+
+      argument :search_term, ::GraphQL::STRING_TYPE,
+              description: 'Search query for the Sentry error details',
+              required: false
+
+      # TODO: convert to Enum
+      argument :sort, ::GraphQL::STRING_TYPE,
+              description: 'Attribute to sort on. Options are frequency, first_seen, last_seen. last_seen is default',
+              required: false
+
+      delegate :project, to: :object
 
       def resolve(**args)
         args[:cursor] = args.delete(:after)
-        project = object.project
 
-        result = ::ErrorTracking::ListIssuesService.new(
-          project,
-          context[:current_user],
-          args
-        ).execute
+        result = ::ErrorTracking::ListIssuesService.new(project, current_user, args).execute
 
-        next_cursor = result[:pagination]&.dig('next', 'cursor')
-        previous_cursor = result[:pagination]&.dig('previous', 'cursor')
+        next_cursor = result.dig(:pagination, 'next', 'cursor')
+        previous_cursor = result.dig(:pagination, 'previous', 'cursor')
         issues = result[:issues]
 
         # ReactiveCache is still fetching data
@@ -24,6 +31,10 @@ module Resolvers
 
         Gitlab::Graphql::ExternallyPaginatedArray.new(previous_cursor, next_cursor, *issues)
       end
+
+      def self.field_options
+        super.merge(connection: false) # we manage the pagination manually, so opt out of the connection field extension
+      end
     end
   end
 end

app/graphql/types/error_tracking/sentry_error_collection_type.rb

@@ -9,27 +9,12 @@ module Types
       authorize :read_sentry_issue
 
       field :errors,
-            Types::ErrorTracking::SentryErrorType.connection_type,
-            connection: false,
-            null: true,
             description: "Collection of Sentry Errors",
-            extensions: [Gitlab::Graphql::Extensions::ExternallyPaginatedArrayExtension],
-            resolver: Resolvers::ErrorTracking::SentryErrorsResolver do
-              argument :search_term,
-                      String,
-                      description: 'Search query for the Sentry error details',
-                      required: false
-              argument :sort,
-                      String,
-                      description: 'Attribute to sort on. Options are frequency, first_seen, last_seen. last_seen is default',
-                      required: false
-            end
-      field :detailed_error, Types::ErrorTracking::SentryDetailedErrorType,
-            null: true,
+            resolver: Resolvers::ErrorTracking::SentryErrorsResolver
+      field :detailed_error,
             description: 'Detailed version of a Sentry error on the project',
             resolver: Resolvers::ErrorTracking::SentryDetailedErrorResolver
-      field :error_stack_trace, Types::ErrorTracking::SentryErrorStackTraceType,
-            null: true,
+      field :error_stack_trace,
             description: 'Stack Trace of Sentry Error',
             resolver: Resolvers::ErrorTracking::SentryErrorStackTraceResolver
       field :external_url,

doc/api/graphql/reference/gitlab_schema.json

@@ -57602,8 +57602,8 @@
               "description": "Collection of Sentry Errors",
               "args": [
                 {
-                  "name": "after",
-                  "description": "Returns the elements in the list that come after the specified cursor.",
+                  "name": "searchTerm",
+                  "description": "Search query for the Sentry error details",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -57612,8 +57612,8 @@
                   "defaultValue": null
                 },
                 {
-                  "name": "before",
-                  "description": "Returns the elements in the list that come before the specified cursor.",
+                  "name": "sort",
+                  "description": "Attribute to sort on. Options are frequency, first_seen, last_seen. last_seen is default",
                   "type": {
                     "kind": "SCALAR",
                     "name": "String",
@@ -57622,41 +57622,41 @@
                   "defaultValue": null
                 },
                 {
-                  "name": "first",
-                  "description": "Returns the first _n_ elements from the list.",
+                  "name": "after",
+                  "description": "Returns the elements in the list that come after the specified cursor.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "last",
-                  "description": "Returns the last _n_ elements from the list.",
+                  "name": "before",
+                  "description": "Returns the elements in the list that come before the specified cursor.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "Int",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "searchTerm",
-                  "description": "Search query for the Sentry error details",
+                  "name": "first",
+                  "description": "Returns the first _n_ elements from the list.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "String",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null
                 },
                 {
-                  "name": "sort",
-                  "description": "Attribute to sort on. Options are frequency, first_seen, last_seen. last_seen is default",
+                  "name": "last",
+                  "description": "Returns the last _n_ elements from the list.",
                   "type": {
                     "kind": "SCALAR",
-                    "name": "String",
+                    "name": "Int",
                     "ofType": null
                   },
                   "defaultValue": null