From 9e53fb4ea57a3c6f51e8f600ea75b412add26b2c Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Wed, 16 Aug 2017 16:03:49 +0200 Subject: [PATCH] Fix query for RFC activity --- app/controllers/request_for_comments_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/request_for_comments_controller.rb b/app/controllers/request_for_comments_controller.rb index 327d7aa7..fca5c99b 100644 --- a/app/controllers/request_for_comments_controller.rb +++ b/app/controllers/request_for_comments_controller.rb @@ -43,10 +43,11 @@ class RequestForCommentsController < ApplicationController @search = RequestForComment .joins(:comments) # we don't need to outer join here, because we know the user has commented on these .where(comments: {user_id: current_user.id}) + .joins('join "submissions" s on s.id = request_for_comments.submission_id + left outer join "files" f on f.context_id = s.id + left outer join "comments" as c on c.file_id = f.id') .group('request_for_comments.id') - .joins(:comments) - .group('request_for_comments.id') - .select('request_for_comments.*, max(comments.updated_at) as last_comment') + .select('request_for_comments.*, max(c.updated_at) as last_comment') .search(params[:q]) @request_for_comments = @search.result.order('last_comment DESC').paginate(page: params[:page]) render 'index'