From 4944c5983dfe073b2533a77e64bfc5624398bdd9 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 5 Nov 2024 20:04:28 -0600 Subject: [PATCH] Use current user to scope history --- ruby/lib/jam_ruby/models/music_session.rb | 4 +++- web/app/controllers/api_music_sessions_controller.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 96b8b0c82..763b336ac 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -568,9 +568,10 @@ module JamRuby return query end - def self.history(options) + def self.history(current_user, options) offset = options[:offset] || 0 limit = options[:limit] || 10 + MusicSession.joins( %Q{ INNER JOIN @@ -581,6 +582,7 @@ module JamRuby users ON music_sessions_user_history.user_id = users.id + WHERE users.id = '#{current_user.id}' } ).order('music_sessions.created_at DESC').select("music_sessions.id AS session_id, music_sessions_user_history.id AS session_history_id, music_sessions.created_at, music_sessions.name, music_sessions.description, music_sessions.musician_access, music_sessions.approval_required, music_sessions_user_history.instruments, users.first_name, users.last_name, users.photo_url, users.id AS user_id").offset(offset).limit(limit) end diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb index ab767124e..247eacaee 100644 --- a/web/app/controllers/api_music_sessions_controller.rb +++ b/web/app/controllers/api_music_sessions_controller.rb @@ -103,7 +103,7 @@ class ApiMusicSessionsController < ApiController end def list_history - @music_sessions = MusicSession.history(offset: params[:offset], limit: params[:limit]) + @music_sessions = MusicSession.history(current_user, {offset: params[:offset], limit: params[:limit]}) end def scheduled_rsvp