diff --git a/app/models/email_event.rb b/app/models/email_event.rb index bc853a3d..d4eae8e0 100644 --- a/app/models/email_event.rb +++ b/app/models/email_event.rb @@ -21,6 +21,7 @@ # index_email_events_on_account_id_and_event_datetime (account_id,event_datetime) # index_email_events_on_email (email) # index_email_events_on_emailable (emailable_type,emailable_id) +# index_email_events_on_event_type_and_email (event_type,email) WHERE ((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[])) # index_email_events_on_message_id (message_id) # # Foreign Keys diff --git a/app/models/submission.rb b/app/models/submission.rb index 31547d87..b5b59479 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -23,10 +23,11 @@ # # Indexes # -# index_submissions_on_account_id_and_id (account_id,id) -# index_submissions_on_created_by_user_id (created_by_user_id) -# index_submissions_on_slug (slug) UNIQUE -# index_submissions_on_template_id (template_id) +# index_submissions_on_account_id_and_id (account_id,id) +# index_submissions_on_account_id_and_template_id_and_id (account_id,template_id,id) WHERE (archived_at IS NULL) +# index_submissions_on_created_by_user_id (created_by_user_id) +# index_submissions_on_slug (slug) UNIQUE +# index_submissions_on_template_id (template_id) # # Foreign Keys # diff --git a/app/models/template.rb b/app/models/template.rb index dbfadb79..f37e83bc 100644 --- a/app/models/template.rb +++ b/app/models/template.rb @@ -23,11 +23,12 @@ # # Indexes # -# index_templates_on_account_id (account_id) -# index_templates_on_author_id (author_id) -# index_templates_on_external_id (external_id) -# index_templates_on_folder_id (folder_id) -# index_templates_on_slug (slug) UNIQUE +# index_templates_on_account_id (account_id) +# index_templates_on_account_id_and_folder_id_and_id (account_id,folder_id,id) WHERE (archived_at IS NULL) +# index_templates_on_author_id (author_id) +# index_templates_on_external_id (external_id) +# index_templates_on_folder_id (folder_id) +# index_templates_on_slug (slug) UNIQUE # # Foreign Keys # diff --git a/db/migrate/20250617072547_add_email_events_event_type_index.rb b/db/migrate/20250617072547_add_email_events_event_type_index.rb new file mode 100644 index 00000000..935d377b --- /dev/null +++ b/db/migrate/20250617072547_add_email_events_event_type_index.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class AddEmailEventsEventTypeIndex < ActiveRecord::Migration[8.0] + def change + add_index :email_events, %i[event_type email], + where: "event_type IN ('bounce', 'soft_bounce', 'complaint', 'soft_complaint')" + end +end diff --git a/db/migrate/20250617074820_add_templates_folder_index.rb b/db/migrate/20250617074820_add_templates_folder_index.rb new file mode 100644 index 00000000..dd8e2daa --- /dev/null +++ b/db/migrate/20250617074820_add_templates_folder_index.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddTemplatesFolderIndex < ActiveRecord::Migration[8.0] + def change + add_index :templates, %i[account_id folder_id id], where: 'archived_at IS NULL' + end +end diff --git a/db/migrate/20250617075609_add_submissions_template_index.rb b/db/migrate/20250617075609_add_submissions_template_index.rb new file mode 100644 index 00000000..9004818c --- /dev/null +++ b/db/migrate/20250617075609_add_submissions_template_index.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddSubmissionsTemplateIndex < ActiveRecord::Migration[8.0] + def change + add_index :submissions, %i[account_id template_id id], where: 'archived_at IS NULL' + end +end diff --git a/db/schema.rb b/db/schema.rb index c9e47280..7d2eae1e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_06_15_091654) do +ActiveRecord::Schema[8.0].define(version: 2025_06_17_075609) do # These are extensions that must be enabled in order to support this database enable_extension "btree_gin" enable_extension "plpgsql" @@ -178,6 +178,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_15_091654) do t.index ["account_id", "event_datetime"], name: "index_email_events_on_account_id_and_event_datetime" t.index ["email"], name: "index_email_events_on_email" t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable" + t.index ["event_type", "email"], name: "index_email_events_on_event_type_and_email", where: "((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[]))" t.index ["message_id"], name: "index_email_events_on_message_id" end @@ -304,6 +305,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_15_091654) do t.datetime "expire_at" t.text "name" t.index ["account_id", "id"], name: "index_submissions_on_account_id_and_id" + t.index ["account_id", "template_id", "id"], name: "index_submissions_on_account_id_and_template_id_and_id", where: "(archived_at IS NULL)" t.index ["created_by_user_id"], name: "index_submissions_on_created_by_user_id" t.index ["slug"], name: "index_submissions_on_slug", unique: true t.index ["template_id"], name: "index_submissions_on_template_id" @@ -383,6 +385,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_15_091654) do t.string "external_id" t.text "preferences", null: false t.boolean "shared_link", default: false, null: false + t.index ["account_id", "folder_id", "id"], name: "index_templates_on_account_id_and_folder_id_and_id", where: "(archived_at IS NULL)" t.index ["account_id"], name: "index_templates_on_account_id" t.index ["author_id"], name: "index_templates_on_author_id" t.index ["external_id"], name: "index_templates_on_external_id"