From cccae35a979e7563040bf5f90951d9fdaa3eaffa Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sat, 13 Oct 2012 22:18:20 -0400 Subject: [PATCH] friend API development --- lib/jam_ruby/models/friend_request.rb | 10 ++++++++++ lib/jam_ruby/models/user.rb | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lib/jam_ruby/models/friend_request.rb diff --git a/lib/jam_ruby/models/friend_request.rb b/lib/jam_ruby/models/friend_request.rb new file mode 100644 index 000000000..3a62556f1 --- /dev/null +++ b/lib/jam_ruby/models/friend_request.rb @@ -0,0 +1,10 @@ +module JamRuby + class FriendRequest < ActiveRecord::Base + + self.primary_key = 'id' + + belongs_to :user + belongs_to :friend, :class_name => "JamRuby::User" + + end +end \ No newline at end of file diff --git a/lib/jam_ruby/models/user.rb b/lib/jam_ruby/models/user.rb index b9eca6713..d0fb588b6 100644 --- a/lib/jam_ruby/models/user.rb +++ b/lib/jam_ruby/models/user.rb @@ -2,7 +2,7 @@ module JamRuby class User < ActiveRecord::Base attr_accessible :name, :email, :password, :password_confirmation - attr_accessor :updating_password + attr_accessor :updating_password, :online self.primary_key = 'id' @@ -11,6 +11,8 @@ module JamRuby has_many :connections, :class_name => "JamRuby::Connection" + has_many :friend_requests, :class_name => "JamRuby::FriendRequest" + has_many :friendships has_many :friends, :through => :friendships has_many :inverse_friendships, :class_name => "JamRuby::Friendship", :foreign_key => "friend_id" @@ -35,6 +37,11 @@ module JamRuby #validates :password_confirmation, presence: true validates_confirmation_of :password, :if => :should_validate_password? + def online + @online = !self.connections.nil? && self.connections.size > 0 + return @online + end + def should_validate_password? updating_password || new_record? end