diff --git a/ecommerce/authentication/Gemfile.lock b/ecommerce/authentication/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/authentication/Gemfile.lock +++ b/ecommerce/authentication/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/crm/Gemfile.lock b/ecommerce/crm/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/crm/Gemfile.lock +++ b/ecommerce/crm/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/fulfillment/Gemfile.lock b/ecommerce/fulfillment/Gemfile.lock index 87553b254..40bc14795 100644 --- a/ecommerce/fulfillment/Gemfile.lock +++ b/ecommerce/fulfillment/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -79,21 +78,13 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.10) rake (13.2.1) - redis-client (0.22.1) - connection_pool regexp_parser (2.8.3) ruby_event_store (2.14.0) concurrent-ruby (~> 1.0, >= 1.1.6) ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.4) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.19.0) sorbet-runtime (0.5.11368) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/inventory/Gemfile.lock b/ecommerce/inventory/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/inventory/Gemfile.lock +++ b/ecommerce/inventory/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/invoicing/Gemfile.lock b/ecommerce/invoicing/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/invoicing/Gemfile.lock +++ b/ecommerce/invoicing/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/ordering/Gemfile.lock b/ecommerce/ordering/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/ordering/Gemfile.lock +++ b/ecommerce/ordering/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/payments/Gemfile.lock b/ecommerce/payments/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/payments/Gemfile.lock +++ b/ecommerce/payments/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/pricing/Gemfile.lock b/ecommerce/pricing/Gemfile.lock index d7e4ebf47..760af3b66 100644 --- a/ecommerce/pricing/Gemfile.lock +++ b/ecommerce/pricing/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) timecop (0.9.8) tzinfo (2.0.6) diff --git a/ecommerce/processes/Gemfile.lock b/ecommerce/processes/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/processes/Gemfile.lock +++ b/ecommerce/processes/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/product_catalog/Gemfile.lock b/ecommerce/product_catalog/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/product_catalog/Gemfile.lock +++ b/ecommerce/product_catalog/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/shipping/Gemfile.lock b/ecommerce/shipping/Gemfile.lock index 43c29a1da..c9f130fa3 100644 --- a/ecommerce/shipping/Gemfile.lock +++ b/ecommerce/shipping/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/ecommerce/taxes/Gemfile.lock b/ecommerce/taxes/Gemfile.lock index 4a73abff2..0e3e47884 100644 --- a/ecommerce/taxes/Gemfile.lock +++ b/ecommerce/taxes/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/infra/Gemfile.lock b/infra/Gemfile.lock index 6af14d8eb..84bc79a3b 100644 --- a/infra/Gemfile.lock +++ b/infra/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ @@ -78,10 +77,7 @@ GEM ast (~> 2.4.1) racc racc (1.7.3) - rack (3.0.8) rake (13.1.0) - redis-client (0.19.0) - connection_pool regexp_parser (2.8.3) ruby2_keywords (0.0.5) ruby_event_store (2.13.0) @@ -89,11 +85,6 @@ GEM ruby_event_store-transformations (0.1.0) activesupport (>= 5.0) ruby_event_store (>= 2.0.0, < 3.0.0) - sidekiq (7.2.0) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sorbet-runtime (0.5.11190) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/infra/infra.gemspec b/infra/infra.gemspec index d11576240..e72dfc10d 100644 --- a/infra/infra.gemspec +++ b/infra/infra.gemspec @@ -16,5 +16,4 @@ Gem::Specification.new do |spec| spec.add_dependency "arkency-command_bus" spec.add_dependency "ruby_event_store", "~> 2.13" spec.add_dependency "ruby_event_store-transformations" - spec.add_dependency "sidekiq" end diff --git a/infra/lib/infra.rb b/infra/lib/infra.rb index fe6255798..8e9d950dc 100644 --- a/infra/lib/infra.rb +++ b/infra/lib/infra.rb @@ -7,7 +7,6 @@ require "active_support/notifications" require "minitest" require "ruby_event_store/transformations" -require "sidekiq" require_relative "infra/command" require_relative "infra/command_bus" diff --git a/infra/test/test_helper.rb b/infra/test/test_helper.rb index a8c97190f..ddea4631b 100644 --- a/infra/test/test_helper.rb +++ b/infra/test/test_helper.rb @@ -1,6 +1,5 @@ require "minitest/autorun" require "mutant/minitest/coverage" -require "sidekiq/testing" require_relative "../lib/infra" diff --git a/rails_application/Gemfile.lock b/rails_application/Gemfile.lock index e2c06151a..65d333a1a 100644 --- a/rails_application/Gemfile.lock +++ b/rails_application/Gemfile.lock @@ -9,7 +9,6 @@ PATH rake ruby_event_store (~> 2.13) ruby_event_store-transformations - sidekiq GEM remote: https://oss:7AXfeZdAfCqL1PvHm2nvDJO6Zd9UW8IK@gem.mutant.dev/ diff --git a/rails_application/bin/reset_heroku_db.sh b/rails_application/bin/reset_heroku_db.sh index e9501a52f..0db2c1024 100755 --- a/rails_application/bin/reset_heroku_db.sh +++ b/rails_application/bin/reset_heroku_db.sh @@ -2,6 +2,5 @@ heroku restart --app=res-ecommerce-rails heroku pg:reset DATABASE --app=res-ecommerce-rails --confirm res-ecommerce-rails -heroku run "cd rails_application; rails runner 'Sidekiq.redis(&:itself).flushdb'" --app=res-ecommerce-rails heroku run "cd rails_application; rake db:schema:load" --app=res-ecommerce-rails heroku run "cd rails_application; rake db:seed" --app=res-ecommerce-rails diff --git a/rails_application/config/application.rb b/rails_application/config/application.rb index b53293a26..6b6b43388 100644 --- a/rails_application/config/application.rb +++ b/rails_application/config/application.rb @@ -1,37 +1,18 @@ require_relative "boot" require "rails" -# Pick the frameworks you want: require "active_model/railtie" require "active_job/railtie" require "active_record/railtie" -# require "active_storage/engine" require "action_controller/railtie" -# require "action_mailer/railtie" -# require "action_mailbox/engine" -# require "action_text/engine" require "action_view/railtie" require "action_cable/engine" require "rails/test_unit/railtie" -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) class Application < Rails::Application - # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 7.0 - - config.active_job.queue_adapter = :sidekiq - # Configuration for the application, engines, and railties goes here. - # - # These settings can be overridden in specific environments using the files - # in config/environments, which are processed later. - # - # config.time_zone = "Central Time (US & Canada)" - # config.eager_load_paths << Rails.root.join("extras") - - # Don't generate system test files. + config.load_defaults 7.0 config.generators.system_tests = nil end diff --git a/rails_application/config/initializers/sidekiq.rb b/rails_application/config/initializers/sidekiq.rb deleted file mode 100644 index 798ee1e1c..000000000 --- a/rails_application/config/initializers/sidekiq.rb +++ /dev/null @@ -1,3 +0,0 @@ -Sidekiq.configure_server do |config| - config.redis = { url: ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') } -end diff --git a/rails_application/config/routes.rb b/rails_application/config/routes.rb index e193db270..323df11c3 100644 --- a/rails_application/config/routes.rb +++ b/rails_application/config/routes.rb @@ -1,5 +1,3 @@ -require 'sidekiq/web' - Rails.application.routes.draw do root "orders#index" @@ -52,5 +50,4 @@ get "client/products", to: "client/products#index" mount RailsEventStore::Browser => "/res" - mount Sidekiq::Web => '/sidekiq' end diff --git a/rails_application/test/test_helper.rb b/rails_application/test/test_helper.rb index 7afc620ad..acc47ee7f 100644 --- a/rails_application/test/test_helper.rb +++ b/rails_application/test/test_helper.rb @@ -2,17 +2,11 @@ require_relative "../config/environment" require "rails/test_help" require "mutant/minitest/coverage" -require "sidekiq/testing" ActiveJob::Base.logger = Logger.new(nil) class InMemoryTestCase < ActiveSupport::TestCase - def setup - super - Sidekiq.logger.level = Logger::WARN - end - def before_setup result = super @previous_event_store = Rails.configuration.event_store @@ -39,10 +33,6 @@ def run_command(command) end class RealRESIntegrationTestCase < ActionDispatch::IntegrationTest - def setup - super - Sidekiq.logger.level = Logger::WARN - end def run_command(command) Rails.configuration.command_bus.call(command) @@ -51,11 +41,6 @@ def run_command(command) class InMemoryRESIntegrationTestCase < ActionDispatch::IntegrationTest - def setup - super - Sidekiq.logger.level = Logger::WARN - end - def before_setup result = super @previous_event_store = Rails.configuration.event_store