Revert to autoinc ids from uuids (#9)

fast-programmer · Mar 10, 2024 · ac44084 · ac44084
1 parent 6d359c1
commit ac44084
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 22 deletions.
diff --git a/db/migrate/create_outboxer_exceptions.rb b/db/migrate/create_outboxer_exceptions.rb
@@ -1,11 +1,8 @@
 class CreateOutboxerExceptions < ActiveRecord::Migration[6.1]
   def up
     ActiveRecord::Base.transaction do
-      create_table :outboxer_exceptions, id: false do |t|
-        t.uuid :id, primary_key: true
-
-        t.references :message, null: false,
-          type: :uuid, foreign_key: { to_table: :outboxer_messages }
+      create_table :outboxer_exceptions do |t|
+        t.references :message, null: false, foreign_key: { to_table: :outboxer_messages }
 
         t.text :class_name, null: false
         t.text :message_text, null: false

diff --git a/db/migrate/create_outboxer_frames.rb b/db/migrate/create_outboxer_frames.rb
@@ -1,10 +1,7 @@
 class CreateOutboxerFrames < ActiveRecord::Migration[6.1]
   def up
-    create_table :outboxer_frames, id: false do |t|
-        t.uuid :id, primary_key: true
-
-      t.references :exception,
-        null: false, type: :uuid, foreign_key: { to_table: :outboxer_exceptions }
+    create_table :outboxer_frames do |t|
+      t.references :exception, null: false, foreign_key: { to_table: :outboxer_exceptions }
 
       t.integer :index, null: false
       t.text :text, null: false

diff --git a/db/migrate/create_outboxer_messages.rb b/db/migrate/create_outboxer_messages.rb
@@ -1,7 +1,6 @@
 class CreateOutboxerMessages < ActiveRecord::Migration[6.1]
   def up
-    create_table :outboxer_messages, id: false do |t|
-      t.uuid :id, primary_key: true
+    create_table :outboxer_messages do |t|
       t.string :status, null: false, limit: 255
 
       t.text :messageable_id, null: false

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -5,40 +5,33 @@
   case i % 3
   when 0
     Outboxer::Models::Message.create!(
-      id: SecureRandom.uuid,
       messageable_type: 'Event',
       messageable_id: i,
       status: Outboxer::Models::Message::Status::UNPUBLISHED)
   when 1
     Outboxer::Models::Message.create!(
-      id: SecureRandom.uuid,
       messageable_type: 'Event',
       messageable_id: i,
       status: Outboxer::Models::Message::Status::PUBLISHING)
   else
     failed_message = Outboxer::Models::Message.create!(
-      id: SecureRandom.uuid,
       messageable_type: 'Event',
       messageable_id: i,
       status: Outboxer::Models::Message::Status::FAILED)
 
     failed_message_exception = failed_message.exceptions.create!(
-      id: SecureRandom.uuid,
       class_name: 'ActiveRecord::RecordInvalid',
       message_text: 'Validation failed: Exceptions is invalid')
 
     failed_message_exception.frames.create!(
-      id: SecureRandom.uuid,
       index: 0,
       text: "/lib/active_record/validations.rb:84:in `raise_validation_error'")
 
     failed_message_exception.frames.create!(
-      id: SecureRandom.uuid,
       index: 1,
       text: "/lib/active_record/validations.rb:55:in `save!'")
 
     failed_message_exception.frames.create!(
-      id: SecureRandom.uuid,
       index: 2,
       text: "lib/active_record/transactions.rb:313:in `block in save!'")
   end

diff --git a/lib/outboxer/message.rb b/lib/outboxer/message.rb
@@ -39,10 +39,10 @@ def failed!(id:, exception:)
           outboxer_message.update!(status: Models::Message::Status::FAILED)
 
           outboxer_exception = outboxer_message.exceptions.create!(
-            id: SecureRandom.uuid, class_name: exception.class.name, message_text: exception.message)
+            class_name: exception.class.name, message_text: exception.message)
 
           exception.backtrace.each_with_index do |frame, index|
-            outboxer_exception.frames.create!(id: SecureRandom.uuid, index: index, text: frame)
+            outboxer_exception.frames.create!(index: index, text: frame)
           end
 
           outboxer_message

diff --git a/spec/factories/outboxer_messages.rb b/spec/factories/outboxer_messages.rb
@@ -1,6 +1,5 @@
 FactoryBot.define do
   factory :outboxer_message, class: 'Outboxer::Models::Message' do
-    id { SecureRandom.uuid }
     messageable_type { 'DummyType' }
     messageable_id { 1 }
     status { Outboxer::Models::Message::Status::PUBLISHING }