diff --git a/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb b/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb index 0fddaf6d634ee027ad45e88ed1f793c73b6586e4..7f6ff2944788c35ab01a20e0be11bd5e48a0fce0 100644 --- a/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb +++ b/app/graphql/resolvers/analytics/cycle_analytics/issue_count_resolver.rb @@ -22,7 +22,8 @@ def resolve(**args) private def process_params(params) - params[:assignee_username] = params.delete(:assignee_usernames) if params[:assignee_usernames].present? + assignees_value = params.delete(:assignee_usernames) + params[:assignee_username] = assignees_value if assignees_value.present? params[:label_name] = params.delete(:label_names) if params[:label_names] params[:created_after] = params.delete(:from) params[:created_before] = params.delete(:to) diff --git a/ee/app/graphql/resolvers/analytics/cycle_analytics/concerns/issuable_stage_resolver.rb b/ee/app/graphql/resolvers/analytics/cycle_analytics/concerns/issuable_stage_resolver.rb index c8fbf7d2ee02b8d01e220eb7d525240b263627f3..500967ffe3ac44c1a99ef895bbb9b11113c57e45 100644 --- a/ee/app/graphql/resolvers/analytics/cycle_analytics/concerns/issuable_stage_resolver.rb +++ b/ee/app/graphql/resolvers/analytics/cycle_analytics/concerns/issuable_stage_resolver.rb @@ -30,7 +30,6 @@ def authorized?(*) def process_params(params) params[:not] = normalize_params(params[:not].to_h) if params[:not] - params = normalize_params(params) params[:projects] = params[:project_ids] if params[:project_ids] params[:use_aggregated_data_collector] = true @@ -39,7 +38,8 @@ def process_params(params) end def normalize_params(params) - params[:assignee_username] = params.delete(:assignee_usernames) if params[:assignee_usernames].present? + assignees_value = params.delete(:assignee_usernames) + params[:assignee_username] = assignees_value if assignees_value.present? params[:label_name] = params.delete(:label_names) if params[:label_names] params end diff --git a/ee/spec/support/analytics/cycle_analytics/flow_metrics_examples.rb b/ee/spec/support/analytics/cycle_analytics/flow_metrics_examples.rb index a2b84d9821a656aaf4d9628ee48160975b6a249b..7edbe26773db4f63e418b8f9734e9bd884adaf8b 100644 --- a/ee/spec/support/analytics/cycle_analytics/flow_metrics_examples.rb +++ b/ee/spec/support/analytics/cycle_analytics/flow_metrics_examples.rb @@ -105,7 +105,7 @@ let(:variables) do { path: full_path, - assignees: nil, + assigneeUsernames: nil, from: 21.days.ago.iso8601, to: 10.days.ago.iso8601 }