X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..2168ad210840bf3d0df0b80dfceae92a26e6c970:/app/models/note.rb?ds=sidebyside diff --git a/app/models/note.rb b/app/models/note.rb index f70e4f3bf..ea88599a4 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -1,18 +1,39 @@ -class Note < ActiveRecord::Base +# == Schema Information +# +# Table name: notes +# +# id :bigint(8) not null, primary key +# latitude :integer not null +# longitude :integer not null +# tile :bigint(8) not null +# updated_at :datetime not null +# created_at :datetime not null +# status :enum not null +# closed_at :datetime +# +# Indexes +# +# notes_created_at_idx (created_at) +# notes_tile_status_idx (tile,status) +# notes_updated_at_idx (updated_at) +# + +class Note < ApplicationRecord include GeoRecord - has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id + has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id + has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id + + validates :id, :uniqueness => true, :presence => { :on => :update }, + :numericality => { :on => :update, :only_integer => true } + validates :latitude, :longitude, :numericality => { :only_integer => true } + validates :closed_at, :presence => true, :if => proc { :status == "closed" } + validates :status, :inclusion => %w[open closed hidden] - validates_presence_of :id, :on => :update - validates_uniqueness_of :id - validates_numericality_of :latitude, :only_integer => true - validates_numericality_of :longitude, :only_integer => true - validates_presence_of :closed_at if :status == "closed" - validates_inclusion_of :status, :in => %w(open closed hidden) validate :validate_position - scope :visible, -> { where("status != 'hidden'") } - scope :invisible, -> { where("status = 'hidden'") } + scope :visible, -> { where.not(:status => "hidden") } + scope :invisible, -> { where(:status => "hidden") } after_initialize :set_defaults @@ -59,6 +80,6 @@ class Note < ActiveRecord::Base # Fill in default values for new notes def set_defaults - self.status = "open" unless self.attribute_present?(:status) + self.status = "open" unless attribute_present?(:status) end end