X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3666b674330ec8d14a224932a191d6121c5974e2..e3c919275818d46a515c183cf373d7a53bc6942a:/app/models/note_comment.rb?ds=sidebyside diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb index 9611cfe3a..d318c5e95 100644 --- a/app/models/note_comment.rb +++ b/app/models/note_comment.rb @@ -13,9 +13,10 @@ # # Indexes # -# index_note_comments_on_body (to_tsvector('english'::regconfig, body)) USING gin -# index_note_comments_on_created_at (created_at) -# note_comments_note_id_idx (note_id) +# index_note_comments_on_author_id_and_created_at (author_id,created_at) +# index_note_comments_on_body (to_tsvector('english'::regconfig, body)) USING gin +# index_note_comments_on_created_at (created_at) +# note_comments_note_id_idx (note_id) # # Foreign Keys # @@ -24,12 +25,12 @@ # class NoteComment < ApplicationRecord - belongs_to :note, :foreign_key => :note_id, :touch => true - belongs_to :author, :class_name => "User", :foreign_key => :author_id + belongs_to :note, :touch => true + belongs_to :author, :class_name => "User", :optional => true, :counter_cache => true validates :id, :uniqueness => true, :presence => { :on => :update }, :numericality => { :on => :update, :only_integer => true } - validates :note, :presence => true, :associated => true + validates :note, :associated => true validates :visible, :inclusion => [true, false] validates :author, :associated => true validates :event, :inclusion => %w[opened closed reopened commented hidden]