From fbdf60ce38627e4895ab68ff1412f156a6c6c698 Mon Sep 17 00:00:00 2001
From: Elwyn Benson <ebenson@gitlab.com>
Date: Tue, 28 Nov 2023 12:38:04 +0000
Subject: [PATCH] Modify product analytics usage quota GraphQL endpoint
- accept array of month selections as parameter instead of single
year+month pair
- return array of monthly usage data instead of single count
- return year+month as part of response
---
...duct_analytics_usage_quota_annual_data.yml | 8 +
doc/api/graphql/reference/index.md | 34 +++-
....vue => product_analytics_group_usage.vue} | 76 ++++----
.../product_analytics_usage_quota_app.vue | 6 +-
.../product_analytics_projects_usage.vue | 17 +-
...product_analytics_projects_usage_chart.vue | 10 +-
...product_analytics_projects_usage_table.vue | 17 +-
.../product_analytics/components/utils.js | 66 ++++++-
...prev_product_analytics_usage.query.graphql | 32 ----
...roup_product_analytics_usage.query.graphql | 18 ++
.../product_analytics/graphql/utils.js | 40 ----
.../usage_quotas/product_analytics/utils.js | 5 +
.../ee/groups/usage_quotas_controller.rb | 1 +
ee/app/graphql/ee/types/project_type.rb | 5 +-
.../project_usage_data_resolver.rb | 20 +-
.../month_selection_input_type.rb | 18 ++
.../product_analytics/monthly_usage_type.rb | 14 ++
... => product_analytics_group_usage_spec.js} | 165 ++++++++++++----
.../product_analytics_usage_quota_app_spec.js | 9 +-
...uct_analytics_projects_usage_chart_spec.js | 51 ++---
.../product_analytics_projects_usage_spec.js | 41 ++--
...uct_analytics_projects_usage_table_spec.js | 31 +--
.../components/utils_spec.js | 180 ++++++++++++++----
.../product_analytics/graphql/mock_data.js | 117 +++++++++---
.../product_analytics/graphql/utils_spec.js | 166 ----------------
.../product_analytics/utils_spec.js | 18 ++
.../product_analytics/events_stored_spec.rb | 49 ++---
27 files changed, 706 insertions(+), 508 deletions(-)
create mode 100644 config/feature_flags/development/product_analytics_usage_quota_annual_data.yml
rename ee/app/assets/javascripts/usage_quotas/product_analytics/components/{product_analytics_group_usage_chart.vue => product_analytics_group_usage.vue} (55%)
delete mode 100644 ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql
create mode 100644 ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql
delete mode 100644 ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/utils.js
create mode 100644 ee/app/assets/javascripts/usage_quotas/product_analytics/utils.js
create mode 100644 ee/app/graphql/types/product_analytics/month_selection_input_type.rb
create mode 100644 ee/app/graphql/types/product_analytics/monthly_usage_type.rb
rename ee/spec/frontend/usage_quotas/product_analytics/components/{product_analytics_group_usage_chart_spec.js => product_analytics_group_usage_spec.js} (55%)
delete mode 100644 ee/spec/frontend/usage_quotas/product_analytics/graphql/utils_spec.js
create mode 100644 ee/spec/frontend/usage_quotas/product_analytics/utils_spec.js
diff --git a/config/feature_flags/development/product_analytics_usage_quota_annual_data.yml b/config/feature_flags/development/product_analytics_usage_quota_annual_data.yml
new file mode 100644
index 000000000000..9c269f8ce0e3
--- /dev/null
+++ b/config/feature_flags/development/product_analytics_usage_quota_annual_data.yml
@@ -0,0 +1,8 @@
+---
+name: product_analytics_usage_quota_annual_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136932
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432734
+milestone: '16.7'
+type: development
+group: group::product analytics
+default_enabled: false
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index a5f3be5ea19b..ca3aa1172780 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -22511,6 +22511,18 @@ Version of a machine learning model.
| <a id="mlmodelversionid"></a>`id` | [`MlModelVersionID!`](#mlmodelversionid) | ID of the model version. |
| <a id="mlmodelversionversion"></a>`version` | [`String!`](#string) | Name of the version. |
+### `MonthlyUsage`
+
+Product analytics events for a specific month and year.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="monthlyusagecount"></a>`count` | [`Int`](#int) | Count of product analytics events. |
+| <a id="monthlyusagemonth"></a>`month` | [`Int!`](#int) | Month of the data. |
+| <a id="monthlyusageyear"></a>`year` | [`Int!`](#int) | Year of the data. |
+
### `Namespace`
#### Fields
@@ -24780,16 +24792,19 @@ four standard [pagination arguments](#connection-pagination-arguments):
##### `Project.productAnalyticsEventsStored`
-Count of all events used, filtered optionally by month.
+Count of all events used, broken down by month.
-Returns [`Int`](#int).
+WARNING:
+**Introduced** in 16.7.
+This feature is an Experiment. It can be changed or removed at any time.
+
+Returns [`[MonthlyUsage!]`](#monthlyusage).
###### Arguments
| Name | Type | Description |
| ---- | ---- | ----------- |
-| <a id="projectproductanalyticseventsstoredmonth"></a>`month` | [`Int`](#int) | Month for the period to return. |
-| <a id="projectproductanalyticseventsstoredyear"></a>`year` | [`Int`](#int) | Year for the period to return. |
+| <a id="projectproductanalyticseventsstoredmonthselection"></a>`monthSelection` | [`[MonthSelectionInput!]!`](#monthselectioninput) | Selection for the period to return. |
##### `Project.projectMembers`
@@ -33418,6 +33433,17 @@ Represents an escalation rule.
| <a id="mergerequestsresolvernegatedparamslabels"></a>`labels` | [`[String!]`](#string) | Array of label names. All resolved merge requests will not have these labels. |
| <a id="mergerequestsresolvernegatedparamsmilestonetitle"></a>`milestoneTitle` | [`String`](#string) | Title of the milestone. |
+### `MonthSelectionInput`
+
+A year and month input for querying product analytics usage data.
+
+#### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="monthselectioninputmonth"></a>`month` | [`Int!`](#int) | Month of the period to return. |
+| <a id="monthselectioninputyear"></a>`year` | [`Int!`](#int) | Year of the period to return. |
+
### `NegatedBoardIssueInput`
#### Arguments
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage_chart.vue b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage.vue
similarity index 55%
rename from ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage_chart.vue
rename to ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage.vue
index ac7d38824abc..6de9c86a3096 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage_chart.vue
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_group_usage.vue
@@ -1,19 +1,19 @@
<script>
-import { GlAlert, GlLink, GlSprintf, GlSkeletonLoader } from '@gitlab/ui';
+import { GlAlert, GlLink, GlSkeletonLoader, GlSprintf } from '@gitlab/ui';
import { GlAreaChart } from '@gitlab/ui/dist/charts';
+
import * as Sentry from '~/sentry/sentry_browser_wrapper';
-import {
- dateAtFirstDayOfMonth,
- nMonthsBefore,
-} from '~/lib/utils/datetime/date_calculation_utility';
-import { formatDate } from '~/lib/utils/datetime/date_format_utility';
+import { nMonthsBefore } from '~/lib/utils/datetime/date_calculation_utility';
import { s__ } from '~/locale';
import { helpPagePath } from '~/helpers/help_page_helper';
-import { projectHasProductAnalyticsEnabled } from 'ee/usage_quotas/product_analytics/graphql/utils';
-import getGroupCurrentAndPrevProductAnalyticsUsageQuery from '../graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+
+import { projectHasProductAnalyticsEnabled } from '../utils';
+import getGroupProductAnalyticsUsage from '../graphql/queries/get_group_product_analytics_usage.query.graphql';
+import { getCurrentMonth, mapMonthlyTotals } from './utils';
export default {
- name: 'ProductAnalyticsGroupUsageChart',
+ name: 'ProductAnalyticsGroupUsage',
components: {
GlAlert,
GlAreaChart,
@@ -21,20 +21,16 @@ export default {
GlSkeletonLoader,
GlSprintf,
},
+ mixins: [glFeatureFlagsMixin()],
inject: {
namespacePath: {
type: String,
},
},
data() {
- const currentMonth = dateAtFirstDayOfMonth(new Date());
- const previousMonth = nMonthsBefore(currentMonth, 1);
-
return {
error: null,
projectsUsageData: null,
- currentMonth,
- previousMonth,
};
},
computed: {
@@ -45,46 +41,29 @@ export default {
return [
{
name: s__('ProductAnalytics|Analytics events by month'),
- data: this.projectsUsageData.map(([date, usageData]) => [
- formatDate(date, 'mmm yyyy'),
- usageData,
- ]),
+ data: this.projectsUsageData,
},
];
},
},
apollo: {
projectsUsageData: {
- // TODO refactor this component to fetch a years worth of data at a time and display arbitrary months of data
- // instead of using explicit "previous" and "current" months: https://gitlab.com/gitlab-org/gitlab/-/issues/429312
- query: getGroupCurrentAndPrevProductAnalyticsUsageQuery,
+ query: getGroupProductAnalyticsUsage,
variables() {
return {
namespacePath: this.namespacePath,
- currentYear: this.currentMonth.getFullYear(),
- previousYear: this.previousMonth.getFullYear(),
-
- // JS `getMonth()` is 0 based
- currentMonth: this.currentMonth.getMonth() + 1,
- previousMonth: this.previousMonth.getMonth() + 1,
+ monthSelection: this.getMonthsToQuery(),
};
},
update(data) {
- const months = [
- [this.previousMonth, this.sumProjectEvents(data.previous.projects.nodes)],
- [this.currentMonth, this.sumProjectEvents(data.current.projects.nodes)],
- ];
+ const projects = data.group.projects.nodes.filter(projectHasProductAnalyticsEnabled);
- const hasNoProjects = [data.previous.projects.nodes, data.current.projects.nodes]
- .flat()
- .filter(projectHasProductAnalyticsEnabled)
- .every((projects) => projects.length === 0);
-
- if (hasNoProjects) {
+ if (projects.length === 0) {
this.$emit('no-projects');
+ return [];
}
- return months;
+ return mapMonthlyTotals(projects);
},
error(error) {
this.error = error;
@@ -93,11 +72,22 @@ export default {
},
},
methods: {
- sumProjectEvents(projects) {
- return projects.reduce(
- (sum, project) => sum + (project.productAnalyticsEventsStored || 0),
- 0,
- );
+ getMonthsToQuery() {
+ // 12 months data will cause backend performance issues for some large groups. So we can toggle
+ // this when needed until performance is improved in https://gitlab.com/gitlab-org/gitlab/-/issues/430865
+ const ONE_YEAR = 12;
+ const TWO_MONTHS = 2;
+ const numMonthsDataToFetch = this.glFeatures.productAnalyticsUsageQuotaAnnualData
+ ? ONE_YEAR
+ : TWO_MONTHS;
+
+ const currentMonth = getCurrentMonth();
+ return Array.from({ length: numMonthsDataToFetch }).map((_, index) => {
+ const date = nMonthsBefore(currentMonth, index);
+
+ // note: JS `getMonth()` is 0 based, so add 1
+ return { year: date.getFullYear(), month: date.getMonth() + 1 };
+ });
},
},
CHART_OPTIONS: {
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_usage_quota_app.vue b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_usage_quota_app.vue
index 919ad8ad3cbe..054b7576fde0 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_usage_quota_app.vue
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/product_analytics_usage_quota_app.vue
@@ -3,14 +3,14 @@ import { GlEmptyState } from '@gitlab/ui';
import { helpPagePath } from '~/helpers/help_page_helper';
-import ProductAnalyticsGroupUsageChart from './product_analytics_group_usage_chart.vue';
+import ProductAnalyticsGroupUsage from './product_analytics_group_usage.vue';
import ProductAnalyticsProjectsUsage from './projects_usage/product_analytics_projects_usage.vue';
export default {
name: 'ProductAnalyticsUsageQuotaApp',
components: {
GlEmptyState,
- ProductAnalyticsGroupUsageChart,
+ ProductAnalyticsGroupUsage,
ProductAnalyticsProjectsUsage,
},
inject: {
@@ -70,7 +70,7 @@ export default {
/>
</template>
<template v-else>
- <product-analytics-group-usage-chart @no-projects="handleNoProjects" />
+ <product-analytics-group-usage @no-projects="handleNoProjects" />
<product-analytics-projects-usage />
</template>
</section>
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage.vue b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage.vue
index 9a74bab0037d..a401ad1e1b9b 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage.vue
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage.vue
@@ -6,8 +6,8 @@ import {
nMonthsBefore,
} from '~/lib/utils/datetime/date_calculation_utility';
-import getGroupCurrentAndPrevProductAnalyticsUsageQuery from '../../graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql';
-import { mapProjectsUsageResponse } from '../../graphql/utils';
+import getGroupCurrentAndPrevProductAnalyticsUsageQuery from '../../graphql/queries/get_group_product_analytics_usage.query.graphql';
+import { projectHasProductAnalyticsEnabled } from '../../utils';
import ProductAnalyticsProjectsUsageChart from './product_analytics_projects_usage_chart.vue';
import ProductAnalyticsProjectsUsageTable from './product_analytics_projects_usage_table.vue';
@@ -43,16 +43,15 @@ export default {
return {
namespacePath: this.namespacePath,
- currentYear: current.getFullYear(),
- previousYear: previous.getFullYear(),
-
- // JS `getMonth()` is 0 based
- currentMonth: current.getMonth() + 1,
- previousMonth: previous.getMonth() + 1,
+ monthSelection: [
+ // note: JS `getMonth()` is 0 based, so add 1
+ { year: current.getFullYear(), month: current.getMonth() + 1 },
+ { year: previous.getFullYear(), month: previous.getMonth() + 1 },
+ ],
};
},
update(data) {
- return mapProjectsUsageResponse(data);
+ return data.group.projects.nodes.filter(projectHasProductAnalyticsEnabled);
},
error(error) {
this.error = error;
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue
index b2bd9f91779e..5a95303f748b 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue
@@ -2,7 +2,11 @@
import { GlSkeletonLoader, GlTooltipDirective } from '@gitlab/ui';
import { GlColumnChart } from '@gitlab/ui/dist/charts';
import { s__, sprintf } from '~/locale';
-import { projectsUsageDataValidator } from '../utils';
+import {
+ findCurrentMonthUsage,
+ findPreviousMonthUsage,
+ projectsUsageDataValidator,
+} from '../utils';
// Trying to show more than this many projects on a single chart starts to
// get illegible, so we only render this many projects if there's many
@@ -50,7 +54,7 @@ export default {
stack: 'previous',
data: this.projectsUsageData
?.map((project) => {
- return [project.name, project.previousEvents];
+ return [project.name, findPreviousMonthUsage(project).count];
})
.slice(0, MAX_PROJECTS_TO_CHART),
},
@@ -59,7 +63,7 @@ export default {
stack: 'current',
data: this.projectsUsageData
?.map((project) => {
- return [project.name, project.currentEvents];
+ return [project.name, findCurrentMonthUsage(project).count];
})
.slice(0, MAX_PROJECTS_TO_CHART),
},
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue
index 466e2fdebf2d..b980b813b536 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue
@@ -2,7 +2,11 @@
import { GlLink, GlSkeletonLoader, GlTableLite, GlTooltipDirective } from '@gitlab/ui';
import { __, s__ } from '~/locale';
import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
-import { projectsUsageDataValidator } from '../utils';
+import {
+ findCurrentMonthUsage,
+ findPreviousMonthUsage,
+ projectsUsageDataValidator,
+} from '../utils';
export default {
name: 'ProductAnalyticsProjectsUsageTable',
@@ -31,6 +35,15 @@ export default {
hasProjects() {
return this.projectsUsageData?.length > 0;
},
+ tableData() {
+ return this.projectsUsageData.map((project) => {
+ return {
+ ...project,
+ currentEvents: findCurrentMonthUsage(project).count,
+ previousEvents: findPreviousMonthUsage(project).count,
+ };
+ });
+ },
},
TABLE_FIELDS: [
{ key: 'name', label: __('Project') },
@@ -43,7 +56,7 @@ export default {
<div>
<gl-skeleton-loader v-if="isLoading" :lines="3" :equal-width-lines="true" />
<div v-else-if="hasProjects" data-testid="projects-usage-table">
- <gl-table-lite :items="projectsUsageData" :fields="$options.TABLE_FIELDS">
+ <gl-table-lite :items="tableData" :fields="$options.TABLE_FIELDS">
<template #cell(name)="{ item: { id, name, avatarUrl, webUrl } }">
<project-avatar
:project-id="id"
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/utils.js b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/utils.js
index 7ccc47b1815d..77181eeb5c1a 100644
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/components/utils.js
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/components/utils.js
@@ -1,14 +1,64 @@
+import {
+ dateAtFirstDayOfMonth,
+ nMonthsBefore,
+} from '~/lib/utils/datetime/date_calculation_utility';
+import { formatDate } from '~/lib/utils/datetime/date_format_utility';
+
+const isValidUsage = ({ year, month, count }) =>
+ typeof year === 'number' &&
+ typeof month === 'number' &&
+ (count === null || typeof count === 'number');
+
+const isValidProject = ({ id, name, avatarUrl, webUrl, productAnalyticsEventsStored }) =>
+ typeof id === 'string' &&
+ typeof name === 'string' &&
+ (avatarUrl === null || typeof avatarUrl === 'string') &&
+ typeof webUrl === 'string' &&
+ Array.isArray(productAnalyticsEventsStored) &&
+ productAnalyticsEventsStored.every(isValidUsage);
+
/**
* Validator for the projectsUsageData property
*/
export const projectsUsageDataValidator = (items) => {
- return (
- Array.isArray(items) &&
- items.every(
- ({ name, currentEvents, previousEvents }) =>
- typeof name === 'string' &&
- typeof currentEvents === 'number' &&
- typeof previousEvents === 'number',
- )
+ return Array.isArray(items) && items.every(isValidProject);
+};
+
+export const getCurrentMonth = () => {
+ return dateAtFirstDayOfMonth(new Date());
+};
+
+const findMonthsUsage = (project, monthOffset) => {
+ const month = nMonthsBefore(getCurrentMonth(), monthOffset);
+
+ return project.productAnalyticsEventsStored.find(
+ (usage) => usage.year === month.getFullYear() && usage.month === month.getMonth() + 1,
+ );
+};
+
+export const findCurrentMonthUsage = (project) => {
+ return findMonthsUsage(project, 0);
+};
+
+export const findPreviousMonthUsage = (project) => {
+ return findMonthsUsage(project, 1);
+};
+
+/**
+ * Maps projects into an array of monthLabel, numEvents pairs.
+ */
+export const mapMonthlyTotals = (projects) => {
+ const monthlyTotals = {};
+
+ projects.forEach(({ productAnalyticsEventsStored }) =>
+ productAnalyticsEventsStored.forEach(({ year, month, count }) => {
+ const timestamp = Date.UTC(year, month - 1);
+ monthlyTotals[timestamp] = (monthlyTotals[timestamp] || 0) + count;
+ }),
);
+
+ return Array.from(Object.entries(monthlyTotals))
+ .map(([timestampString, count]) => [Number(timestampString), count])
+ .sort(([timestampA], [timestampB]) => timestampA - timestampB)
+ .map(([timestamp, count]) => [formatDate(new Date(timestamp), 'mmm yyyy'), count]);
};
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql b/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql
deleted file mode 100644
index f2ff90047e4d..000000000000
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql
+++ /dev/null
@@ -1,32 +0,0 @@
-query getGroupCurrentAndPreviousProductAnalyticsUsage(
- $namespacePath: ID!
- $currentYear: Int
- $currentMonth: Int
- $previousYear: Int
- $previousMonth: Int
-) {
- previous: group(fullPath: $namespacePath) {
- id
- projects(includeSubgroups: true) {
- nodes {
- id
- name
- avatarUrl
- webUrl
- productAnalyticsEventsStored(year: $previousYear, month: $previousMonth)
- }
- }
- }
- current: group(fullPath: $namespacePath) {
- id
- projects(includeSubgroups: true) {
- nodes {
- id
- name
- avatarUrl
- webUrl
- productAnalyticsEventsStored(year: $currentYear, month: $currentMonth)
- }
- }
- }
-}
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql b/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql
new file mode 100644
index 000000000000..0eaba32c8ca5
--- /dev/null
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql
@@ -0,0 +1,18 @@
+query getGroupProductAnalyticsUsage($namespacePath: ID!, $monthSelection: [MonthSelectionInput!]!) {
+ group(fullPath: $namespacePath) {
+ id
+ projects(includeSubgroups: true) {
+ nodes {
+ id
+ name
+ avatarUrl
+ webUrl
+ productAnalyticsEventsStored(monthSelection: $monthSelection) {
+ year
+ month
+ count
+ }
+ }
+ }
+ }
+}
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/utils.js b/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/utils.js
deleted file mode 100644
index a677eb18138a..000000000000
--- a/ee/app/assets/javascripts/usage_quotas/product_analytics/graphql/utils.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Determines if a project has been onboarded with product analytics based on its usage data
- */
-export const projectHasProductAnalyticsEnabled = (project) =>
- project.productAnalyticsEventsStored !== null;
-
-/**
- * Maps a GraphQL response containing two sets of projects (for current / prev months)
- * into a single array of projects, with the current/prev counts mapped onto each project.
- * Fills in a `0` count if a project exists in one set but not the other.
- */
-export const mapProjectsUsageResponse = (data) => {
- const currentUsage = data.current.projects.nodes.filter(projectHasProductAnalyticsEnabled);
- const previousUsage = data.previous.projects.nodes.filter(projectHasProductAnalyticsEnabled);
-
- const combinedUsage = new Map(
- currentUsage.map((project) => {
- const { __typename, productAnalyticsEventsStored, ...projectWithoutCount } = project;
- return [
- project.id,
- {
- ...projectWithoutCount,
- currentEvents: productAnalyticsEventsStored,
- previousEvents: 0,
- },
- ];
- }),
- );
-
- previousUsage.forEach((project) => {
- const { __typename, productAnalyticsEventsStored, ...projectWithoutCount } = project;
- combinedUsage.set(project.id, {
- ...projectWithoutCount,
- currentEvents: combinedUsage.get(project.id)?.currentEvents || 0,
- previousEvents: productAnalyticsEventsStored,
- });
- });
-
- return Array.from(combinedUsage, ([, project]) => project);
-};
diff --git a/ee/app/assets/javascripts/usage_quotas/product_analytics/utils.js b/ee/app/assets/javascripts/usage_quotas/product_analytics/utils.js
new file mode 100644
index 000000000000..019a3dbb2cb9
--- /dev/null
+++ b/ee/app/assets/javascripts/usage_quotas/product_analytics/utils.js
@@ -0,0 +1,5 @@
+/**
+ * Determines if a project has been onboarded with product analytics based on its usage data
+ */
+export const projectHasProductAnalyticsEnabled = (project) =>
+ project.productAnalyticsEventsStored?.some((usage) => usage.count !== null);
diff --git a/ee/app/controllers/ee/groups/usage_quotas_controller.rb b/ee/app/controllers/ee/groups/usage_quotas_controller.rb
index 4d9c58976d6d..f1b5891b290c 100644
--- a/ee/app/controllers/ee/groups/usage_quotas_controller.rb
+++ b/ee/app/controllers/ee/groups/usage_quotas_controller.rb
@@ -15,6 +15,7 @@ module UsageQuotasController
push_frontend_feature_flag(:data_transfer_monitoring, group)
push_frontend_feature_flag(:limited_access_modal)
push_frontend_feature_flag(:enable_add_on_users_filtering, group)
+ push_frontend_feature_flag(:product_analytics_usage_quota_annual_data, group)
end
end
diff --git a/ee/app/graphql/ee/types/project_type.rb b/ee/app/graphql/ee/types/project_type.rb
index cd4b32118013..9c7a1246fff2 100644
--- a/ee/app/graphql/ee/types/project_type.rb
+++ b/ee/app/graphql/ee/types/project_type.rb
@@ -289,10 +289,11 @@ module ProjectType
method: :prevent_merge_without_jira_issue?,
description: 'Indicates if an associated issue from Jira is required.'
- field :product_analytics_events_stored, GraphQL::Types::Int,
+ field :product_analytics_events_stored, [::Types::ProductAnalytics::MonthlyUsageType],
null: true,
resolver: ::Resolvers::ProductAnalytics::ProjectUsageDataResolver,
- description: 'Count of all events used, filtered optionally by month.'
+ description: 'Count of all events used, broken down by month',
+ alpha: { milestone: '16.7' }
field :dependency_proxy_packages_setting,
::Types::DependencyProxy::Packages::SettingType,
diff --git a/ee/app/graphql/resolvers/product_analytics/project_usage_data_resolver.rb b/ee/app/graphql/resolvers/product_analytics/project_usage_data_resolver.rb
index 6c9d1e706878..8e4d8c47b0c7 100644
--- a/ee/app/graphql/resolvers/product_analytics/project_usage_data_resolver.rb
+++ b/ee/app/graphql/resolvers/product_analytics/project_usage_data_resolver.rb
@@ -7,15 +7,21 @@ class ProjectUsageDataResolver < BaseResolver
authorizes_object!
authorize :maintainer_access
- type GraphQL::Types::Int, null: true
+ type [::Types::ProductAnalytics::MonthlyUsageType], null: true
- argument :year, GraphQL::Types::Int,
- required: false, description: 'Year for the period to return.'
+ argument :month_selection, [::Types::ProductAnalytics::MonthSelectionInputType],
+ required: true, description: 'Selection for the period to return.'
- argument :month, GraphQL::Types::Int,
- required: false, description: 'Month for the period to return.'
- def resolve(year: Time.current.year, month: Time.current.month)
- object.product_analytics_events_used(year: year, month: month)
+ def resolve(month_selection: [])
+ month_selection.map do |selection|
+ year = selection[:year]
+ month = selection[:month]
+ {
+ year: year,
+ month: month,
+ count: object.product_analytics_events_used(year: year, month: month)
+ }
+ end
end
end
end
diff --git a/ee/app/graphql/types/product_analytics/month_selection_input_type.rb b/ee/app/graphql/types/product_analytics/month_selection_input_type.rb
new file mode 100644
index 000000000000..0a21ab61c906
--- /dev/null
+++ b/ee/app/graphql/types/product_analytics/month_selection_input_type.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Types
+ module ProductAnalytics
+ class MonthSelectionInputType < BaseInputObject
+ graphql_name 'MonthSelectionInput'
+ description "A year and month input for querying product analytics usage data."
+
+ argument :month, GraphQL::Types::Int,
+ required: true,
+ description: 'Month of the period to return.'
+
+ argument :year, GraphQL::Types::Int,
+ required: true,
+ description: 'Year of the period to return.'
+ end
+ end
+end
diff --git a/ee/app/graphql/types/product_analytics/monthly_usage_type.rb b/ee/app/graphql/types/product_analytics/monthly_usage_type.rb
new file mode 100644
index 000000000000..b570c44f59d7
--- /dev/null
+++ b/ee/app/graphql/types/product_analytics/monthly_usage_type.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Types
+ module ProductAnalytics
+ class MonthlyUsageType < BaseObject # rubocop:disable Graphql/AuthorizeTypes -- Authorization is done in resolver layer
+ graphql_name 'MonthlyUsage'
+ description 'Product analytics events for a specific month and year.'
+
+ field :count, GraphQL::Types::Int, null: true, description: 'Count of product analytics events.'
+ field :month, GraphQL::Types::Int, null: false, description: 'Month of the data.'
+ field :year, GraphQL::Types::Int, null: false, description: 'Year of the data.'
+ end
+ end
+end
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_chart_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_spec.js
similarity index 55%
rename from ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_chart_spec.js
rename to ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_spec.js
index a6ef1e4165b7..876186d26968 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_chart_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_group_usage_spec.js
@@ -8,22 +8,26 @@ import createMockApollo from 'helpers/mock_apollo_helper';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import waitForPromises from 'helpers/wait_for_promises';
import {
+ getProjectWithYearsUsage,
getProjectsUsageDataResponse,
getProjectUsage,
} from 'ee_jest/usage_quotas/product_analytics/graphql/mock_data';
import { useFakeDate } from 'helpers/fake_date';
-import getGroupCurrentAndPrevProductAnalyticsUsage from 'ee/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql';
-import ProductAnalyticsGroupUsageChart from 'ee/usage_quotas/product_analytics/components/product_analytics_group_usage_chart.vue';
+import getGroupCurrentAndPrevProductAnalyticsUsage from 'ee/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql';
+import ProductAnalyticsGroupUsage from 'ee/usage_quotas/product_analytics/components/product_analytics_group_usage.vue';
Vue.use(VueApollo);
jest.mock('~/sentry/sentry_browser_wrapper');
-describe('ProductAnalyticsGroupUsageChart', () => {
+describe('ProductAnalyticsGroupUsage', () => {
/** @type {import('helpers/vue_test_utils_helper').ExtendedWrapper} */
let wrapper;
+ const mockNow = '2023-01-15T12:00:00Z';
+ useFakeDate(mockNow);
+
const findError = () => wrapper.findComponent(GlAlert);
const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
const findChart = () => wrapper.findComponent(GlAreaChart);
@@ -31,15 +35,19 @@ describe('ProductAnalyticsGroupUsageChart', () => {
const mockProjectsUsageDataHandler = jest.fn();
- const createComponent = () => {
+ const createComponent = ({ glFeatures } = {}) => {
const mockApollo = createMockApollo([
[getGroupCurrentAndPrevProductAnalyticsUsage, mockProjectsUsageDataHandler],
]);
- wrapper = shallowMountExtended(ProductAnalyticsGroupUsageChart, {
+ wrapper = shallowMountExtended(ProductAnalyticsGroupUsage, {
apolloProvider: mockApollo,
provide: {
namespacePath: 'some-group',
+ glFeatures: {
+ productAnalyticsUsageQuotaAnnualData: true,
+ ...glFeatures,
+ },
},
stubs: {
GlSprintf,
@@ -61,18 +69,83 @@ describe('ProductAnalyticsGroupUsageChart', () => {
});
describe('when fetching data', () => {
- const mockNow = '2023-01-15T12:00:00Z';
- useFakeDate(mockNow);
-
- it('requests data from the current and previous months', () => {
- createComponent();
+ describe('when "product_analytics_usage_quota_annual_data" feature flag is enabled', () => {
+ it('requests data from the last 12 months', () => {
+ createComponent({ glFeatures: { productAnalyticsUsageQuotaAnnualData: true } });
+
+ expect(mockProjectsUsageDataHandler).toHaveBeenCalledWith({
+ namespacePath: 'some-group',
+ monthSelection: [
+ {
+ month: 1,
+ year: 2023,
+ },
+ {
+ month: 12,
+ year: 2022,
+ },
+ {
+ month: 11,
+ year: 2022,
+ },
+ {
+ month: 10,
+ year: 2022,
+ },
+ {
+ month: 9,
+ year: 2022,
+ },
+ {
+ month: 8,
+ year: 2022,
+ },
+ {
+ month: 7,
+ year: 2022,
+ },
+ {
+ month: 6,
+ year: 2022,
+ },
+ {
+ month: 5,
+ year: 2022,
+ },
+ {
+ month: 4,
+ year: 2022,
+ },
+ {
+ month: 3,
+ year: 2022,
+ },
+ {
+ month: 2,
+ year: 2022,
+ },
+ ],
+ });
+ });
+ });
- expect(mockProjectsUsageDataHandler).toHaveBeenCalledWith({
- namespacePath: 'some-group',
- currentMonth: 1,
- currentYear: 2023,
- previousMonth: 12,
- previousYear: 2022,
+ describe('when "product_analytics_usage_quota_annual_data" feature flag is disabled', () => {
+ it('requests data from the last 2 months', () => {
+ createComponent({ glFeatures: { productAnalyticsUsageQuotaAnnualData: false } });
+
+ expect(mockProjectsUsageDataHandler).toHaveBeenCalledWith({
+ namespacePath: 'some-group',
+ monthSelection: [
+ {
+ month: 1,
+ year: 2023,
+ },
+ {
+ month: 12,
+ year: 2022,
+ },
+ ],
+ });
});
});
@@ -125,13 +198,13 @@ describe('ProductAnalyticsGroupUsageChart', () => {
describe('and the data has loaded', () => {
describe.each`
- scenario | currentProjects | previousProjects
- ${'with no projects'} | ${[]} | ${[]}
- ${'with no product analytics enabled projects'} | ${[getProjectUsage({ id: 1, name: 'not onboarded', numEvents: null })]} | ${[getProjectUsage({ id: 1, name: 'not onboarded', numEvents: null })]}
- `('$scenario', ({ currentProjects, previousProjects }) => {
+ scenario | projects
+ ${'with no projects'} | ${[]}
+ ${'with no product analytics enabled projects'} | ${[getProjectUsage({ id: 1, name: 'not onboarded', usage: [{ year: 2023, month: 1, count: null }] })]}
+ `('$scenario', ({ projects }) => {
beforeEach(() => {
mockProjectsUsageDataHandler.mockResolvedValue({
- data: getProjectsUsageDataResponse(currentProjects, previousProjects),
+ data: getProjectsUsageDataResponse(projects),
});
createComponent();
return waitForPromises();
@@ -152,7 +225,9 @@ describe('ProductAnalyticsGroupUsageChart', () => {
describe('with one project', () => {
beforeEach(() => {
- mockProjectsUsageDataHandler.mockResolvedValue({ data: getProjectsUsageDataResponse() });
+ mockProjectsUsageDataHandler.mockResolvedValue({
+ data: getProjectsUsageDataResponse([getProjectWithYearsUsage()]),
+ });
createComponent();
return waitForPromises();
});
@@ -171,8 +246,18 @@ describe('ProductAnalyticsGroupUsageChart', () => {
{
name: 'Analytics events by month',
data: [
- ['Dec 2022', 1234],
- ['Jan 2023', 9876],
+ ['Feb 2022', 1],
+ ['Mar 2022', 1],
+ ['Apr 2022', 1],
+ ['May 2022', 1],
+ ['Jun 2022', 1],
+ ['Jul 2022', 1],
+ ['Aug 2022', 1],
+ ['Sep 2022', 1],
+ ['Oct 2022', 1],
+ ['Nov 2022', 1],
+ ['Dec 2022', 1],
+ ['Jan 2023', 1],
],
},
],
@@ -183,18 +268,12 @@ describe('ProductAnalyticsGroupUsageChart', () => {
describe('with many projects', () => {
beforeEach(() => {
mockProjectsUsageDataHandler.mockResolvedValue({
- data: getProjectsUsageDataResponse(
- [
- getProjectUsage({ id: 1, name: 'onboarded1', numEvents: 1 }),
- getProjectUsage({ id: 2, name: 'onboarded2', numEvents: 1 }),
- getProjectUsage({ id: 3, name: 'onboarded3', numEvents: 1 }),
- ],
- [
- getProjectUsage({ id: 1, name: 'onboarded1', numEvents: 10 }),
- getProjectUsage({ id: 2, name: 'onboarded2', numEvents: 20 }),
- getProjectUsage({ id: 3, name: 'onboarded3', numEvents: 30 }),
- ],
- ),
+ data: getProjectsUsageDataResponse([
+ getProjectWithYearsUsage({
+ id: 1,
+ }),
+ getProjectWithYearsUsage({ id: 2 }),
+ ]),
});
createComponent();
return waitForPromises();
@@ -206,8 +285,18 @@ describe('ProductAnalyticsGroupUsageChart', () => {
{
name: 'Analytics events by month',
data: [
- ['Dec 2022', 60],
- ['Jan 2023', 3],
+ ['Feb 2022', 2],
+ ['Mar 2022', 2],
+ ['Apr 2022', 2],
+ ['May 2022', 2],
+ ['Jun 2022', 2],
+ ['Jul 2022', 2],
+ ['Aug 2022', 2],
+ ['Sep 2022', 2],
+ ['Oct 2022', 2],
+ ['Nov 2022', 2],
+ ['Dec 2022', 2],
+ ['Jan 2023', 2],
],
},
],
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_usage_quota_app_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_usage_quota_app_spec.js
index 8da82329eb28..de5e0a09022e 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_usage_quota_app_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/product_analytics_usage_quota_app_spec.js
@@ -2,7 +2,7 @@ import { nextTick } from 'vue';
import { shallowMount } from '@vue/test-utils';
import { GlEmptyState } from '@gitlab/ui';
import ProductAnalyticsUsageQuotaApp from 'ee/usage_quotas/product_analytics/components/product_analytics_usage_quota_app.vue';
-import ProductAnalyticsGroupUsageChart from 'ee/usage_quotas/product_analytics/components/product_analytics_group_usage_chart.vue';
+import ProductAnalyticsGroupUsage from 'ee/usage_quotas/product_analytics/components/product_analytics_group_usage.vue';
import ProductAnalyticsProjectsUsage from 'ee/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage.vue';
describe('ProductAnalyticsUsageQuotaApp', () => {
@@ -10,8 +10,7 @@ describe('ProductAnalyticsUsageQuotaApp', () => {
let wrapper;
const findEmptyState = () => wrapper.findComponent(GlEmptyState);
- const findProductAnalyticsGroupUsageChart = () =>
- wrapper.findComponent(ProductAnalyticsGroupUsageChart);
+ const findProductAnalyticsGroupUsage = () => wrapper.findComponent(ProductAnalyticsGroupUsage);
const findProductAnalyticsProjectsUsage = () =>
wrapper.findComponent(ProductAnalyticsProjectsUsage);
@@ -43,7 +42,7 @@ describe('ProductAnalyticsUsageQuotaApp', () => {
beforeEach(() => createComponent({ productAnalyticsEnabled: true }));
it('renders the monthly group usage chart', () => {
- expect(findProductAnalyticsGroupUsageChart().exists()).toBe(true);
+ expect(findProductAnalyticsGroupUsage().exists()).toBe(true);
});
it('renders the projects usage breakdown', () => {
@@ -52,7 +51,7 @@ describe('ProductAnalyticsUsageQuotaApp', () => {
describe('when there are no onboarded projects within the group', () => {
beforeEach(() => {
- findProductAnalyticsGroupUsageChart().vm.$emit('no-projects');
+ findProductAnalyticsGroupUsage().vm.$emit('no-projects');
return nextTick();
});
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart_spec.js
index fe232bcf8e98..b9ec6d40f36c 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart_spec.js
@@ -2,11 +2,18 @@ import { GlSkeletonLoader } from '@gitlab/ui';
import { GlColumnChart } from '@gitlab/ui/dist/charts';
import ProductAnalyticsProjectsUsageChart from 'ee/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
+import { TYPENAME_PROJECT } from '~/graphql_shared/constants';
+import { getProjectUsage } from 'ee_jest/usage_quotas/product_analytics/graphql/mock_data';
+import { useFakeDate } from 'helpers/fake_date';
describe('ProductAnalyticsProjectsUsageChart', () => {
/** @type {import('helpers/vue_test_utils_helper').ExtendedWrapper} */
let wrapper;
+ const mockNow = '2023-01-15T12:00:00Z';
+ useFakeDate(mockNow);
+
const findLoadingState = () => wrapper.findComponent(GlSkeletonLoader);
const findUsageChart = () => wrapper.findComponent(GlColumnChart);
@@ -53,22 +60,20 @@ describe('ProductAnalyticsProjectsUsageChart', () => {
});
describe('when there is project data', () => {
- const projectsUsageData = [
- {
- id: 1,
- webUrl: '/test-project',
- avatarUrl: '/test-project.jpg',
- name: 'test-project',
- currentEvents: 10,
- previousEvents: 4,
- },
- ];
-
beforeEach(() => {
createComponent(
{
isLoading: false,
- projectsUsageData,
+ projectsUsageData: [
+ getProjectUsage({
+ id: convertToGraphQLId(TYPENAME_PROJECT, 1),
+ name: `test-project`,
+ usage: [
+ { year: 2023, month: 1, count: 7 },
+ { year: 2022, month: 12, count: 10 },
+ ],
+ }),
+ ],
},
mountExtended,
);
@@ -82,12 +87,12 @@ describe('ProductAnalyticsProjectsUsageChart', () => {
expect(findUsageChart().props()).toMatchObject({
bars: [
{
- data: [['test-project', 4]],
+ data: [['test-project', 10]],
name: 'Previous month',
stack: 'previous',
},
{
- data: [['test-project', 10]],
+ data: [['test-project', 7]],
name: 'Current month to date',
stack: 'current',
},
@@ -104,14 +109,16 @@ describe('ProductAnalyticsProjectsUsageChart', () => {
createComponent(
{
isLoading: false,
- projectsUsageData: Array.from({ length: 51 }).map((_, index) => ({
- id: index,
- webUrl: `/test-project-${index}`,
- avatarUrl: `/test-project-${index}.jpg`,
- name: `test-project-${index}`,
- currentEvents: 10,
- previousEvents: 4,
- })),
+ projectsUsageData: Array.from({ length: 51 }).map((_, index) =>
+ getProjectUsage({
+ id: convertToGraphQLId(TYPENAME_PROJECT, index),
+ name: `test-project-${index}`,
+ usage: [
+ { year: 2023, month: 1, count: 7 },
+ { year: 2022, month: 12, count: 10 },
+ ],
+ }),
+ ),
},
mountExtended,
);
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_spec.js
index 3a2a43d7e694..6fa6e159307a 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_spec.js
@@ -6,16 +6,14 @@ import ProductAnalyticsProjectsUsage from 'ee/usage_quotas/product_analytics/com
import ProductAnalyticsProjectsUsageChart from 'ee/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_chart.vue';
import ProductAnalyticsProjectsUsageTable from 'ee/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue';
import createMockApollo from 'helpers/mock_apollo_helper';
-import getGroupCurrentAndPrevProductAnalyticsUsage from 'ee/usage_quotas/product_analytics/graphql/queries/get_group_current_and_prev_product_analytics_usage.query.graphql';
+import getGroupCurrentAndPrevProductAnalyticsUsage from 'ee/usage_quotas/product_analytics/graphql/queries/get_group_product_analytics_usage.query.graphql';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import waitForPromises from 'helpers/wait_for_promises';
import { getProjectsUsageDataResponse } from 'ee_jest/usage_quotas/product_analytics/graphql/mock_data';
import { useFakeDate } from 'helpers/fake_date';
-import * as utils from 'ee/usage_quotas/product_analytics/graphql/utils';
Vue.use(VueApollo);
-jest.mock('ee/usage_quotas/product_analytics/graphql/utils');
jest.mock('~/sentry/sentry_browser_wrapper');
describe('ProductAnalyticsProjectsUsage', () => {
@@ -62,10 +60,16 @@ describe('ProductAnalyticsProjectsUsage', () => {
expect(mockProjectsUsageDataHandler).toHaveBeenCalledWith({
namespacePath: 'some-group',
- currentMonth: 1,
- currentYear: 2023,
- previousMonth: 12,
- previousYear: 2022,
+ monthSelection: [
+ {
+ month: 1,
+ year: 2023,
+ },
+ {
+ month: 12,
+ year: 2022,
+ },
+ ],
});
});
@@ -121,17 +125,8 @@ describe('ProductAnalyticsProjectsUsage', () => {
});
describe('and data has loaded', () => {
- const projectsUsageData = [
- {
- name: 'some onboarded project',
- currentEvents: 9876,
- previousEvents: 1234,
- },
- ];
-
beforeEach(() => {
mockProjectsUsageDataHandler.mockResolvedValue({ data: getProjectsUsageDataResponse() });
- utils.mapProjectsUsageResponse.mockReturnValue(projectsUsageData);
createComponent();
return waitForPromises();
});
@@ -143,14 +138,24 @@ describe('ProductAnalyticsProjectsUsage', () => {
it('renders the chart', () => {
expect(findProductAnalyticsProjectsUsageChart().props()).toMatchObject({
isLoading: false,
- projectsUsageData,
+ projectsUsageData: [
+ {
+ name: 'some onboarded project',
+ productAnalyticsEventsStored: [{ year: 2023, month: 11, count: 1234 }],
+ },
+ ],
});
});
it('renders the usage table', () => {
expect(findProductAnalyticsProjectsUsageTable().props()).toMatchObject({
isLoading: false,
- projectsUsageData,
+ projectsUsageData: [
+ {
+ name: 'some onboarded project',
+ productAnalyticsEventsStored: [{ year: 2023, month: 11, count: 1234 }],
+ },
+ ],
});
});
});
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table_spec.js
index a283e93757b5..3139c206d3fe 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table_spec.js
@@ -2,11 +2,18 @@ import { GlSkeletonLoader, GlTableLite } from '@gitlab/ui';
import ProductAnalyticsProjectsUsageTable from 'ee/usage_quotas/product_analytics/components/projects_usage/product_analytics_projects_usage_table.vue';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
+import { getProjectUsage } from 'ee_jest/usage_quotas/product_analytics/graphql/mock_data';
+import { useFakeDate } from 'helpers/fake_date';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
+import { TYPENAME_PROJECT } from '~/graphql_shared/constants';
describe('ProductAnalyticsProjectsUsageTable', () => {
/** @type {import('helpers/vue_test_utils_helper').ExtendedWrapper} */
let wrapper;
+ const mockNow = '2023-01-15T12:00:00Z';
+ useFakeDate(mockNow);
+
const findLoadingState = () => wrapper.findComponent(GlSkeletonLoader);
const findUsageTableWrapper = () => wrapper.findByTestId('projects-usage-table');
const findUsageTable = () => wrapper.findComponent(GlTableLite);
@@ -56,22 +63,20 @@ describe('ProductAnalyticsProjectsUsageTable', () => {
});
describe('when there is project data', () => {
- const projectsUsageData = [
- {
- id: 1,
- webUrl: '/test-project',
- avatarUrl: '/test-project.jpg',
- name: 'test-project',
- currentEvents: 10,
- previousEvents: 4,
- },
- ];
-
beforeEach(() => {
createComponent(
{
isLoading: false,
- projectsUsageData,
+ projectsUsageData: [
+ getProjectUsage({
+ id: convertToGraphQLId(TYPENAME_PROJECT, 1),
+ name: 'test-project',
+ usage: [
+ { year: 2023, month: 1, count: 4 },
+ { year: 2022, month: 12, count: 7 },
+ ],
+ }),
+ ],
},
mountExtended,
);
@@ -92,7 +97,7 @@ describe('ProductAnalyticsProjectsUsageTable', () => {
it('renders the project avatar', () => {
expect(findProjectAvatar().props()).toMatchObject(
expect.objectContaining({
- projectId: 1,
+ projectId: 'gid://gitlab/Project/1',
projectAvatarUrl: '/test-project.jpg',
projectName: 'test-project',
alt: 'test-project',
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/components/utils_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/components/utils_spec.js
index d2eb172e45b8..e583ff4ce694 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/components/utils_spec.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/components/utils_spec.js
@@ -1,7 +1,33 @@
-import { projectsUsageDataValidator } from 'ee/usage_quotas/product_analytics/components/utils';
+import {
+ projectsUsageDataValidator,
+ findCurrentMonthUsage,
+ findPreviousMonthUsage,
+ mapMonthlyTotals,
+} from 'ee/usage_quotas/product_analytics/components/utils';
+import {
+ getProjectUsage,
+ getProjectWithYearsUsage,
+} from 'ee_jest/usage_quotas/product_analytics/graphql/mock_data';
+import { useFakeDate } from 'helpers/fake_date';
describe('Product analytics usage quota component utils', () => {
describe('projectsUsageDataValidator', () => {
+ let validProject;
+
+ beforeEach(() => {
+ validProject = getProjectUsage({
+ id: 'gid://gitlab/Project/2',
+ name: 'another project',
+ usage: [
+ {
+ year: 2023,
+ month: 11,
+ count: null,
+ },
+ ],
+ });
+ });
+
it('returns true for empty array', () => {
const result = projectsUsageDataValidator([]);
@@ -9,18 +35,7 @@ describe('Product analytics usage quota component utils', () => {
});
it('returns true when all items have all properties', () => {
- const result = projectsUsageDataValidator([
- {
- name: 'some project',
- currentEvents: 1,
- previousEvents: 1,
- },
- {
- name: 'another project',
- currentEvents: 2,
- previousEvents: 2,
- },
- ]);
+ const result = projectsUsageDataValidator([validProject, getProjectUsage()]);
expect(result).toBe(true);
});
@@ -33,14 +48,10 @@ describe('Product analytics usage quota component utils', () => {
it('returns false when one item is invalid', () => {
const result = projectsUsageDataValidator([
+ validProject,
{
- name: 'some project',
- currentEvents: 1,
- previousEvents: 1,
- },
- {
- currentEvents: 2,
- previousEvents: 2,
+ ...validProject,
+ name: undefined,
},
]);
@@ -49,16 +60,24 @@ describe('Product analytics usage quota component utils', () => {
it.each([
{
- currentEvents: 1,
- previousEvents: 1,
+ ...validProject,
+ id: undefined,
},
{
- name: 'some project',
- previousEvents: 1,
+ ...validProject,
+ name: undefined,
},
{
- name: 'some project',
- currentEvents: 1,
+ ...validProject,
+ productAnalyticsEventsStored: undefined,
+ },
+ {
+ ...validProject,
+ webUrl: undefined,
+ },
+ {
+ ...validProject,
+ avatarUrl: undefined,
},
])('returns false when an item property is missing', (testCase) => {
const result = projectsUsageDataValidator([testCase]);
@@ -68,19 +87,24 @@ describe('Product analytics usage quota component utils', () => {
it.each([
{
- name: 12345,
- currentEvents: 1,
- previousEvents: 1,
+ ...validProject,
+ id: false,
+ },
+ {
+ ...validProject,
+ name: false,
},
{
- name: 'some project',
- currentEvents: 'invalid',
- previousEvents: 1,
+ ...validProject,
+ productAnalyticsEventsStored: false,
},
{
- name: 'some project',
- currentEvents: 1,
- previousEvents: 'invalid',
+ ...validProject,
+ webUrl: false,
+ },
+ {
+ ...validProject,
+ avatarUrl: false,
},
])('returns false when an item property is the wrong type', (testCase) => {
const result = projectsUsageDataValidator([testCase]);
@@ -88,4 +112,90 @@ describe('Product analytics usage quota component utils', () => {
expect(result).toBe(false);
});
});
+
+ describe('findCurrentMonthUsage', () => {
+ const mockNow = '2023-01-15T12:00:00Z';
+ useFakeDate(mockNow);
+
+ it('returns the expected usage', () => {
+ const result = findCurrentMonthUsage(getProjectWithYearsUsage());
+
+ expect(result).toMatchObject({
+ count: 1,
+ month: 1,
+ year: 2023,
+ });
+ });
+ });
+
+ describe('findPreviousMonthUsage', () => {
+ const mockNow = '2023-01-15T12:00:00Z';
+ useFakeDate(mockNow);
+
+ it('returns the expected usage', () => {
+ const result = findPreviousMonthUsage(getProjectWithYearsUsage());
+
+ expect(result).toMatchObject({
+ count: 1,
+ month: 12,
+ year: 2022,
+ });
+ });
+ });
+
+ describe('mapMonthlyTotals', () => {
+ it('returns an empty array for empty projects array', () => {
+ const result = mapMonthlyTotals([]);
+ expect(result).toEqual([]);
+ });
+
+ it('sums counts for the same month and year', () => {
+ const projects = [
+ getProjectUsage({ usage: [{ year: 2023, month: 1, count: 10 }] }),
+ getProjectUsage({ usage: [{ year: 2023, month: 1, count: 5 }] }),
+ ];
+ const result = mapMonthlyTotals(projects);
+ expect(result).toEqual([['Jan 2023', 15]]);
+ });
+
+ it('handles multiple months and years', () => {
+ const projects = [
+ getProjectUsage({ usage: [{ year: 2023, month: 1, count: 10 }] }),
+ getProjectUsage({ usage: [{ year: 2022, month: 12, count: 5 }] }),
+ getProjectUsage({ usage: [{ year: 2023, month: 2, count: 8 }] }),
+ ];
+ const result = mapMonthlyTotals(projects);
+ expect(result).toEqual([
+ ['Dec 2022', 5],
+ ['Jan 2023', 10],
+ ['Feb 2023', 8],
+ ]);
+ });
+
+ it('returns sorted results', () => {
+ const projects = [
+ getProjectUsage({ usage: [{ year: 2023, month: 2, count: 8 }] }),
+ getProjectUsage({ usage: [{ year: 2023, month: 1, count: 10 }] }),
+ getProjectUsage({ usage: [{ year: 2022, month: 12, count: 5 }] }),
+ ];
+ const result = mapMonthlyTotals(projects);
+ expect(result).toEqual([
+ ['Dec 2022', 5],
+ ['Jan 2023', 10],
+ ['Feb 2023', 8],
+ ]);
+ });
+
+ it('handles empty months', () => {
+ const projects = [
+ getProjectUsage({ usage: [{ year: 2023, month: 1, count: 0 }] }),
+ getProjectUsage({ usage: [{ year: 2023, month: 2, count: 0 }] }),
+ ];
+ const result = mapMonthlyTotals(projects);
+ expect(result).toEqual([
+ ['Jan 2023', 0],
+ ['Feb 2023', 0],
+ ]);
+ });
+ });
});
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/graphql/mock_data.js b/ee/spec/frontend/usage_quotas/product_analytics/graphql/mock_data.js
index cde4234b6092..525c6ca06960 100644
--- a/ee/spec/frontend/usage_quotas/product_analytics/graphql/mock_data.js
+++ b/ee/spec/frontend/usage_quotas/product_analytics/graphql/mock_data.js
@@ -1,48 +1,41 @@
import { convertToGraphQLId } from '~/graphql_shared/utils';
import { TYPENAME_GROUP, TYPENAME_PROJECT } from '~/graphql_shared/constants';
-export const getProjectUsage = ({ id, name, numEvents }) => ({
- id,
- name,
- productAnalyticsEventsStored: numEvents !== undefined ? numEvents : 2345,
+export const getProjectUsage = ({ id, name, usage } = {}) => ({
+ id: id || convertToGraphQLId(TYPENAME_PROJECT, 1),
+ name: name || 'some project',
+ productAnalyticsEventsStored: usage || [],
webUrl: `/${name}`,
avatarUrl: `/${name}.jpg`,
__typename: 'Project',
});
-export const getProjectsUsageDataResponse = (currentProjects, previousProjects) => ({
- previous: {
+export const getProjectsUsageDataResponse = (projects) => ({
+ group: {
id: convertToGraphQLId(TYPENAME_GROUP, 1),
projects: {
- nodes: previousProjects || [
+ nodes: projects || [
getProjectUsage({
id: convertToGraphQLId(TYPENAME_PROJECT, 1),
name: 'some onboarded project',
- numEvents: 1234,
+ usage: [
+ {
+ year: 2023,
+ month: 11,
+ count: 1234,
+ },
+ ],
}),
getProjectUsage({
id: convertToGraphQLId(TYPENAME_PROJECT, 2),
name: 'not onboarded project',
- numEvents: null,
- }),
- ],
- __typename: 'ProjectConnection',
- },
- __typename: 'Group',
- },
- current: {
- id: convertToGraphQLId(TYPENAME_GROUP, 1),
- projects: {
- nodes: currentProjects || [
- getProjectUsage({
- id: convertToGraphQLId(TYPENAME_PROJECT, 1),
- name: 'some onboarded project',
- numEvents: 9876,
- }),
- getProjectUsage({
- id: convertToGraphQLId(TYPENAME_PROJECT, 2),
- name: 'not onboarded project',
- numEvents: null,
+ usage: [
+ {
+ year: 2023,
+ month: 11,
+ count: null,
+ },
+ ],
}),
],
__typename: 'ProjectConnection',
@@ -50,3 +43,71 @@ export const getProjectsUsageDataResponse = (currentProjects, previousProjects)
__typename: 'Group',
},
});
+
+export const getProjectWithYearsUsage = ({ id, name } = {}) =>
+ getProjectUsage({
+ id,
+ name,
+ usage: [
+ {
+ month: 1,
+ year: 2023,
+ count: 1,
+ },
+ {
+ month: 12,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 11,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 10,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 9,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 8,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 7,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 6,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 5,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 4,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 3,
+ year: 2022,
+ count: 1,
+ },
+ {
+ month: 2,
+ year: 2022,
+ count: 1,
+ },
+ ],
+ });
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/graphql/utils_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/graphql/utils_spec.js
deleted file mode 100644
index f2dd912f4820..000000000000
--- a/ee/spec/frontend/usage_quotas/product_analytics/graphql/utils_spec.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import {
- projectHasProductAnalyticsEnabled,
- mapProjectsUsageResponse,
-} from 'ee/usage_quotas/product_analytics/graphql/utils';
-import { getProjectsUsageDataResponse, getProjectUsage } from './mock_data';
-
-describe('Product analytics usage quota graphql utils', () => {
- describe('projectHasProductAnalyticsEnabled', () => {
- it.each`
- numEvents | expected
- ${null} | ${false}
- ${0} | ${true}
- ${1} | ${true}
- `('returns $expected when events stored count is $numEvents', ({ numEvents, expected }) => {
- const result = projectHasProductAnalyticsEnabled(
- getProjectUsage({ id: 1, name: 'some project', numEvents }),
- );
- expect(result).toBe(expected);
- });
- });
-
- describe('mapProjectsUsageResponse', () => {
- it('returns expected value when there are no projects', () => {
- const response = getProjectsUsageDataResponse([], []);
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([]);
- });
-
- it('returns expected value when there are no onboarded projects', () => {
- const response = getProjectsUsageDataResponse(
- [getProjectUsage({ id: 1, name: 'not onboarded', numEvents: null })],
- [getProjectUsage({ id: 1, name: 'not onboarded', numEvents: null })],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([]);
- });
-
- it('returns expected value when a project is onboarded in the current month', () => {
- const response = getProjectsUsageDataResponse(
- [getProjectUsage({ id: 1, name: 'just onboarded', numEvents: 1 })],
- [getProjectUsage({ id: 1, name: 'just onboarded', numEvents: null })],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([
- {
- id: 1,
- name: 'just onboarded',
- webUrl: '/just onboarded',
- avatarUrl: '/just onboarded.jpg',
- currentEvents: 1,
- previousEvents: 0,
- },
- ]);
- });
-
- it('returns expected value when there is current but no previous projects', () => {
- const response = getProjectsUsageDataResponse(
- [getProjectUsage({ id: 1, name: 'onboarded', numEvents: 1234 })],
- [],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([
- {
- id: 1,
- name: 'onboarded',
- webUrl: '/onboarded',
- avatarUrl: '/onboarded.jpg',
- currentEvents: 1234,
- previousEvents: 0,
- },
- ]);
- });
-
- it('returns expected value when there are previous but no current projects', () => {
- const response = getProjectsUsageDataResponse(
- [],
- [getProjectUsage({ id: 1, name: 'onboarded', numEvents: 1234 })],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([
- {
- id: 1,
- name: 'onboarded',
- webUrl: '/onboarded',
- avatarUrl: '/onboarded.jpg',
- currentEvents: 0,
- previousEvents: 1234,
- },
- ]);
- });
-
- it('returns expected value when there are both current and previous projects', () => {
- const response = getProjectsUsageDataResponse(
- [getProjectUsage({ id: 1, name: 'onboarded', numEvents: 1234 })],
- [getProjectUsage({ id: 1, name: 'onboarded', numEvents: 987 })],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([
- {
- id: 1,
- name: 'onboarded',
- webUrl: '/onboarded',
- avatarUrl: '/onboarded.jpg',
- currentEvents: 1234,
- previousEvents: 987,
- },
- ]);
- });
-
- it('returns expected value when there are mixed projects', () => {
- const response = getProjectsUsageDataResponse(
- [
- getProjectUsage({ id: 1, name: 'onboarded', numEvents: 1234 }),
- getProjectUsage({ id: 2, name: 'current only project', numEvents: 55 }),
- getProjectUsage({ id: 3, name: 'not onboarded', numEvents: null }),
- ],
- [
- getProjectUsage({ id: 1, name: 'onboarded', numEvents: 987 }),
- getProjectUsage({ id: 4, name: 'previous only project', numEvents: 777 }),
- getProjectUsage({ id: 3, name: 'not onboarded', numEvents: null }),
- ],
- );
-
- const mapped = mapProjectsUsageResponse(response);
-
- expect(mapped).toEqual([
- {
- id: 1,
- name: 'onboarded',
- webUrl: '/onboarded',
- avatarUrl: '/onboarded.jpg',
- currentEvents: 1234,
- previousEvents: 987,
- },
- {
- id: 2,
- name: 'current only project',
- webUrl: '/current only project',
- avatarUrl: '/current only project.jpg',
- currentEvents: 55,
- previousEvents: 0,
- },
- {
- id: 4,
- name: 'previous only project',
- webUrl: '/previous only project',
- avatarUrl: '/previous only project.jpg',
- currentEvents: 0,
- previousEvents: 777,
- },
- ]);
- });
- });
-});
diff --git a/ee/spec/frontend/usage_quotas/product_analytics/utils_spec.js b/ee/spec/frontend/usage_quotas/product_analytics/utils_spec.js
new file mode 100644
index 000000000000..c6d8766d0416
--- /dev/null
+++ b/ee/spec/frontend/usage_quotas/product_analytics/utils_spec.js
@@ -0,0 +1,18 @@
+import { projectHasProductAnalyticsEnabled } from 'ee/usage_quotas/product_analytics/utils';
+import { getProjectUsage } from './graphql/mock_data';
+
+describe('Product analytics usage quota utils', () => {
+ describe('projectHasProductAnalyticsEnabled', () => {
+ it.each`
+ count | expected
+ ${null} | ${false}
+ ${0} | ${true}
+ ${1} | ${true}
+ `('returns $expected when events stored count is $count', ({ count, expected }) => {
+ const result = projectHasProductAnalyticsEnabled(
+ getProjectUsage({ id: 1, name: 'some project', usage: [{ year: 2023, month: 11, count }] }),
+ );
+ expect(result).toBe(expected);
+ });
+ });
+});
diff --git a/ee/spec/requests/api/graphql/project/product_analytics/events_stored_spec.rb b/ee/spec/requests/api/graphql/project/product_analytics/events_stored_spec.rb
index 241daf3dbd08..605b886d0017 100644
--- a/ee/spec/requests/api/graphql/project/product_analytics/events_stored_spec.rb
+++ b/ee/spec/requests/api/graphql/project/product_analytics/events_stored_spec.rb
@@ -14,7 +14,14 @@
%(
query {
project(fullPath: "#{project.full_path}") {
- productAnalyticsEventsStored
+ productAnalyticsEventsStored(monthSelection: [
+ { year: 2023, month: 1 },
+ { year: 2022, month: 12 }
+ ]) {
+ year
+ month
+ count
+ }
}
}
)
@@ -29,10 +36,12 @@
end
context 'when project does not have product analytics enabled' do
- it "returns zero" do
+ it "returns zero for each months usage" do
subject
- expect(graphql_data.dig('project', 'productAnalyticsEventsStored')).to be_zero
+ graphql_data.dig('project', 'productAnalyticsEventsStored').each do |event|
+ expect(event['count']).to be_zero
+ end
end
end
@@ -43,41 +52,21 @@
end
end
- it 'queries the ProjectUsageData interface' do
- freeze_time do
- expect_next_instance_of(Analytics::ProductAnalytics::ProjectUsageData) do |instance|
- expect(instance)
- .to receive(:events_stored_count).with(year: Time.current.year, month: Time.current.month).once
- end
-
- subject
- end
- end
-
context 'when user is not a project member' do
let_it_be(:user) { create(:user) }
it { is_expected.to be_nil }
end
- context 'when setting a month and year' do
- let(:query) do
- %(
- query {
- project(fullPath: "#{project.full_path}") {
- productAnalyticsEventsStored(year: 2021, month: 3)
- }
- }
- )
- end
+ it 'queries the ProjectUsageData interface with the correct parameters' do
+ instance = Analytics::ProductAnalytics::ProjectUsageData.new(project_id: project.id)
- it 'queries the ProjectUsageData interface with the correct parameters' do
- expect_next_instance_of(Analytics::ProductAnalytics::ProjectUsageData) do |instance|
- expect(instance).to receive(:events_stored_count).with(year: 2021, month: 3).once
- end
+ allow(Analytics::ProductAnalytics::ProjectUsageData).to receive(:new).and_return(instance)
- subject
- end
+ expect(instance).to receive(:events_stored_count).with(year: 2023, month: 1).once
+ expect(instance).to receive(:events_stored_count).with(year: 2022, month: 12).once
+
+ subject
end
end
end
--
GitLab