From 43911b9fd58a8f239f7f10f9de289163e8a4aabf Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Wed, 4 Mar 2020 09:50:06 -0500 Subject: [PATCH] Fixed order of rooms in postgres (#979) Co-authored-by: Jesus Federico --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index d87e6a4b..f12672e7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -103,9 +103,9 @@ class User < ApplicationRecord order(Arel.sql("#{column} #{direction}")) end - # Returns a list of rooms ordered by last session + # Returns a list of rooms ordered by last session (with nil rooms last) def ordered_rooms - [main_room] + rooms.where.not(id: main_room.id).order("last_session desc") + [main_room] + rooms.where.not(id: main_room.id).order(Arel.sql("last_session IS NULL, last_session desc")) end # Activates an account and initialize a users main room