From 351e3937b9081e01ea1e20c617262f725c93af4e Mon Sep 17 00:00:00 2001 From: HemaHG Date: Tue, 28 Apr 2020 12:22:04 +0530 Subject: [PATCH 1/5] Updating pisoni 1.29 --- Gemfile.base | 2 +- Gemfile.lock | 4 ++-- Gemfile.prod.lock | 4 ++-- test/test_helpers/backend.rb | 7 ------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Gemfile.base b/Gemfile.base index 1109406d43..ac6abf857a 100644 --- a/Gemfile.base +++ b/Gemfile.base @@ -38,7 +38,7 @@ gem 'bcrypt', '~> 3.1.7' gem 'i18n' # Apisonator client -gem 'pisoni', '~> 1.26' +gem 'pisoni', '~> 1.29' # 3scale fork that allows OPTIONS passthrough gem 'font_assets', git: 'https://github.com/3scale/font_assets.git', ref: 'da97b8601528ee189795cc94b953ec9a30f47e83', groups: [:production, :preview] diff --git a/Gemfile.lock b/Gemfile.lock index 69b2465ca2..4a63966bac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -476,7 +476,7 @@ GEM excon faraday (>= 0.9) pg (0.21.0) - pisoni (1.27.0) + pisoni (1.29.0) faraday (>= 0.9.1) injectedlogger (>= 0.0.13) json (>= 1.8.1) @@ -886,7 +886,7 @@ DEPENDENCIES paperclip (~> 5.3.0) percy-capybara (~> 2.5.1) pg (~> 0.21.0) - pisoni (~> 1.26) + pisoni (~> 1.29) prawn-core! prawn-format (= 0.2.1) prawn-layout (= 0.2.1) diff --git a/Gemfile.prod.lock b/Gemfile.prod.lock index b9f13fc9ee..906457dff9 100644 --- a/Gemfile.prod.lock +++ b/Gemfile.prod.lock @@ -477,7 +477,7 @@ GEM addressable excon faraday (>= 0.9) - pisoni (1.27.0) + pisoni (1.29.0) faraday (>= 0.9.1) injectedlogger (>= 0.0.13) json (>= 1.8.1) @@ -887,7 +887,7 @@ DEPENDENCIES open_id_authentication paperclip (~> 5.3.0) percy-capybara (~> 2.5.1) - pisoni (~> 1.26) + pisoni (~> 1.29) prawn-core! prawn-format (= 0.2.1) prawn-layout (= 0.2.1) diff --git a/test/test_helpers/backend.rb b/test/test_helpers/backend.rb index a7aad5b03d..42680e702c 100644 --- a/test/test_helpers/backend.rb +++ b/test/test_helpers/backend.rb @@ -53,8 +53,6 @@ def mock_core! [] end - clear_method ThreeScale::Core::User.singleton_class, - :load, :delete_all_for_service clear_method ThreeScale::Core::ApplicationKey.singleton_class, :save, :delete clear_method ThreeScale::Core::ApplicationReferrerFilter.singleton_class, @@ -63,11 +61,6 @@ def mock_core! ThreeScale::Core::APIClient::Collection.new([], 0) end - # these are required to return true for some cukes to be happy - on_method ThreeScale::Core::User.singleton_class, :save!, :delete! do |*_| - true - end - clear_method ThreeScale::Core::AlertLimit.singleton_class, :save, :load_all do |*_| [] end From 4961344003fbd8fa722aaf9e6a2386c5b9b05b8c Mon Sep 17 00:00:00 2001 From: HemaHG Date: Tue, 28 Apr 2020 12:56:13 +0530 Subject: [PATCH 2/5] Removing delete_job paramter in delete_stats Signed-off-by: HemaHG --- app/models/metric.rb | 1 - app/workers/backend_delete_stats_worker.rb | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/models/metric.rb b/app/models/metric.rb index c8deada062..e696b68bbe 100644 --- a/app/models/metric.rb +++ b/app/models/metric.rb @@ -2,7 +2,6 @@ class Metric < ApplicationRecord include Backend::ModelExtensions::Metric include SystemName - include SaveDestroyForServiceAssociation include BackendApiLogic::MetricExtension self.background_deletion = %i[pricing_rules usage_limits plan_metrics proxy_rules] diff --git a/app/workers/backend_delete_stats_worker.rb b/app/workers/backend_delete_stats_worker.rb index e604763935..dc75a9bf6e 100644 --- a/app/workers/backend_delete_stats_worker.rb +++ b/app/workers/backend_delete_stats_worker.rb @@ -6,20 +6,6 @@ class BackendDeleteStatsWorker def perform(event_id) @event = EventStore::Repository.find_event!(event_id) - ThreeScale::Core::Service.delete_stats(event.service_id, delete_job) - end - - attr_reader :event - - def delete_job - service = Service.new({id: event.service_id}, without_protection: true) - deleted_associations = DeletedObject.where(owner: service) - { deletejobdef: { - applications: deleted_associations.contracts.pluck(:object_id), - metrics: deleted_associations.metrics.pluck(:object_id), - users: [], - from: Time.parse(event.service_created_at).to_i, - to: Time.now.utc.to_i - }} + ThreeScale::Core::Service.delete_stats(event.service_id, {}) end end From 824ae66744a88012f023328a38891e840e48709d Mon Sep 17 00:00:00 2001 From: HemaHG Date: Tue, 28 Apr 2020 16:38:10 +0530 Subject: [PATCH 3/5] updating test file Signed-off-by: HemaHG --- .../workers/backend_delete_stats_worker_test.rb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/test/workers/backend_delete_stats_worker_test.rb b/test/workers/backend_delete_stats_worker_test.rb index f4e7da975d..911c6a5684 100644 --- a/test/workers/backend_delete_stats_worker_test.rb +++ b/test/workers/backend_delete_stats_worker_test.rb @@ -17,24 +17,11 @@ def setup test 'perform' do Timecop.freeze do - ThreeScale::Core::Service.expects(:delete_stats).with do |service_id, delete_job| - service_id == service.id && assert_delete_job_params(delete_job) + ThreeScale::Core::Service.expects(:delete_stats).with do |service_id| + service_id == service.id end Sidekiq::Testing.inline! { BackendDeleteStatsWorker.perform_async(event.event_id) } end end - - private - - def assert_delete_job_params(delete_job) - deletejobdef = delete_job[:deletejobdef] || {} - [ - -> { (deletejobdef[:applications] || []).sort == applications.map(&:id).sort }, - -> { (deletejobdef[:metrics] || []).sort == metrics.map(&:id).sort }, - -> { deletejobdef[:users] == [] }, - -> { deletejobdef[:from] == service.created_at.utc.to_i }, - -> { deletejobdef[:to] == Time.now.utc.to_i } - ].all?(&:call) - end end From 9a036803ba21b509f4b8c58f4afe3831c56dc789 Mon Sep 17 00:00:00 2001 From: HemaHG Date: Tue, 28 Apr 2020 17:36:16 +0530 Subject: [PATCH 4/5] Upadting test Signed-off-by: HemaHG --- app/workers/backend_delete_stats_worker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/workers/backend_delete_stats_worker.rb b/app/workers/backend_delete_stats_worker.rb index dc75a9bf6e..58be8d414e 100644 --- a/app/workers/backend_delete_stats_worker.rb +++ b/app/workers/backend_delete_stats_worker.rb @@ -4,7 +4,7 @@ class BackendDeleteStatsWorker include Sidekiq::Worker def perform(event_id) - @event = EventStore::Repository.find_event!(event_id) + event = EventStore::Repository.find_event!(event_id) ThreeScale::Core::Service.delete_stats(event.service_id, {}) end From 4f584807ea53f171fee892ac88ababf075971881 Mon Sep 17 00:00:00 2001 From: HemaHG Date: Tue, 28 Apr 2020 18:38:23 +0530 Subject: [PATCH 5/5] Updating metric.rb Signed-off-by: HemaHG --- app/models/metric.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/metric.rb b/app/models/metric.rb index e696b68bbe..c8deada062 100644 --- a/app/models/metric.rb +++ b/app/models/metric.rb @@ -2,6 +2,7 @@ class Metric < ApplicationRecord include Backend::ModelExtensions::Metric include SystemName + include SaveDestroyForServiceAssociation include BackendApiLogic::MetricExtension self.background_deletion = %i[pricing_rules usage_limits plan_metrics proxy_rules]