VRFS-2216 fix issue with sms_index function

db/manifest

@@ -210,3 +210,4 @@ new_genres.sql
 get_work_faster.sql
 fix_find_session_sorting_2216.sql
 multiple_gateways.sql
+fix_find_session_sorting_2216a.sql

db/up/fix_find_session_sorting_2216a.sql

@@ -0,0 +1,81 @@
+-- check that the music_sessions does not currently have an active_music_sessions
+CREATE OR REPLACE FUNCTION sms_index (my_user_id VARCHAR, my_locidispid BIGINT, my_audio_latency INTEGER, session_id VARCHAR) RETURNS VOID STRICT VOLATILE AS $$
+  BEGIN
+    -- output table to hold tagged music sessions with latency
+    CREATE TEMPORARY TABLE sms_music_session_tmp (music_session_id VARCHAR(64) NOT NULL, tag INTEGER, latency INTEGER) ON COMMIT DROP;
+
+    IF session_id = 'any' THEN
+      -- populate sms_music_session_tmp as all music sessions
+      -- XXX: we should pass in enough info to match pagination/query to reduce the impact of this step
+      INSERT INTO sms_music_session_tmp SELECT DISTINCT id, NULL::INTEGER AS tag, NULL::INTEGER AS latency
+        FROM music_sessions
+        WHERE  (scheduled_start IS NULL OR scheduled_start > (NOW() - (interval '15 minute')))
+        AND canceled = FALSE
+        AND id NOT IN (SELECT id FROM active_music_sessions);
+
+      -- tag accepted rsvp as 1
+      UPDATE sms_music_session_tmp q SET tag = 1 FROM rsvp_slots s, rsvp_requests_rsvp_slots rrs, rsvp_requests r WHERE
+        q.music_session_id = s.music_session_id AND
+        s.id = rrs.rsvp_slot_id AND
+        rrs.rsvp_request_id = r.id AND
+        r.user_id = my_user_id AND
+        rrs.chosen = TRUE AND
+        q.tag is NULL;
+
+      -- tag invitation as 2
+      UPDATE sms_music_session_tmp q SET tag = 2 FROM invitations i WHERE
+        q.music_session_id = i.music_session_id AND
+        i.receiver_id = my_user_id AND
+        q.tag IS NULL;
+
+      -- musician access as 3
+      UPDATE sms_music_session_tmp q SET tag = 3 FROM music_sessions m WHERE
+        q.music_session_id = m.id AND
+        m.open_rsvps = TRUE AND
+        q.tag IS NULL;
+
+      -- delete anything not tagged
+      DELETE FROM sms_music_session_tmp WHERE tag IS NULL;
+
+    ELSE
+      INSERT INTO sms_music_session_tmp SELECT DISTINCT id, NULL::INTEGER AS tag, NULL::INTEGER AS latency
+        FROM music_sessions
+        WHERE  music_sessions.id = session_id;
+    END IF;
+
+    -- output table to hold users involved in the sms_music_session_tmp sessions and their latency
+    CREATE TEMPORARY TABLE sms_users_tmp (music_session_id VARCHAR(64), user_id VARCHAR(64) NOT NULL, full_score INTEGER, audio_latency INTEGER, internet_score INTEGER) ON COMMIT DROP;
+
+    IF my_audio_latency > -1 THEN
+      -- populate sms_users_tmp with users that have an approved RSVP for sessions in the sms_music_session_tmp table, accompanied with full latency and music session
+      INSERT INTO sms_users_tmp SELECT DISTINCT q.music_session_id, users.id, s.full_score AS full_score, s.a_audio_latency, s.score
+      FROM sms_music_session_tmp q
+      INNER JOIN rsvp_slots               ON rsvp_slots.music_session_id = q.music_session_id
+      INNER JOIN rsvp_requests_rsvp_slots ON rsvp_requests_rsvp_slots.rsvp_slot_id = rsvp_slots.id
+      INNER JOIN rsvp_requests            ON rsvp_requests.id = rsvp_requests_rsvp_slots.rsvp_request_id
+      INNER JOIN users                    ON rsvp_requests.user_id = users.id
+      LEFT OUTER JOIN current_scores s    ON s.a_userid = users.id
+      WHERE
+        s.b_userid = my_user_id AND
+        rsvp_requests_rsvp_slots.chosen = TRUE AND
+        rsvp_requests.canceled != TRUE;
+
+      -- populate sms_users_tmp with invited users for session in the sms_music_session_tmp table, accompanied with full latency and music session
+      -- specify NULL for music_session_id, because we don't want RSVP users to affect the AVG computed for each session later
+      -- INSERT INTO sms_users_tmp SELECT NULL, users.id, s.full_score AS full_score, s.a_audio_latency, s.score
+      -- FROM sms_music_session_tmp q
+      -- INNER JOIN invitations              ON invitations.music_session_id = q.music_session_id
+      -- INNER JOIN users                    ON invitations.receiver_id = users.id
+      -- LEFT OUTER JOIN current_scores s    ON s.a_userid = users.id
+      -- WHERE
+      --   s.b_userid = my_user_id AND
+      --   users.id NOT IN (SELECT user_id FROM sms_users_tmp);
+    END IF;
+
+    -- calculate the average latency
+    UPDATE sms_music_session_tmp q SET latency = (select AVG(u.full_score) FROM sms_users_tmp u WHERE
+      q.music_session_id = u.music_session_id);
+
+    RETURN;
+  END;
+$$ LANGUAGE plpgsql;

ruby/spec/jam_ruby/models/music_session_spec.rb

@@ -536,9 +536,8 @@ describe MusicSession do
         music_sessions.length.should == 1
         music_sessions[0].tag.should == 3 # open session sort
         music_sessions[0].latency.should == (network_score + searcher.last_jam_audio_latency + creator.last_jam_audio_latency )
-        user_scores.length.should == 2 # the creator, and the invitee
+        user_scores.length.should == 1 # the creator (invitees are not included)
         user_scores[creator.id][:full_score].should == (network_score + searcher.last_jam_audio_latency + creator.last_jam_audio_latency )
-        user_scores[invitee.id][:full_score].should == ((network_score + searcher.last_jam_audio_latency + invitee.last_jam_audio_latency )).ceil
 
         #search with the invitee this time.
         invitee_conn = FactoryGirl.create(:connection, user: invitee, ip_address: '3.3.3.3', locidispid: invitee.last_jam_locidispid)

web/spec/features/find_sessions_spec.rb

@@ -68,7 +68,6 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
         end
 
         it "shows latency information correctly" do
-          pending
           # this will try to show all 6  latency badges.  unknown, good, fair, poor, unacceptable, and me
           verify_find_session_score(nil,   '#sessions-active', user, session1_creator)
           verify_find_session_score(3,     '#sessions-active', user, session1_creator)