X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..da187ad5686e3a6422538de2c8e059b484b372f6:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index c32b1679b..ec57b770b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -1,20 +1,38 @@ -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, :class_name => "NoteComment", - :foreign_key => :note_id, - :order => :created_at, - :conditions => { :visible => true } + has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).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 => ["open", "closed", "hidden"] validate :validate_position - attr_accessible :lat, :lon + scope :visible, -> { where.not(:status => "hidden") } + scope :invisible, -> { where(:status => "hidden") } after_initialize :set_defaults @@ -27,55 +45,40 @@ class Note < ActiveRecord::Base def close self.status = "closed" self.closed_at = Time.now.getutc - self.save + save end - # Return a flattened version of the comments for a note - def flatten_comment(separator_char, upto_timestamp = :nil) - resp = "" - comment_no = 1 - self.comments.each do |comment| - next if upto_timestamp != :nil and comment.created_at > upto_timestamp - resp += (comment_no == 1 ? "" : separator_char) - resp += comment.body if comment.body - resp += " [ " - resp += comment.author_name if comment.author_name - resp += " " + comment.created_at.to_s + " ]" - comment_no += 1 - end - - return resp + # Reopen a note + def reopen + self.status = "open" + self.closed_at = nil + save end # Check if a note is visible def visible? - return status != "hidden" + status != "hidden" + end + + # Check if a note is closed + def closed? + !closed_at.nil? 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 - end - - # Return the author id, derived from the first comment - def author_id - self.comments.first.author_id - end - - # Return the author name, derived from the first comment - def author_name - self.comments.first.author_name + 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