Merge remote-tracking branch 'upstream/pull/5178'

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index d96addbe789f3d7f62314c0d68a12e5228fae97d..0b0597434f0fa5842f31862da19bdf9ec1711da6 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -2,10 +2,10 @@
 #
 # Table name: notes
 #
 #
 # Table name: notes
 #

-#  id         :integer          not null, primary key
+#  id         :bigint(8)        not null, primary key

 #  latitude   :integer          not null
 #  longitude  :integer          not null
 #  latitude   :integer          not null
 #  longitude  :integer          not null

-#  tile       :integer          not null
+#  tile       :bigint(8)        not null

 #  updated_at :datetime         not null
 #  created_at :datetime         not null
 #  status     :enum             not null
 #  updated_at :datetime         not null
 #  created_at :datetime         not null
 #  status     :enum             not null


@@ -18,13 +18,14 @@
 #  notes_updated_at_idx   (updated_at)
 #
 
 #  notes_updated_at_idx   (updated_at)
 #
 

-class Note < ActiveRecord::Base
+class Note < ApplicationRecord

   include GeoRecord
 
   has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
   include GeoRecord
 
   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 },
 
   validates :id, :uniqueness => true, :presence => { :on => :update },

-                 :numericality => { :on => :update, :integer_only => true }
+                 :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 :latitude, :longitude, :numericality => { :only_integer => true }
   validates :closed_at, :presence => true, :if => proc { :status == "closed" }
   validates :status, :inclusion => %w[open closed hidden]


@@ -36,6 +37,8 @@ class Note < ActiveRecord::Base
 
   after_initialize :set_defaults
 
 
   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?
   # 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?


@@ -44,7 +47,7 @@ class Note < ActiveRecord::Base
   # Close a note
   def close
     self.status = "closed"
   # Close a note
   def close
     self.status = "closed"

-    self.closed_at = Time.now.getutc
+    self.closed_at = Time.now.utc

     save
   end
 
     save
   end
 


@@ -65,6 +68,18 @@ class Note < ActiveRecord::Base
     !closed_at.nil?
   end
 
     !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
     comments.first.author
   # Return the author object, derived from the first comment
   def author
     comments.first.author