Made nearest method work with nil home lat/lon.

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 1ecc3f7102a616dbe39010b5b6b7bd646b8f9994..887dcb388ea7eced6506608adb356cff9c3f7b78 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,6 +4,7 @@ class User < ActiveRecord::Base
 
   has_many :traces
   has_many :diary_entries
+  has_many :messages, :foreign_key => :to_user_id
  
   validates_confirmation_of :pass_crypt, :message => 'Password must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
@@ -60,10 +61,31 @@ class User < ActiveRecord::Base
   
   def nearby(lat_range=1, lon_range=1)
      
-      nearby = User.find(:all,  :conditions => "#{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and  #{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and data_public = 1") 
+      if self.home_lon and self.home_lat 
+          nearby = User.find(:all,  :conditions => "#{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and  #{self.home_lon} > home_lon - #{lon_range} and #{self.home_lon} < home_lon + #{lon_range} and data_public = 1") 
+      else
+          nearby = []
+      end
       return nearby
   end
 
+  def self.has_messages?
+    if Message.fdhjklsafind_by_to_user_id(self.id) 
+      return true
+    else
+      return false
+    end
+  end
+
+  def get_new_messages
+    messages = Message.find(:all, :conditions => "message_read = 0")
+    return messages
+  end
+  
+  def get_all_messages
+    messages = Message.find(:all, :conditions => "message_read = 0")
+    return messages
+  end
 
   
 end