Merge branch '276502-remove-old-burnup-endpoint' into 'master'

Remove old GraphQL burnup time series endpoint

See merge request gitlab-org/gitlab!47465

doc/api/graphql/reference/gitlab_schema.graphql

@@ -11249,11 +11249,6 @@ enum IssueType {
 Represents an iteration object
 """
 type Iteration implements TimeboxReportInterface {
-  """
-  Daily scope and completed totals for burnup charts
-  """
-  burnupTimeSeries: [BurnupChartDailyTotals!]
-
   """
   Timestamp of iteration creation
   """
@@ -13339,11 +13334,6 @@ type MetricsDashboardAnnotationEdge {
 Represents a milestone
 """
 type Milestone implements TimeboxReportInterface {
-  """
-  Daily scope and completed totals for burnup charts
-  """
-  burnupTimeSeries: [BurnupChartDailyTotals!]
-
   """
   Timestamp of milestone creation
   """
@@ -20978,11 +20968,6 @@ type TimeboxReport {
 }
 
 interface TimeboxReportInterface {
-  """
-  Daily scope and completed totals for burnup charts
-  """
-  burnupTimeSeries: [BurnupChartDailyTotals!]
-
   """
   Historically accurate report about the timebox
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -30716,28 +30716,6 @@
           "name": "Iteration",
           "description": "Represents an iteration object",
           "fields": [
-            {
-              "name": "burnupTimeSeries",
-              "description": "Daily scope and completed totals for burnup charts",
-              "args": [
-
-              ],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "BurnupChartDailyTotals",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "createdAt",
               "description": "Timestamp of iteration creation",
@@ -36676,28 +36654,6 @@
           "name": "Milestone",
           "description": "Represents a milestone",
           "fields": [
-            {
-              "name": "burnupTimeSeries",
-              "description": "Daily scope and completed totals for burnup charts",
-              "args": [
-
-              ],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "BurnupChartDailyTotals",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "createdAt",
               "description": "Timestamp of milestone creation",
@@ -60973,28 +60929,6 @@
           "name": "TimeboxReportInterface",
           "description": null,
           "fields": [
-            {
-              "name": "burnupTimeSeries",
-              "description": "Daily scope and completed totals for burnup charts",
-              "args": [
-
-              ],
-              "type": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "BurnupChartDailyTotals",
-                    "ofType": null
-                  }
-                }
-              },
-              "isDeprecated": false,
-              "deprecationReason": null
-            },
             {
               "name": "report",
               "description": "Historically accurate report about the timebox",

doc/api/graphql/reference/index.md

@@ -1719,7 +1719,6 @@ Represents an iteration object.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `burnupTimeSeries` | BurnupChartDailyTotals! => Array | Daily scope and completed totals for burnup charts |
 | `createdAt` | Time! | Timestamp of iteration creation |
 | `description` | String | Description of the iteration |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
@@ -2042,7 +2041,6 @@ Represents a milestone.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `burnupTimeSeries` | BurnupChartDailyTotals! => Array | Daily scope and completed totals for burnup charts |
 | `createdAt` | Time! | Timestamp of milestone creation |
 | `description` | String | Description of the milestone |
 | `dueDate` | Time | Timestamp of the milestone due date |

ee/app/graphql/resolvers/timebox_burnup_time_series_resolver.rb

-# frozen_string_literal: true
-
-module Resolvers
-  class TimeboxBurnupTimeSeriesResolver < BaseResolver
-    type [Types::BurnupChartDailyTotalsType], null: true
-
-    alias_method :timebox, :synchronized_object
-
-    def resolve(*args)
-      return [] unless timebox.burnup_charts_available?
-
-      response = TimeboxReportService.new(timebox).execute
-
-      raise GraphQL::ExecutionError, response.message if response.error?
-
-      response.payload[:burnup_time_series]
-    end
-  end
-end

ee/app/graphql/types/timebox_report_interface.rb

@@ -8,10 +8,5 @@ module Types
           resolver: ::Resolvers::TimeboxReportResolver,
           description: 'Historically accurate report about the timebox',
           complexity: 175
-
-    field :burnup_time_series, [::Types::BurnupChartDailyTotalsType], null: true,
-          resolver: ::Resolvers::TimeboxBurnupTimeSeriesResolver,
-          description: 'Daily scope and completed totals for burnup charts',
-          complexity: 175
   end
 end

ee/spec/graphql/ee/types/milestone_type_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe GitlabSchema.types['Milestone'] do
   it 'has the expected fields' do
     expected_fields = %w[
-      report burnup_time_series
+      report
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields).at_least

ee/spec/graphql/resolvers/timebox_burnup_time_series_resolver_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Resolvers::TimeboxBurnupTimeSeriesResolver do
-  include GraphqlHelpers
-
-  let_it_be(:group) { create(:group) }
-  let_it_be(:project) { create(:project, group: group) }
-  let_it_be(:issues) { create_list(:issue, 2, project: project) }
-  let_it_be(:start_date) { Date.today }
-  let_it_be(:due_date) { start_date + 2.weeks }
-
-  before do
-    stub_licensed_features(milestone_charts: true, issue_weights: true, iterations: true)
-  end
-
-  RSpec.shared_examples 'timebox time series' do
-    subject { resolve(described_class, obj: timebox) }
-
-    context 'when the feature flag is disabled' do
-      before do
-        stub_feature_flags(burnup_charts: false, iteration_charts: false)
-      end
-
-      it 'returns empty data' do
-        expect(subject).to be_empty
-      end
-    end
-
-    context 'when the feature flag is enabled' do
-      before do
-        stub_feature_flags(burnup_charts: true, iteration_charts: true)
-      end
-
-      it 'returns burnup chart data' do
-        expect(subject).to eq([
-                                {
-                                  date: start_date + 4.days,
-                                  scope_count: 1,
-                                  scope_weight: 0,
-                                  completed_count: 0,
-                                  completed_weight: 0
-                                },
-                                {
-                                  date: start_date + 9.days,
-                                  scope_count: 2,
-                                  scope_weight: 0,
-                                  completed_count: 0,
-                                  completed_weight: 0
-                                }
-                              ])
-      end
-
-      context 'when the service returns an error' do
-        before do
-          stub_const('TimeboxReportService::EVENT_COUNT_LIMIT', 1)
-        end
-
-        it 'raises a GraphQL exception' do
-          expect { subject }.to raise_error(GraphQL::ExecutionError, 'Burnup chart could not be generated due to too many events')
-        end
-      end
-    end
-  end
-
-  context 'when timebox is a milestone' do
-    let_it_be(:timebox) { create(:milestone, project: project, start_date: start_date, due_date: due_date) }
-
-    before_all do
-      create(:resource_milestone_event, issue: issues[0], milestone: timebox, action: :add, created_at: start_date + 4.days)
-      create(:resource_milestone_event, issue: issues[1], milestone: timebox, action: :add, created_at: start_date + 9.days)
-    end
-
-    it_behaves_like 'timebox time series'
-  end
-
-  context 'when timebox is an iteration' do
-    let_it_be(:timebox) { create(:iteration, group: group, start_date: start_date, due_date: due_date) }
-
-    before_all do
-      create(:resource_iteration_event, issue: issues[0], iteration: timebox, action: :add, created_at: start_date + 4.days)
-      create(:resource_iteration_event, issue: issues[1], iteration: timebox, action: :add, created_at: start_date + 9.days)
-    end
-
-    it_behaves_like 'timebox time series'
-  end
-end

ee/spec/graphql/types/iteration_type_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe GitlabSchema.types['Iteration'] do
   it 'has the expected fields' do
     expected_fields = %w[
       id id title description state web_path web_url scoped_path scoped_url
-      due_date start_date created_at updated_at report burnup_time_series
+      due_date start_date created_at updated_at report
     ]
 
     expect(described_class).to have_graphql_fields(*expected_fields).at_least

ee/spec/requests/api/graphql/milestone_spec.rb

@@ -22,12 +22,14 @@ RSpec.describe 'Querying a Milestone' do
   context 'burnupTimeSeries' do
     let(:fields) do
       <<~FIELDS
-      burnupTimeSeries {
-        date
-        scopeCount
-        scopeWeight
-        completedCount
-        completedWeight
+      report {
+        burnupTimeSeries {
+          date
+          scopeCount
+          scopeWeight
+          completedCount
+          completedWeight
+        }
       }
       FIELDS
     end
@@ -64,15 +66,17 @@ RSpec.describe 'Querying a Milestone' do
           post_graphql(query, current_user: current_user)
 
           expect(subject).to eq({
-            'burnupTimeSeries' => [
-              {
-                'date' => '2020-01-05',
-                'scopeCount' => 1,
-                'scopeWeight' => 0,
-                'completedCount' => 0,
-                'completedWeight' => 0
-              }
-            ]
+            'report' => {
+              'burnupTimeSeries' => [
+                {
+                  'date' => '2020-01-05',
+                  'scopeCount' => 1,
+                  'scopeWeight' => 0,
+                  'completedCount' => 0,
+                  'completedWeight' => 0
+                }
+              ]
+            }
           })
         end
       end
@@ -87,7 +91,7 @@ RSpec.describe 'Querying a Milestone' do
       it 'returns empty results' do
         post_graphql(query, current_user: current_user)
 
-        expect(subject).to eq({ 'burnupTimeSeries' => [] })
+        expect(subject).to eq({ 'report' => { 'burnupTimeSeries' => nil } })
       end
     end
   end