diff --git a/app/controllers/support_interface/api_tokens_controller.rb b/app/controllers/support_interface/api_tokens_controller.rb index 3db745589da..6c6e26e03a8 100644 --- a/app/controllers/support_interface/api_tokens_controller.rb +++ b/app/controllers/support_interface/api_tokens_controller.rb @@ -5,7 +5,7 @@ def index VendorAPIToken.arel_table[:last_used_at].desc.nulls_last, created_at: :desc, ) - @api_tokens_last_3_months_count = @api_tokens.where('last_used_at >= ?', 3.months.ago).count + @api_tokens_last_3_months_count = VendorAPIToken.used_in_last_3_months.count end def new diff --git a/app/models/vendor_api_token.rb b/app/models/vendor_api_token.rb index 8d59879d9d9..da31a6ea5c9 100644 --- a/app/models/vendor_api_token.rb +++ b/app/models/vendor_api_token.rb @@ -3,6 +3,8 @@ class VendorAPIToken < ApplicationRecord audited associated_with: :provider + scope :used_in_last_3_months, -> { where('last_used_at >= ?', 3.months.ago) } + def self.create_with_random_token!(provider:) unhashed_token, hashed_token = Devise.token_generator.generate(VendorAPIToken, :hashed_token) create!(hashed_token:, provider:) diff --git a/app/views/support_interface/api_tokens/index.html.erb b/app/views/support_interface/api_tokens/index.html.erb index 37744a5246c..b6e9223f5bd 100644 --- a/app/views/support_interface/api_tokens/index.html.erb +++ b/app/views/support_interface/api_tokens/index.html.erb @@ -8,7 +8,6 @@ count: @api_tokens.count, label: 'API tokens issued', colour: :blue, - href: '#not-connected', ) %>
@@ -16,7 +15,6 @@ count: @api_tokens_last_3_months_count, label: 'API tokens used in the last 3 months', colour: :blue, - href: '#not-synced', ) %>
diff --git a/spec/system/support_interface/api_tokens/view_tokens_spec.rb b/spec/system/support_interface/api_tokens/view_tokens_spec.rb index acd381a3381..8786261e17b 100644 --- a/spec/system/support_interface/api_tokens/view_tokens_spec.rb +++ b/spec/system/support_interface/api_tokens/view_tokens_spec.rb @@ -7,7 +7,7 @@ given_i_am_signed_in and_api_tokens_exist when_i_visit_the_tokens_page - then_i_see_all_the_providers_with_api_tokens + then_i_see_the_count_of_providers_with_api_tokens end def given_i_am_signed_in @@ -27,7 +27,7 @@ def when_i_visit_the_tokens_page visit support_interface_api_tokens_path end - def then_i_see_all_the_providers_with_api_tokens + def then_i_see_the_count_of_providers_with_api_tokens expect(page).to have_content '2 API tokens issued' expect(page).to have_content '1 API tokens used in the last 3 months'