move events under models

app/domains/accountify/contact.rb

@@ -2,8 +2,6 @@ module Accountify
   module Contact
     extend self
 
-    class CreatedEvent < Event; end
-
     def create(user_id:, tenant_id:,
               organisation_id:, first_name:, last_name:, email:)
       contact = nil
@@ -18,7 +16,7 @@ def create(user_id:, tenant_id:,
             last_name: last_name,
             email: email)
 
-        event = CreatedEvent
+        event = Models::Contact::CreatedEvent
           .create!(
             user_id: user_id,
             tenant_id: tenant_id,
@@ -58,8 +56,6 @@ def find_by_id(user_id:, tenant_id:, id:)
       }
     end
 
-    class UpdatedEvent < Event; end
-
     def update(user_id:, tenant_id:, id:,
                first_name:, last_name:, email:)
       contact = nil
@@ -74,7 +70,7 @@ def update(user_id:, tenant_id:, id:,
           last_name: last_name,
           email: email)
 
-        event = UpdatedEvent
+        event = Models::Contact::UpdatedEvent
           .create!(
             user_id: user_id,
             tenant_id: tenant_id,
@@ -90,8 +86,6 @@ def update(user_id:, tenant_id:, id:,
       { id: contact.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class DeletedEvent < Event; end
-
     def delete(user_id:, tenant_id:, id:, time: ::Time)
       contact = nil
       event = nil
@@ -102,7 +96,7 @@ def delete(user_id:, tenant_id:, id:, time: ::Time)
 
         contact.update!(deleted_at: time.now.utc)
 
-        event = DeletedEvent
+        event = Models::Contact::DeletedEvent
           .create!(
             user_id: user_id,
             tenant_id: tenant_id,

app/domains/accountify/invoice.rb

@@ -9,8 +9,6 @@ module Status
       VOIDED = 'voided'
     end
 
-    class DraftedEvent < Event; end
-
     def draft(user_id:, tenant_id:,
               organisation_id:, contact_id:,
               currency_code:, due_date:, line_items:,
@@ -51,7 +49,7 @@ def draft(user_id:, tenant_id:,
             quantity: line_item[:quantity])
         end
 
-        event = DraftedEvent.create!(
+        event = Models::Invoice::DraftedEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           created_at: current_utc_time,
@@ -118,8 +116,6 @@ def find_by_id(user_id:, tenant_id:, id:)
       }
     end
 
-    class UpdatedEvent < Event; end
-
     def update(user_id:, tenant_id:, id:,
                organisation_id:, contact_id:,
                due_date:, line_items:,
@@ -162,7 +158,7 @@ def update(user_id:, tenant_id:, id:,
             quantity: line_item[:quantity])
         end
 
-        event = UpdatedEvent.create!(
+        event = Models::Invoice::UpdatedEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           created_at: current_utc_time,
@@ -191,8 +187,6 @@ def update(user_id:, tenant_id:, id:,
       { id: invoice.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class DeletedEvent < Event; end
-
     def delete(user_id:, tenant_id:, id:, time: ::Time)
       invoice = nil
       event = nil
@@ -204,7 +198,7 @@ def delete(user_id:, tenant_id:, id:, time: ::Time)
 
         invoice.update!(updated_at: current_utc_time, deleted_at: current_utc_time)
 
-        event = DeletedEvent.create!(
+        event = Models::Invoice::DeletedEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           created_at: current_utc_time,
@@ -219,8 +213,6 @@ def delete(user_id:, tenant_id:, id:, time: ::Time)
       { id: invoice.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class IssuedEvent < Event; end
-
     def issue(user_id:, tenant_id:, id:, time: ::Time)
       invoice = nil
       event = nil
@@ -235,7 +227,7 @@ def issue(user_id:, tenant_id:, id:, time: ::Time)
           issued_at: current_utc_time,
           updated_at: current_utc_time)
 
-        event = IssuedEvent.create!(
+        event = Models::Invoice::IssuedEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           created_at: current_utc_time,
@@ -251,8 +243,6 @@ def issue(user_id:, tenant_id:, id:, time: ::Time)
       { id: invoice.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class PaidEvent < Event; end
-
     def paid(user_id:, tenant_id:, id:, time: ::Time)
       invoice = nil
       event = nil
@@ -268,7 +258,7 @@ def paid(user_id:, tenant_id:, id:, time: ::Time)
 
         invoice.update!(status: Invoice::Status::PAID, paid_at: Time.current)
 
-        event = PaidEvent.create!(
+        event = Models::Invoice::PaidEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           eventable: invoice,
@@ -284,8 +274,6 @@ def paid(user_id:, tenant_id:, id:, time: ::Time)
       { id: invoice.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class VoidedEvent < Event; end
-
     def void(user_id:, tenant_id:, id:, time: ::Time)
       invoice = nil
       event = nil
@@ -295,7 +283,7 @@ def void(user_id:, tenant_id:, id:, time: ::Time)
 
         invoice.update!(status: Invoice::Status::VOIDED)
 
-        event = VoidedEvent.create!(
+        event = Models::Invoice::VoidedEvent.create!(
           user_id: user_id,
           tenant_id: tenant_id,
           eventable: invoice,

app/domains/accountify/models/contact/created_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Contact
+      class CreatedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/contact/deleted_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Contact
+      class DeletedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/contact/updated_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Contact
+      class UpdatedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/event.rb

@@ -0,0 +1,7 @@
+module Accountify
+  module Models
+    class Event < ::Models::Event
+
+    end
+  end
+end

app/domains/accountify/models/invoice.rb

@@ -7,8 +7,7 @@ class Invoice < ActiveRecord::Base
 
       has_many :line_items, -> { order(id: :asc) }
 
-      has_many :events, -> { order(created_at: :asc) },
-        as: :eventable
+      has_many :events, -> { order(created_at: :asc) }, as: :eventable
 
       has_one :invoice_status_summary
 

app/domains/accountify/models/invoice/deleted_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class DeletedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/invoice/drafted_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class DraftedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/invoice/issued_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class IssuedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/invoice/paid_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class PaidEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/invoice/updated_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class UpdatedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/invoice/voided_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Invoice
+      class VoidedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/organisation.rb

@@ -3,7 +3,7 @@ module Models
     class Organisation < ActiveRecord::Base
       self.table_name = 'accountify_organisations'
 
-      has_many :events, -> { order(created_at: :asc) }, as: :eventable
+      has_many :events, -> { order(created_at: :asc) }, as: :eventable, class_name: 'Models::Event'
 
       has_one :invoice_status_summary
     end

app/domains/accountify/models/organisation/created_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Organisation
+      class CreatedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/organisation/deleted_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Organisation
+      class DeletedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/models/organisation/updated_event.rb

@@ -0,0 +1,9 @@
+module Accountify
+  module Models
+    class Organisation
+      class UpdatedEvent < Models::Event
+
+      end
+    end
+  end
+end

app/domains/accountify/organisation.rb

@@ -2,8 +2,6 @@ module Accountify
   module Organisation
     extend self
 
-    class CreatedEvent < Event; end
-
     def create(user_id:, tenant_id:, name:)
       organisation = nil
       event = nil
@@ -13,7 +11,7 @@ def create(user_id:, tenant_id:, name:)
           .where(tenant_id: tenant_id)
           .create!(name: name)
 
-        event = CreatedEvent
+        event = Models::Organisation::CreatedEvent
           .where(user_id: user_id, tenant_id: tenant_id)
           .create!(
             eventable: organisation,
@@ -48,8 +46,6 @@ def find_by_id(user_id:, tenant_id:, id:)
       }
     end
 
-    class UpdatedEvent < Event; end
-
     def update(user_id:, tenant_id:, id:, name:)
       organisation = nil
       event = nil
@@ -60,7 +56,7 @@ def update(user_id:, tenant_id:, id:, name:)
 
         organisation.update!(name: name)
 
-        event = UpdatedEvent
+        event = Models::Organisation::UpdatedEvent
           .where(user_id: user_id, tenant_id: tenant_id)
           .create!(
             eventable: organisation,
@@ -73,8 +69,6 @@ def update(user_id:, tenant_id:, id:, name:)
       { id: organisation.id, events: [{ id: event.id, type: event.type }] }
     end
 
-    class DeletedEvent < Event; end
-
     def delete(user_id:, tenant_id:, id:, time: ::Time)
       organisation = nil
       event = nil
@@ -85,7 +79,7 @@ def delete(user_id:, tenant_id:, id:, time: ::Time)
 
         organisation.update!(deleted_at: time.now.utc)
 
-        event = DeletedEvent
+        event = Models::Organisation::DeletedEvent
           .where(user_id: user_id, tenant_id: tenant_id)
           .create!(
             eventable: organisation,

app/domains/models/event.rb

@@ -0,0 +1,21 @@
+module Models
+  class Event < ActiveRecord::Base
+    self.table_name = 'events'
+
+    # associations
+
+    belongs_to :eventable, polymorphic: true
+
+    # validations
+
+    validates :user_id, presence: true
+    validates :tenant_id, presence: true
+
+    validates :type, presence: true, length: { maximum: 255 }
+
+    validates :eventable_type, presence: true, length: { maximum: 255 },
+      if: -> { eventable_id.present? }
+
+    validates :eventable_id, presence: true, if: -> { eventable_type.present? }
+  end
+end