From 10e66006c839c3234d82e063113327f06e87f62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2024 00:41:26 +0200 Subject: [PATCH 1/2] Remove the campaigns table We stopped using the Campaign model in commit 448775a5e. --- db/migrate/20240425223908_drop_campaigns.rb | 10 ++++++++++ db/schema.rb | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20240425223908_drop_campaigns.rb diff --git a/db/migrate/20240425223908_drop_campaigns.rb b/db/migrate/20240425223908_drop_campaigns.rb new file mode 100644 index 000000000..60d1bbb48 --- /dev/null +++ b/db/migrate/20240425223908_drop_campaigns.rb @@ -0,0 +1,10 @@ +class DropCampaigns < ActiveRecord::Migration[7.0] + def change + drop_table :campaigns, id: :serial do |t| + t.string :name + t.string :track_id + t.datetime :created_at, precision: nil, null: false + t.datetime :updated_at, precision: nil, null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2ddb1065a..efea7abc8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -405,13 +405,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_10_26_112901) do t.boolean "hide_money", default: false end - create_table "campaigns", id: :serial, force: :cascade do |t| - t.string "name" - t.string "track_id" - t.datetime "created_at", precision: nil, null: false - t.datetime "updated_at", precision: nil, null: false - end - create_table "ckeditor_assets", id: :serial, force: :cascade do |t| t.string "data_file_name", null: false t.string "data_content_type" From 6ab51b03670c855ebffc7b17be556fdd72a8dac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2024 00:46:59 +0200 Subject: [PATCH 2/2] Remove the ahoy_events table We stopped using ahoy events in commit f7e2d724d. --- app/models/ahoy/event.rb | 8 -------- app/models/visit.rb | 1 - config/initializers/ahoy.rb | 6 ------ db/migrate/20240425224146_drop_ahoy_events.rb | 17 +++++++++++++++++ db/schema.rb | 13 ------------- 5 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 app/models/ahoy/event.rb create mode 100644 db/migrate/20240425224146_drop_ahoy_events.rb 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"