From fac29f73d4e301eb8b97ce4536305a4616fc5567 Mon Sep 17 00:00:00 2001
From: Sebastian Serth <Sebastian.Serth@hpi.de>
Date: Fri, 4 Dec 2020 16:58:05 +0100
Subject: [PATCH] Respect user_type for RfC index routes

---
 app/controllers/request_for_comments_controller.rb |  2 +-
 app/models/request_for_comment.rb                  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/request_for_comments_controller.rb b/app/controllers/request_for_comments_controller.rb
index 278af642..5a0bcb03 100644
--- a/app/controllers/request_for_comments_controller.rb
+++ b/app/controllers/request_for_comments_controller.rb
@@ -27,7 +27,7 @@ class RequestForCommentsController < ApplicationController
   def get_my_comment_requests
     @search = RequestForComment
                   .with_last_activity
-                  .where(user_id: current_user&.id)
+                  .where(user: current_user)
                   .ransack(params[:q])
     @request_for_comments = @search.result
                                 .order('created_at DESC')
diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 40e9c4c3..d96b0a76 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -17,12 +17,12 @@ class RequestForComment < ApplicationRecord
     def self.last_per_user(n = 5)
       from("(#{row_number_user_sql}) as request_for_comments")
           .where("row_number <= ?", n)
-          .group('request_for_comments.id, request_for_comments.user_id, request_for_comments.exercise_id,
-                  request_for_comments.file_id, request_for_comments.question, request_for_comments.created_at,
-          request_for_comments.updated_at, request_for_comments.user_type, request_for_comments.solved,
-          request_for_comments.full_score_reached, request_for_comments.submission_id, request_for_comments.row_number')
-          # ugly, but necessary
-    end
+          .group('request_for_comments.id, request_for_comments.user_id, request_for_comments.user_type,
+                  request_for_comments.exercise_id, request_for_comments.file_id, request_for_comments.question,
+                request_for_comments.created_at, request_for_comments.updated_at, request_for_comments.solved,
+                request_for_comments.full_score_reached, request_for_comments.submission_id, request_for_comments.row_number')
+        # ugly, but necessary
+  end
 
   # not used right now, finds the last submission for the respective user and exercise.
   # might be helpful to check whether the exercise has been solved in the meantime.
@@ -67,6 +67,6 @@ class RequestForComment < ApplicationRecord
 
     private
     def self.row_number_user_sql
-      select("id, user_id, exercise_id, file_id, question, created_at, updated_at, user_type, solved, full_score_reached, submission_id, row_number() OVER (PARTITION BY user_id ORDER BY created_at DESC) as row_number").to_sql
+      select("id, user_id, user_type, exercise_id, file_id, question, created_at, updated_at, solved, full_score_reached, submission_id, row_number() OVER (PARTITION BY user_id, user_type ORDER BY created_at DESC) as row_number").to_sql
     end
 end