seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page

This commit is contained in:
Seth Call 2014-07-23 15:11:02 -05:00
parent ce3ae06053
commit cc6f3fe974
15 changed files with 204 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/manifest
View File

@ -192,4 +192,6 @@ fix_sms_query_cancel_flag2.sql
next_session_scheduled_default.sql
migrate_old_sessions.sql
max_mind_releases.sql
score_histories.sql
score_histories.sql
update_sms_index.sql
connection_allow_null_locidispid.sql

1
db/up/connection_allow_null_locidispid.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE connections ALTER COLUMN locidispid DROP NOT NULL;

73
db/up/update_sms_index.sql Normal file
View File

@ -0,0 +1,73 @@
-- 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) 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;
-- 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;
-- 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, latency 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 q.music_session_id, users.id, (s.score+my_audio_latency+users.last_jam_audio_latency)/2 AS latency
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.alocidispid = users.last_jam_locidispid
WHERE
s.blocidispid = my_locidispid AND
rsvp_requests_rsvp_slots.chosen = 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.score+my_audio_latency+users.last_jam_audio_latency)/2 AS latency
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.alocidispid = users.last_jam_locidispid
WHERE
s.blocidispid = my_locidispid 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.latency) FROM sms_users_tmp u WHERE
q.music_session_id = u.music_session_id);
RETURN;
END;
$$ LANGUAGE plpgsql;

3
ruby/lib/jam_ruby/models/active_music_session.rb
View File

@ -325,8 +325,9 @@ module JamRuby
my_locidispid = connection.locidispid
# 13 is an average audio gear value we use if they have not qualified any gear
my_audio_latency = connection.last_jam_audio_latency || current_user.last_jam_audio_latency || 13
locidispid_expr = my_locidispid ? "#{my_locidispid}::bigint" : '0::bigint'
self.connection.execute("select ams_index('#{current_user.id}'::varchar, #{my_locidispid}::bigint, #{my_audio_latency}::integer)");
self.connection.execute("select ams_index('#{current_user.id}'::varchar, #{locidispid_expr}, #{my_audio_latency}::integer)").check
end
# Generate a list of music sessions (that are active) filtered by genre, language, keyword, and sorted

4
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -242,7 +242,6 @@ module JamRuby
def self.scheduled user
query = MusicSession.where("music_sessions.canceled = FALSE")
query = query.where("music_sessions.started_at IS NULL")
query = query.where("music_sessions.user_id = '#{user.id}'")
query = query.where("music_sessions.scheduled_start IS NULL OR music_sessions.scheduled_start > NOW() - '12 hour'::INTERVAL")
query = query.order("music_sessions.scheduled_start ASC")
@ -588,8 +587,9 @@ module JamRuby
my_locidispid = connection.locidispid
# 13 is an average audio gear value we use if they have not qualified any gear
my_audio_latency = connection.last_jam_audio_latency || current_user.last_jam_audio_latency || 13
locidispid_expr = my_locidispid ? "#{my_locidispid}::bigint" : '0::bigint' # Have to pass in zero; NULL fails silently in the stored proc
self.connection.execute("select sms_index('#{current_user.id}'::varchar, #{my_locidispid}::bigint, #{my_audio_latency}::integer)");
self.connection.execute("SELECT sms_index('#{current_user.id}'::varchar, #{locidispid_expr}, #{my_audio_latency}::integer)").check
end
# Generate a list of music sessions (that are active) filtered by genre, language, keyword, and sorted

8
ruby/spec/jam_ruby/models/active_music_session_spec.rb
View File

@ -503,6 +503,14 @@ describe ActiveMusicSession do
music_sessions.length.should == 1
music_sessions[0].should == music_session_1.music_session
end
it "should allow a null locidispid to search" do
searcher_conn_1.locidispid = nil
searcher_conn_1.save!
music_sessions, user_scores = ams(searcher_1, client_id: searcher_conn_1.client_id)
music_sessions.length.should == 2
end
end
# todo we need more tests:

24
ruby/spec/jam_ruby/models/music_session_spec.rb
View File

@ -518,6 +518,30 @@ describe MusicSession do
user_scores.length.should == 1 # the creator, and the invitee
user_scores[creator.id][:latency].should == ((network_score + invitee.last_jam_audio_latency + creator.last_jam_audio_latency ) / 2).ceil
end
it "does not show when it goes active" do
# we create a scheduled session--it should return
music_session = FactoryGirl.create(:music_session, creator: creator, scheduled_start: nil)
music_sessions, user_scores = sms(searcher, default_opts)
music_sessions.length.should == 1
# but then make an active session for this scheduled session
ams = FactoryGirl.create(:active_music_session, music_session: music_session, creator: creator, musician_access: true)
music_sessions, user_scores = sms(searcher, default_opts)
music_sessions.length.should == 0
# finally, delete the active session, and see results go back to one
ams.delete
music_sessions, user_scores = sms(searcher, default_opts)
music_sessions.length.should == 1
end
it "should allow a null locidispid to search" do
searcher_conn.locidispid = nil
searcher_conn.save!
music_sessions, user_scores = sms(searcher, default_opts)
music_sessions.length.should == 0
end
end

63
web/app/assets/javascripts/findSession.js
View File

@ -9,6 +9,7 @@
SCHEDULED: {index: 1, id: "table#sessions-scheduled"}
};
var $screen = null;
var $dateFilter = $("#session-date-filter");
var $sessionLanguageFilter = $('#session-language-filter');
@ -16,15 +17,14 @@
var rest = context.JK.Rest();
var sessionList;
var LIMIT = 10;
var ACTIVE_SESSIONS_LIMIT = 50;
var SCHEDULED_SESSIONS_LIMIT = 20;
var $asNext = null;
var $asScroller = null;
var currentActiveSessionsPage = 0;
var currentActiveSessionsQuery = defaultActiveSessionsQuery();
var $ssNext = null;
var $ssScroller = null;
var $ssNoMoreEntries = null;
var currentScheduledSessionsPage = 0;
var currentScheduledSessionsQuery = defaultScheduledSessionsQuery();
@ -90,7 +90,7 @@
/***************** ACTIVE SESSIONS *****************/
function defaultActiveSessionsQuery() {
return {offset:currentActiveSessionsPage * LIMIT, limit:LIMIT, page:currentActiveSessionsPage};
return {offset:0, limit:SCHEDULED_SESSIONS_LIMIT, page:0};
}
function renderActiveSessions(sessions) {
@ -98,6 +98,7 @@
sessionList.renderActiveSession(session, $(CATEGORY.ACTIVE.id));
});
afterLoadActiveSessions(sessions);
}
@ -141,7 +142,7 @@
var $noSessionsMsgSelector = $('#no-active-sessions');
if (sessionList.length === 0 && currentActiveSessionsPage === 0) {
if (sessionList.length === 0) {
$(CATEGORY.ACTIVE.id).hide();
$noSessionsMsgSelector.show();
}
@ -150,45 +151,15 @@
$noSessionsMsgSelector.hide();
}
if(sessionList.length < LIMIT) {
// if we retrieve less results than asked for, end searching
$asScroller.infinitescroll('pause');
}
else {
currentActiveSessionsPage++;
buildActiveSessionsQuery();
registerActiveSessionInfiniteScroll();
}
buildActiveSessionsQuery();
context.JK.GA.trackFindSessions(sessionList.length);
}
function registerActiveSessionInfiniteScroll() {
$asScroller.infinitescroll({
behavior: 'local',
navSelector: '#sessions-active .btn-next-wrapper',
nextSelector: '#sessions-active .btn-next',
binder: $asScroller,
dataType: 'json',
appendCallback: false,
debug: true,
prefill: false,
bufferPx:100,
loading: {
msg: $('<div class="infinite-scroll-loader">Loading ...</div>'),
img: '/assets/shared/spinner.gif'
},
path: function(page) {
return '/api/sessions/active?' + $.param(buildActiveSessionsQuery());
}
},function(json, opts) {
renderActiveSessions(json);
});
}
/***************** SCHEDULED SESSIONS *****************/
function defaultScheduledSessionsQuery() {
return {offset:currentScheduledSessionsPage * LIMIT, limit:LIMIT, page:currentScheduledSessionsPage};
return {offset:currentScheduledSessionsPage * SCHEDULED_SESSIONS_LIMIT, limit:SCHEDULED_SESSIONS_LIMIT, page:currentScheduledSessionsPage};
}
function renderScheduledSessions(sessions) {
@ -246,9 +217,11 @@
$noSessionsMsgSelector.hide();
}
if(sessionList.length < LIMIT) {
if(sessionList.length < SCHEDULED_SESSIONS_LIMIT) {
// if we retrieve less results than asked for, end searching
$ssScroller.infinitescroll('pause');
$ssNoMoreEntries.show();
$('.infinite-scroll-loader').remove();
}
else {
currentScheduledSessionsPage++;
@ -301,13 +274,12 @@
}
function clearResults() {
currentActiveSessionsPage = 0;
$asScroller.infinitescroll('resume');
$('table#sessions-active').empty();
currentScheduledSessionsPage = 0;
$ssScroller.infinitescroll('resume');
$('table#sessions-scheduled').empty();
$ssNoMoreEntries.hide();
}
function events() {
@ -336,11 +308,10 @@
sessionList = new context.JK.SessionList(app);
$asNext = $('#sessions-active .btn-next')
$asScroller = $('#sessions-active .findsession-scroll-container');
$ssNext = $('#sessions-scheduled .btn-next')
$ssScroller = $('#sessions-scheduled .findsession-scroll-container');
$screen = $('#findSession');
$ssNext = $screen.find('#sessions-scheduled .btn-next')
$ssScroller = $screen.find('.content-body-scroller');
$ssNoMoreEntries = $screen.find('#end-of-ss-list')
$dateFilter.datepicker({
dateFormat: "D d MM yy",

10
web/app/assets/stylesheets/client/findSession.css.scss
View File

@ -21,7 +21,7 @@
height:inherit;
position:relative;
display:block;
overflow:hidden !important;
overflow:auto
}
.session-filter {
@ -61,11 +61,11 @@
height:20px;
}
.session-container {
overflow:auto;
}
.btn-next {
display:none;
}
.end-of-list {
margin-top:0;
}
}

4
web/app/assets/stylesheets/client/sessionList.css.scss
View File

@ -1,9 +1,5 @@
@import "client/common";
div.findsession-scroll-container {
max-height:250px;
overflow:auto;
}
table.findsession-table, table.local-recordings {
width:98%;

4
web/app/views/clients/_findSession.html.erb
View File

@ -54,10 +54,6 @@
<div id="no-active-sessions">
No active public sessions found.
</div>
<div id="end-of-as-list" class="end-of-list">
No more active sessions.
</div>
<span class="btn-next-wrapper"><a href="/api/sessions/active?page=1" class="btn-next">Next</a></span>
</div>
<br />
<div id="sessions-scheduled" class="session-container">

2
web/app/views/clients/_sessionList.html.erb
View File

@ -1,6 +1,6 @@
<h2><%= title %></h2>
<br/>
<div class="findsession-scroll-container">
<div class="findsession-container">
<table class="findsession-table" cellspacing="0" cellpadding="0" border="0">
<!-- header -->
<tr>

26
web/app/views/layouts/client.html.erb
View File

@ -6,6 +6,32 @@
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if (window.WebFont) {
WebFont.load({

12
web/spec/factories.rb
View File

@ -82,10 +82,14 @@ FactoryGirl.define do
before(:create) do |session, evaluator|
music_session = FactoryGirl.create(:music_session, name: evaluator.name, description: evaluator.description, fan_chat: evaluator.fan_chat,
fan_access: evaluator.fan_access, approval_required: evaluator.approval_required, musician_access: evaluator.musician_access,
genre: evaluator.genre, creator: evaluator.creator, band: evaluator.band, language: evaluator.language)
session.id = music_session.id
if evaluator.music_session
session.id = evaluator.music_session.id
else
music_session = FactoryGirl.create(:music_session, name: evaluator.name, description: evaluator.description, fan_chat: evaluator.fan_chat,
fan_access: evaluator.fan_access, approval_required: evaluator.approval_required, musician_access: evaluator.musician_access,
genre: evaluator.genre, creator: evaluator.creator, band: evaluator.band, language: evaluator.language)
session.id = music_session.id
end
end
factory :active_music_session do

60
web/spec/features/find_sessions_spec.rb
View File

@ -42,38 +42,46 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
describe "listing behavior" do
describe "one slush session" do
before do
@session1 = FactoryGirl.create(:single_user_session)
end
describe "active sessions" do
let!(:session1) { FactoryGirl.create(:single_user_session) }
it "find general population user" do
pending
it "find one active session" do
find('#btn-refresh').trigger(:click)
sleep 1
find('div#sessions-active')
page.all('div#sessions-active .found-session').count.should == 1
page.assert_selector('div#sessions-active .found-session', count: 1)
end
describe "tons of slush sessions" do
before do
20.times do
FactoryGirl.create(:single_user_session)
end
end
it "find many general users" do
pending
find('#btn-refresh').trigger(:click)
sleep 1
find('div#sessions-active')
page.all('div#sessions-active .found-session').count.should == 20
# attempt to scroll down--the end of session list should show, and there should now be 21 items
# page.execute_script('jQuery("#findSession .content-body-scroller").scrollTo("100%",100)') #scroll to the bottom of the element
# find('#end-of-session-list')
# page.all('div#sessions-active .found-session').count.should == 21
it "find many active sessions" do
20.times do
FactoryGirl.create(:single_user_session)
end
find('#btn-refresh').trigger(:click)
page.assert_selector('div#sessions-active .found-session', count: 20)
# attempt to scroll down--the end of session list should show, and there should now be 21 items
# page.execute_script('jQuery("#findSession .content-body-scroller").scrollTo("100%",100)') #scroll to the bottom of the element
# find('#end-of-session-list')
# page.all('div#sessions-active .found-session').count.should == 21
end
end
describe "scheduled sessions" do
let!(:scheduled_session) {FactoryGirl.create(:music_session) }
it "find one scheduled session" do
find('#btn-refresh').trigger(:click)
page.assert_selector('div#sessions-scheduled .found-session', count: 1)
end
it "finds many scheduled sessions" do
20.times do
FactoryGirl.create(:music_session)
end
find('#btn-refresh').trigger(:click)
page.assert_selector('div#sessions-scheduled .found-session', count: 20)
page.execute_script('jQuery("#findSession .content-body-scroller").scrollTo("100%",100)') #scroll to the bottom of the element
find('#end-of-ss-list')
page.assert_selector('div#sessions-scheduled .found-session', count: 21)
end
end
end