Removed author_{id, ip} methods from Note model

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 0b0597434f0fa5842f31862da19bdf9ec1711da6..376516e9b4e8841a0ef9f132102d41ec2fd04c36 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -2,14 +2,17 @@
 #
 # Table name: notes
 #
 #
 # 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
+#  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
+#  description :text             default(""), not null
+#  user_id     :bigint(8)
+#  user_ip     :inet

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -17,12 +20,18 @@
 #  notes_tile_status_idx  (tile,status)
 #  notes_updated_at_idx   (updated_at)
 #
 #  notes_tile_status_idx  (tile,status)
 #  notes_updated_at_idx   (updated_at)
 #

+# Foreign Keys
+#
+#  notes_user_id_fkey  (user_id => users.id)
+#

 
 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
   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note
 
 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
   has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note

+  has_many :subscriptions, :class_name => "NoteSubscription"
+  has_many :subscribers, :through => :subscriptions, :source => :user

 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }


@@ -80,14 +89,14 @@ class Note < ApplicationRecord
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 

-  # Return the author object, derived from the first comment
-  def author
-    comments.first.author
+  # Return the note's description, derived from the first comment
+  def description
+    comments.first.body

   end
 
   end
 

-  # Return the author IP address, derived from the first comment
-  def author_ip
-    comments.first.author_ip
+  # Return the note's author object, derived from the first comment
+  def author
+    comments.first.author

   end
 
   private
   end
 
   private