Save last_synced_at on licenses table

Add a column for last_synced_at to the licenses table.
Use this new column for the "Last sync" value shown in the details
section of the Subscription page.
Modify the activate and sync services to save last_synced_at when
creating a cloud license record.

Changelog: added

db/migrate/20210624180613_add_last_synced_at_to_licenses.rb

+# frozen_string_literal: true
+
+class AddLastSyncedAtToLicenses < ActiveRecord::Migration[6.1]
+  def change
+    add_column :licenses, :last_synced_at, :datetime_with_timezone
+  end
+end

db/schema_migrations/20210624180613

+705c4cf981f1929f8e8e4d8a8a3c12613516d65e59c71ac79048224cd97c47cc
\ No newline at end of file

db/structure.sql

@@ -14461,7 +14461,8 @@ CREATE TABLE licenses (
     data text NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    cloud boolean DEFAULT false
+    cloud boolean DEFAULT false,
+    last_synced_at timestamp with time zone
 );
 
 CREATE SEQUENCE licenses_id_seq

ee/app/services/gitlab_subscriptions/activate_service.rb

@@ -17,7 +17,7 @@ module GitlabSubscriptions
 
       return response unless response[:success]
 
-      license = License.new(data: response[:license_key], cloud: true)
+      license = License.new(data: response[:license_key], cloud: true, last_synced_at: Time.current)
 
       if license.save
         License.cloud.id_not_in(license.id).delete_all

ee/app/workers/sync_seat_link_request_worker.rb

@@ -37,7 +37,7 @@ class SyncSeatLinkRequestWorker
   def reset_license!(license_data)
     License.transaction do
       License.cloud.delete_all
-      License.create!(data: license_data, cloud: true)
+      License.create!(data: license_data, cloud: true, last_synced_at: Time.current)
     end
   rescue StandardError => e
     Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e)

ee/spec/graphql/types/admin/cloud_licenses/current_license_type_spec.rb

@@ -6,7 +6,6 @@ RSpec.describe GitlabSchema.types['CurrentLicense'], :enable_admin_mode do
   include GraphqlHelpers
 
   let_it_be(:admin) { create(:admin) }
-  let_it_be(:last_synced_at) { DateTime.current - 1.day }
   let_it_be(:licensee) do
     {
       'Name' => 'User Example',
@@ -17,10 +16,8 @@ RSpec.describe GitlabSchema.types['CurrentLicense'], :enable_admin_mode do
 
   let_it_be(:license) do
     create_current_license(
-      licensee: licensee,
-      cloud_licensing_enabled: true,
-      last_synced_at: last_synced_at,
-      next_sync_at: last_synced_at + 1.day
+      { licensee: licensee, cloud_licensing_enabled: true },
+      { cloud: true, last_synced_at: Time.current }
     )
   end
 
@@ -28,20 +25,6 @@ RSpec.describe GitlabSchema.types['CurrentLicense'], :enable_admin_mode do
     %w[last_sync billable_users_count maximum_user_count users_over_license_count]
   end
 
-  def query(field_name)
-    %(
-      {
-        currentLicense {
-          #{field_name}
-        }
-      }
-    )
-  end
-
-  def query_field(field_name)
-    GitlabSchema.execute(query(field_name), context: { current_user: admin }).as_json
-  end
-
   before do
     stub_application_setting(cloud_license_enabled: true)
   end
@@ -52,6 +35,20 @@ RSpec.describe GitlabSchema.types['CurrentLicense'], :enable_admin_mode do
   include_examples 'license type fields', %w[data currentLicense]
 
   describe "#users_over_license_count" do
+    def query(field_name)
+      %(
+        {
+          currentLicense {
+            #{field_name}
+          }
+        }
+      )
+    end
+
+    def query_field(field_name)
+      GitlabSchema.execute(query(field_name), context: { current_user: admin }).as_json
+    end
+
     context 'when license is for a trial' do
       it 'returns 0' do
         create_current_license(licensee: licensee, restrictions: { trial: true })
@@ -78,7 +75,7 @@ RSpec.describe GitlabSchema.types['CurrentLicense'], :enable_admin_mode do
     describe 'last_sync' do
       let(:field_name) { :last_sync }
 
-      it { is_expected.to eq(last_synced_at.change(usec: 0)) }
+      it { is_expected.to eq(license.last_synced_at) }
     end
 
     describe 'billable_users_count' do

ee/spec/requests/api/graphql/mutations/gitlab_subscriptions/activate_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe 'Activate a subscription' do
         'expiresAt' => created_license.expires_at.to_s,
         'blockChangesAt' => created_license.block_changes_at.to_s,
         'activatedAt' => created_license.created_at.to_date.to_s,
-        'lastSync' => nil,
+        'lastSync' => created_license.last_synced_at.iso8601,
         'usersInLicenseCount' => nil,
         'billableUsersCount' => 1,
         'maximumUserCount' => 1,

ee/spec/services/gitlab_subscriptions/activate_service_spec.rb

@@ -32,13 +32,18 @@ RSpec.describe GitlabSubscriptions::ActivateService do
     end
 
     it 'persists license' do
-      result = execute_service
-      created_license = License.last
+      freeze_time do
+        result = execute_service
+        created_license = License.last
 
-      expect(result).to eq({ success: true, license: created_license })
+        expect(result).to eq({ success: true, license: created_license })
 
-      expect(created_license.data).to eq(license_key)
-      expect(created_license.cloud).to eq(true)
+        expect(created_license).to have_attributes(
+          data: license_key,
+          cloud: true,
+          last_synced_at: Time.current
+        )
+      end
     end
 
     it 'deletes any existing cloud licenses' do

ee/spec/support/helpers/ee/license_helpers.rb

@@ -43,11 +43,12 @@ module EE
         ::Gitlab::CurrentSettings.update!(check_namespace_plan: true)
       end
 
-      def create_current_license(options = {})
+      def create_current_license(gitlab_license_options = {}, license_options = {})
         License.current.destroy!
 
-        gl_license = create(:gitlab_license, options)
-        create(:license, data: gl_license.export)
+        gl_license = create(:gitlab_license, gitlab_license_options)
+
+        create(:license, license_options.merge(data: gl_license.export))
       end
 
       ::Project.prepend ClearLicensedFeatureAvailableCache

ee/spec/workers/sync_seat_link_request_worker_spec.rb

@@ -46,11 +46,14 @@ RSpec.describe SyncSeatLinkRequestWorker, type: :worker do
 
       shared_examples 'successful license creation' do
         it 'persists the new license' do
-          expect { sync_seat_link }.to change(License, :count).by(1)
-          expect(License.last).to have_attributes(
-            data: license_key,
-            cloud: true
-          )
+          freeze_time do
+            expect { sync_seat_link }.to change(License, :count).by(1)
+            expect(License.last).to have_attributes(
+              data: license_key,
+              cloud: true,
+              last_synced_at: Time.current
+            )
+          end
         end
       end