Commit fbbcaddf authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch '341173-be-enhancements-to-subscription-history-table' into 'master'

[BE] Enhancements to Subscription History Table

See merge request gitlab-org/gitlab!72905
parents 97444930 53256ffe
......@@ -8933,6 +8933,7 @@ Represents the current license.
| <a id="currentlicensebillableuserscount"></a>`billableUsersCount` | [`Int`](#int) | Number of billable users on the system. |
| <a id="currentlicenseblockchangesat"></a>`blockChangesAt` | [`Date`](#date) | Date, including grace period, when licensed features will be blocked. |
| <a id="currentlicensecompany"></a>`company` | [`String`](#string) | Company of the licensee. |
| <a id="currentlicensecreatedat"></a>`createdAt` | [`Date`](#date) | Date when the license was added. |
| <a id="currentlicenseemail"></a>`email` | [`String`](#string) | Email of the licensee. |
| <a id="currentlicenseexpiresat"></a>`expiresAt` | [`Date`](#date) | Date when the license expires. |
| <a id="currentlicenseid"></a>`id` | [`ID!`](#id) | ID of the license. |
......@@ -11306,6 +11307,7 @@ Represents an entry from the Cloud License history.
| <a id="licensehistoryentryactivatedat"></a>`activatedAt` | [`Date`](#date) | Date when the license was activated. |
| <a id="licensehistoryentryblockchangesat"></a>`blockChangesAt` | [`Date`](#date) | Date, including grace period, when licensed features will be blocked. |
| <a id="licensehistoryentrycompany"></a>`company` | [`String`](#string) | Company of the licensee. |
| <a id="licensehistoryentrycreatedat"></a>`createdAt` | [`Date`](#date) | Date when the license was added. |
| <a id="licensehistoryentryemail"></a>`email` | [`String`](#string) | Email of the licensee. |
| <a id="licensehistoryentryexpiresat"></a>`expiresAt` | [`Date`](#date) | Date when the license expires. |
| <a id="licensehistoryentryid"></a>`id` | [`ID!`](#id) | ID of the license. |
......
......@@ -33,6 +33,9 @@ module Types
field :starts_at, ::Types::DateType, null: true,
description: 'Date when the license started.'
field :created_at, ::Types::DateType, null: true,
description: 'Date when the license was added.'
field :expires_at, ::Types::DateType, null: true,
description: 'Date when the license expires.'
......
......@@ -62,7 +62,8 @@ RSpec.describe 'Activate a subscription' do
'startsAt' => created_license.starts_at.to_s,
'expiresAt' => created_license.expires_at.to_s,
'blockChangesAt' => created_license.block_changes_at.to_s,
'activatedAt' => created_license.created_at.to_date.to_s,
'activatedAt' => created_license.activated_at.to_date.to_s,
'createdAt' => created_license.created_at.to_date.to_s,
'lastSync' => created_license.last_synced_at.iso8601,
'usersInLicenseCount' => nil,
'billableUsersCount' => 1,
......
......@@ -110,6 +110,12 @@ RSpec.shared_examples_for 'license type fields' do |keys|
it { is_expected.to eq(25) }
end
describe 'created_at' do
let(:field_name) { :created_at }
it { is_expected.to eq(license.created_at) }
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment