X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eaefb3ea7308112e11b03f8748cf6581c30436a5..fb6042e35c10da70c030b5544a14c38577f0413c:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index 27357e58a..0b0597434 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -1,21 +1,44 @@ -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, :inverse_of => :note + + 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 => ["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 + DEFAULT_FRESHLY_CLOSED_LIMIT = 7.days + # Sanity check the latitude and longitude and add an error if it's broken def validate_position errors.add(:base, "Note is not in the world") unless in_world? @@ -24,15 +47,15 @@ class Note < ActiveRecord::Base # Close a note def close self.status = "closed" - self.closed_at = Time.now.getutc - self.save + self.closed_at = Time.now.utc + save end # Reopen a note def reopen self.status = "open" self.closed_at = nil - self.save + save end # Check if a note is visible @@ -42,23 +65,35 @@ class Note < ActiveRecord::Base # Check if a note is closed def closed? - not closed_at.nil? + !closed_at.nil? + end + + def freshly_closed? + return false unless closed? + + Time.now.utc < freshly_closed_until + end + + def freshly_closed_until + return nil unless closed? + + closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT end # Return the author object, derived from the first comment def author - self.comments.first.author + comments.first.author end # Return the author IP address, derived from the first comment def author_ip - self.comments.first.author_ip + comments.first.author_ip end -private + private # 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