From ccdad1c81ae0f36c8be289e4b35348e2e59b5b33 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 14 Jan 2014 14:06:43 -0600
Subject: [PATCH] vrfs1008:  fixed failing test

---
 .../controllers/api_invitations_controller.rb | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/web/app/controllers/api_invitations_controller.rb b/web/app/controllers/api_invitations_controller.rb
index ac487c8a9..58a3965e6 100644
--- a/web/app/controllers/api_invitations_controller.rb
+++ b/web/app/controllers/api_invitations_controller.rb
@@ -37,34 +37,26 @@ class ApiInvitationsController < ApiController
     sender = current_user
     join_request = JoinRequest.find(params[:join_request]) unless params[:join_request].nil?
 
-    @invitation = Invitation.limit(1)
-      .where(:receiver_id => params[:receiver], 
-             :sender_id => current_user.id, 
-             :music_session_id => params[:music_session])
-      .first
-    if @invitation
+    @invitation = Invitation.new
+    @invitation.music_session = music_session
+    @invitation.sender = sender
+    @invitation.receiver = receiver
+    @invitation.join_request = join_request
+    @invitation.save
+
+    unless @invitation.errors.any?
+      User.save_session_settings(current_user, music_session)
+
+      # send notification
+      Notification.send_session_invitation(receiver, current_user, music_session.id)
       respond_with @invitation, :responder => ApiResponder, :location => api_invitation_detail_url(@invitation)
+
     else
-      @invitation = Invitation.new
-      @invitation.music_session = music_session
-      @invitation.sender = sender
-      @invitation.receiver = receiver
-      @invitation.join_request = join_request
-      @invitation.save
-
-      unless @invitation.errors.any?
-        User.save_session_settings(current_user, music_session)
-
-        # send notification
-        Notification.send_session_invitation(receiver, current_user, music_session.id)
-        respond_with @invitation, :responder => ApiResponder, :location => api_invitation_detail_url(@invitation)
-
-      else
-        # we have to do this because api_invitation_detail_url will fail with a bad @invitation
-        response.status = :unprocessable_entity
-        respond_with @invitation
-      end
+      # we have to do this because api_invitation_detail_url will fail with a bad @invitation
+      response.status = :unprocessable_entity
+      respond_with @invitation
     end
+
   end
 
   def show