Fix bug: Leaving / Joining Teams

seuros · seuros · commit 88ca94a6da75 · 2015-01-16T17:21:11.000Z
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
@@ -1,15 +1,15 @@
 class MembersController < ApplicationController
+  before_action :set_team
 
   def destroy
-    @user = User.find(params[:id])
-    return head(:forbidden) unless signed_in? && (team.admin?(current_user) || current_user == @user)
-    team.remove_member(@user)
-    record_event("removed team") if !Team.where(id: team.id.to_s).exists?
+    self_removal = current_user.id == params[:id]
+    return head(:forbidden) unless signed_in? && (team.admin?(current_user) || self_removal)
+    team.members.find_by_user_id!(params[:id]).destroy
 
-    if @user == current_user
-      flash[:notice] = "Ok, we've removed you from #{team.name}."
+    if self_removal
+      flash[:notice] = "Ok, You have left : #{team.name}."
       record_event("removed themselves from team")
-      return redirect_to(teams_url)
+      redirect_to(teams_url)
     else
       record_event("removed user from team")
       respond_to do |format|
@@ -21,14 +21,7 @@ def destroy
 
   private
 
-  def team
-    @team ||= Team.find(params[:team_id])
-  end
-
-  def is_email_address?(value)
-    m = Mail::Address.new(value)
-    r = m.domain && m.address == value
-    t = m.__send__(:tree)
-    r &&= (t.domain.dot_atom_text.elements.size > 1)
+  def set_team
+    @team = Team.find(params[:team_id])
   end
 end
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
@@ -176,7 +176,7 @@ def accept
 
     @team = Team.find(accept_params[:id])
     if accept_params[:r] && @team.has_user_with_referral_token?(accept_params[:r])
-      @team.add_member(current_user)
+      @team.add_member(current_user, 'active')
       current_user.update_attribute(:referred_by, accept_params[:r]) if current_user.referred_by.nil?
       flash[:notice] = "Welcome to team #{@team.name}"
       record_event("accepted team invite")
@@ -284,7 +284,6 @@ def page_based_on_rank(rank)
   end
 
   def job_public_ids
-    Opportunity
     Rails.cache.fetch('all-jobs-public-ids', :expires_in => 1.hour) { Opportunity.group('team_id, created_at, public_id').pluck(:public_id) }
   end
 
diff --git a/app/models/team.rb b/app/models/team.rb
@@ -471,22 +471,15 @@ def sorted_members
     @sorted_members = members.order('score_cache DESC')
   end
 
-  def add_member(user)
-    Rails.logger.warn("Called #{self.class.name}#add_member(#{user.inspect}")
-
-    member = members.select { |m| m.user_id == user.id }.first
-    return member if member
-
+  def add_member(user, state='pending')
     member = members.create(user_id: user.id)
-    save!
+    member.update_attribute(:state, state)
     member
   end
   alias_method :add_user, :add_member
 
   def remove_member(user)
-    return nil unless member = members.select { |m| m.user_id == user.id }
-    members.destroy(member)
-    save!
+    members.destroy_all(user_id: user.id)
   end
 
   attr_accessor :skip_validations
