Merge branch '228740-add-resolved-at' into 'master'

Add resolved at field to vulnerability type in GQL

See merge request gitlab-org/gitlab!49391

doc/api/graphql/reference/gitlab_schema.graphql

@@ -24958,6 +24958,11 @@ type Vulnerability implements Noteable {
   """
   reportType: VulnerabilityReportType
 
+  """
+  Timestamp of when the vulnerability state was changed to resolved
+  """
+  resolvedAt: Time
+
   """
   Indicates whether the vulnerability is fixed on the default branch or not
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -72624,6 +72624,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "resolvedAt",
+              "description": "Timestamp of when the vulnerability state was changed to resolved",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Time",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "resolvedOnDefaultBranch",
               "description": "Indicates whether the vulnerability is fixed on the default branch or not",

doc/api/graphql/reference/index.md

@@ -3754,6 +3754,7 @@ Represents a vulnerability.
 | `primaryIdentifier` | VulnerabilityIdentifier | Primary identifier of the vulnerability. |
 | `project` | Project | The project on which the vulnerability was found |
 | `reportType` | VulnerabilityReportType | Type of the security report that found the vulnerability (SAST, DEPENDENCY_SCANNING, CONTAINER_SCANNING, DAST, SECRET_DETECTION, COVERAGE_FUZZING, API_FUZZING) |
+| `resolvedAt` | Time | Timestamp of when the vulnerability state was changed to resolved |
 | `resolvedOnDefaultBranch` | Boolean! | Indicates whether the vulnerability is fixed on the default branch or not |
 | `scanner` | VulnerabilityScanner | Scanner metadata for the vulnerability. |
 | `severity` | VulnerabilitySeverity | Severity of the vulnerability (INFO, UNKNOWN, LOW, MEDIUM, HIGH, CRITICAL) |

ee/app/graphql/types/vulnerability_type.rb

@@ -69,6 +69,9 @@ module Types
           description: 'Timestamp of when the vulnerability state was changed to confirmed',
           method: :confirmed_at
 
+    field :resolved_at, Types::TimeType, null: true,
+          description: 'Timestamp of when the vulnerability state was changed to resolved'
+
     def user_notes_count
       ::Gitlab::Graphql::Aggregations::Vulnerabilities::LazyUserNotesCountAggregate.new(context, object)
     end

ee/changelogs/unreleased/228740-add-resolved-at.yml

+---
+title: Add resolved_at field to vulnerability type in GraphQL
+merge_request: 49391
+author:
+type: changed

ee/spec/graphql/types/vulnerability_type_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe GitlabSchema.types['Vulnerability'] do
        issueLinks
        detected_at
        confirmed_at
+       resolved_at
        notes
        external_issue_links
        discussions]