From 3305d707b80733e7ce9b7433a85960a1e4016dd7 Mon Sep 17 00:00:00 2001 From: NeoSkosana Date: Thu, 15 Jan 2026 21:15:34 +0200 Subject: [PATCH] Update schema comments after running Story 1.1 migration --- app/models/account_access.rb | 16 +++++++--------- app/models/email_event.rb | 2 +- app/models/lock_event.rb | 2 +- app/models/submission_event.rb | 2 +- app/models/template.rb | 6 ++++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/account_access.rb b/app/models/account_access.rb index a292e665..30cc5078 100644 --- a/app/models/account_access.rb +++ b/app/models/account_access.rb @@ -4,24 +4,22 @@ # # Table name: account_accesses # -# id :bigint not null, primary key -# created_at :datetime not null -# updated_at :datetime not null -# account_id :bigint not null -# user_id :bigint not null -# institution_id :bigint not null -# role :string not null, default: 'member' +# id :bigint not null, primary key +# role :string(255) default("member"), not null +# created_at :datetime not null +# updated_at :datetime not null +# account_id :bigint not null +# institution_id :bigint +# user_id :bigint not null # # Indexes # # index_account_accesses_on_account_id_and_user_id (account_id,user_id) UNIQUE -# index_account_accesses_on_user_id_and_institution_id (user_id,institution_id) UNIQUE # index_account_accesses_on_role (role) # # Foreign Keys # # fk_rails_... (account_id => accounts.id) -# fk_account_accesses_to_institutions (institution_id => institutions.id) # class AccountAccess < ApplicationRecord belongs_to :account diff --git a/app/models/email_event.rb b/app/models/email_event.rb index 021d18f3..8683a444 100644 --- a/app/models/email_event.rb +++ b/app/models/email_event.rb @@ -20,7 +20,7 @@ # # index_email_events_on_account_id_and_event_datetime (account_id,event_datetime) # index_email_events_on_email (email) -# index_email_events_on_email_event_types (email) WHERE ((event_type)::text = ANY (ARRAY[('bounce'::character varying)::text, ('soft_bounce'::character varying)::text, ('permanent_bounce'::character varying)::text, ('complaint'::character varying)::text, ('soft_complaint'::character varying)::text])) +# index_email_events_on_email_event_types (email) WHERE ((event_type)::text = ANY ((ARRAY['bounce'::character varying, 'soft_bounce'::character varying, 'permanent_bounce'::character varying, 'complaint'::character varying, 'soft_complaint'::character varying])::text[])) # index_email_events_on_emailable (emailable_type,emailable_id) # index_email_events_on_message_id (message_id) # diff --git a/app/models/lock_event.rb b/app/models/lock_event.rb index cbc81cc4..5b63b034 100644 --- a/app/models/lock_event.rb +++ b/app/models/lock_event.rb @@ -12,7 +12,7 @@ # # Indexes # -# index_lock_events_on_event_name_and_key (event_name,key) UNIQUE WHERE ((event_name)::text = ANY (ARRAY[('start'::character varying)::text, ('complete'::character varying)::text])) +# index_lock_events_on_event_name_and_key (event_name,key) UNIQUE WHERE ((event_name)::text = ANY ((ARRAY['start'::character varying, 'complete'::character varying])::text[])) # index_lock_events_on_key (key) # class LockEvent < ApplicationRecord diff --git a/app/models/submission_event.rb b/app/models/submission_event.rb index 8aece806..c5746204 100644 --- a/app/models/submission_event.rb +++ b/app/models/submission_event.rb @@ -20,7 +20,7 @@ # index_submission_events_on_created_at (created_at) # index_submission_events_on_submission_id (submission_id) # index_submission_events_on_submitter_id (submitter_id) -# index_submissions_events_on_sms_event_types (account_id,created_at) WHERE ((event_type)::text = ANY (ARRAY[('send_sms'::character varying)::text, ('send_2fa_sms'::character varying)::text])) +# index_submissions_events_on_sms_event_types (account_id,created_at) WHERE ((event_type)::text = ANY ((ARRAY['send_sms'::character varying, 'send_2fa_sms'::character varying])::text[])) # # Foreign Keys # diff --git a/app/models/template.rb b/app/models/template.rb index c21e7a42..402d03b9 100644 --- a/app/models/template.rb +++ b/app/models/template.rb @@ -64,8 +64,10 @@ class Template < ApplicationRecord has_many_attached :documents - has_many :schema_documents, ->(e) { where(uuid: e.schema.pluck('attachment_uuid')) }, - class_name: 'ActiveStorage::Attachment', dependent: :destroy, as: :record, inverse_of: :record + has_many :schema_documents, ->(e) { + uuids = Array(e.schema).filter_map { |s| s['attachment_uuid'] if s.is_a?(Hash) } + where(uuid: uuids) + }, class_name: 'ActiveStorage::Attachment', dependent: :destroy, as: :record, inverse_of: :record has_many :submissions, dependent: :destroy has_many :template_sharings, dependent: :destroy