Simplify setup

app/jobs/outboxer_integration/test_started_job.rb

@@ -3,14 +3,9 @@ class TestStartedJob
     include Sidekiq::Job
 
     def perform(event_id)
-      event = EventService.find_by_id(id: event_id)
+      test_started_event = TestStartedEvent.find(event_id)
 
-      CompleteTestJob.perform_async({
-        "user_id" => event.user_id,
-        "tenant_id" => event.tenant_id,
-        "id" => event.eventable_id,
-        "lock_version" => event.index
-      })
+      TestCompletedEvent.create!(body: { "test_id" => test_started_event.body["test_id"] })
     end
   end
 end

app/models/event.rb

@@ -1,11 +1,7 @@
 class Event < ApplicationRecord
   self.table_name = "events"
 
-  default_scope { order(:index) }
-
-  # associations
-
-  belongs_to :eventable, polymorphic: true
+  default_scope { order(:created_at) }
 
   # validations
 

bin/console

@@ -6,8 +6,6 @@ require "outboxer"
 require "sidekiq"
 require "irb"
 
-require_relative "../app/services/outboxer_integration/test_service"
-
 Dir.glob(File.join(__dir__, "../app/models/**/*.rb")).each do |file|
   require file
 end

db/migrate/create_events.rb

@@ -1,17 +1,13 @@
 class CreateEvents < ActiveRecord::Migration[7.0]
   def up
     create_table :events do |t|
-      t.bigint :user_id
-      t.bigint :tenant_id
-      t.datetime :created_at, null: false
+      t.string :type, null: false, limit: 255
+      t.send json_column_type, :body
 
-      t.string :eventable_type, limit: 255
-      t.bigint :eventable_id
-      t.bigint :index
-      t.index [:eventable_type, :eventable_id, :index], unique: true
+      t.datetime :created_at, null: false
 
-      t.string :type, null: false, limit: 255
-      t.send(json_column_type, :body)
+      t.index :created_at
+      t.index [:type, :created_at]
     end
   end
 

generators/install_generator.rb

@@ -40,21 +40,13 @@ def copy_migrations
       migration_template(
         "db/migrate/create_events.rb",
         "db/migrate/create_events.rb")
-
-      migration_template(
-        "db/migrate/create_outboxer_integration_tests.rb",
-        "db/migrate/create_outboxer_integration_tests.rb")
     end
 
     def copy_models
       copy_file(
         "app/models/event.rb",
         "app/models/event.rb")
 
-      copy_file(
-        "app/models/outboxer_integration/test.rb",
-        "app/models/outboxer_integration/test.rb")
-
       copy_file(
         "app/models/outboxer_integration/test_started_event.rb",
         "app/models/outboxer_integration/test_started_event.rb")
@@ -64,29 +56,6 @@ def copy_models
         "app/models/outboxer_integration/test_completed_event.rb")
     end
 
-    def copy_services
-      copy_file(
-        "app/services/event_service.rb",
-        "app/services/event_service.rb")
-
-      copy_file(
-        "spec/services/event_service_spec.rb",
-        "spec/services/event_service_spec.rb")
-
-      copy_file(
-        "app/services/outboxer_integration/test_service.rb",
-        "app/services/outboxer_integration/test_service.rb")
-    end
-
-    def copy_bin_file
-      template "bin/outboxer_publisher", "bin/outboxer_publisher"
-      run "chmod +x bin/outboxer_publisher"
-
-      copy_file(
-        "spec/bin/outboxer_publisher_spec.rb",
-        "spec/bin/outboxer_publisher_spec.rb")
-    end
-
     def copy_jobs
       copy_file(
         "app/jobs/event_created_job.rb",
@@ -104,5 +73,14 @@ def copy_jobs
         "app/jobs/outboxer_integration/complete_test_job.rb",
         "app/jobs/outboxer_integration/complete_test_job.rb")
     end
+
+    def copy_bin_file
+      template "bin/outboxer_publisher", "bin/outboxer_publisher"
+      run "chmod +x bin/outboxer_publisher"
+
+      copy_file(
+        "spec/bin/outboxer_publisher_spec.rb",
+        "spec/bin/outboxer_publisher_spec.rb")
+    end
   end
 end

spec/bin/outboxer_publisher_spec.rb

@@ -2,20 +2,16 @@
 
 require_relative "../../app/models/application_record"
 require_relative "../../app/models/event"
-require_relative "../../app/models/outboxer_integration/test"
 require_relative "../../app/models/outboxer_integration/test_started_event"
 require_relative "../../app/models/outboxer_integration/test_completed_event"
 
-require_relative "../../app/services/outboxer_integration/test_service"
-
 RSpec.describe "bin/outboxer_publisher" do
-  let(:user_id) { 1 }
-  let(:tenant_id) { 2 }
+  let(:test_id) { 999 }
 
   it "performs event job handler async" do
     Sidekiq::Testing.disable!
 
-    test, _event = OutboxerIntegration::TestService.start(user_id: user_id, tenant_id: tenant_id)
+    OutboxerIntegration::TestStartedEvent.create!(body: { "test_id" => test_id })
 
     env = {
       "RAILS_ENV" => "test",
@@ -33,17 +29,18 @@
     test_completed_event = nil
 
     max_attempts.times do |attempt|
-      test = OutboxerIntegration::Test.find(test[:id])
       test_completed_event = OutboxerIntegration::TestCompletedEvent.last
-      break if test_completed_event && (test.events.last == test_completed_event)
+      break if test_completed_event
 
       sleep 1
 
       Sidekiq.logger.warn "OutboxerIntegration::TestCompletedEvent not found. " \
         "Retrying (attempt #{attempt + 1}/#{max_attempts})..."
     end
 
-    expect(test_completed_event.body["test"]["id"]).to eql(test.id)
+    expect(test_completed_event.type).not_to be_nil
+    expect(test_completed_event.body).to eql({ "test_id" => test_id })
+    expect(test_completed_event.created_at).not_to be_nil
   ensure
     if sidekiq_pid
       Process.kill("TERM", sidekiq_pid)

spec/rails_helper.rb

@@ -11,10 +11,6 @@
 
 Dir[File.join(__dir__, "factories/**/*.rb")].each { |f| require f }
 
-require_relative "../app/models/application_record"
-require_relative "../app/models/event"
-require_relative "../app/services/event_service"
-
 SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start