diff --git a/app/models/ahoy/event.rb b/app/models/ahoy/event.rb deleted file mode 100644 index ec7e9c57e..000000000 --- a/app/models/ahoy/event.rb +++ /dev/null @@ -1,8 +0,0 @@ -module Ahoy - class Event < ApplicationRecord - self.table_name = "ahoy_events" - - belongs_to :visit - belongs_to :user - end -end diff --git a/app/models/visit.rb b/app/models/visit.rb index f34d979a1..d7d6659f9 100644 --- a/app/models/visit.rb +++ b/app/models/visit.rb @@ -1,5 +1,4 @@ class Visit < ApplicationRecord alias_attribute :created_at, :started_at - has_many :ahoy_events, class_name: "Ahoy::Event" belongs_to :user end diff --git a/config/initializers/ahoy.rb b/config/initializers/ahoy.rb index 3879d14b0..7184935bc 100644 --- a/config/initializers/ahoy.rb +++ b/config/initializers/ahoy.rb @@ -13,12 +13,6 @@ class Ahoy::Store < Ahoy::DatabaseStore super(data) end - def track_event(data) - data[:id] = ensure_uuid(data.delete(:event_id)) - data[:ip] = request.ip - super(data) - end - def visit unless defined?(@visit) if ahoy.send(:existing_visit_token) || ahoy.instance_variable_get(:@visit_token) diff --git a/db/migrate/20240425224146_drop_ahoy_events.rb b/db/migrate/20240425224146_drop_ahoy_events.rb new file mode 100644 index 000000000..70b003b4c --- /dev/null +++ b/db/migrate/20240425224146_drop_ahoy_events.rb @@ -0,0 +1,17 @@ +class DropAhoyEvents < ActiveRecord::Migration[7.0] + def change + drop_table :ahoy_events, id: :uuid, default: nil do |t| + t.uuid :visit_id + t.integer :user_id + t.string :name + t.jsonb :properties + t.datetime :time, precision: nil + t.string :ip + + t.index [:name, :time] + t.index [:time] + t.index [:user_id] + t.index [:visit_id] + end + end +end diff --git a/db/schema.rb b/db/schema.rb index efea7abc8..c30aad673 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -96,19 +96,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_10_26_112901) do t.index ["user_id"], name: "index_administrators_on_user_id" end - create_table "ahoy_events", id: :uuid, default: nil, force: :cascade do |t| - t.uuid "visit_id" - t.integer "user_id" - t.string "name" - t.jsonb "properties" - t.datetime "time", precision: nil - t.string "ip" - t.index ["name", "time"], name: "index_ahoy_events_on_name_and_time" - t.index ["time"], name: "index_ahoy_events_on_time" - t.index ["user_id"], name: "index_ahoy_events_on_user_id" - t.index ["visit_id"], name: "index_ahoy_events_on_visit_id" - end - create_table "audits", id: :serial, force: :cascade do |t| t.integer "auditable_id" t.string "auditable_type"