fixed order users on list

raphox · Jun 17, 2020 · 08ac2ba · 08ac2ba
1 parent 549ce91
commit 08ac2ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -21,13 +21,16 @@ def show
     end
 
     # FIXME: Change this When use ACTIVE_MODEL_CLASS as UserNeo4j
-    @friends = User.where(:neo4j_uuid.in => friends.pluck(:uuid))
+    uuids = friends.map { |node| node.props[:uuid] || node.uuid }
+    @friends = User.where(:neo4j_uuid.in => friends.pluck(:uuid)).
+      to_a.sort_by { |value| uuids.index(value.neo4j_uuid) } # preserving order
+
     @friends_path = friends_path&.transform_values do |item|
       uuids = item.map { |node| node.props[:uuid] || node.uuid }
 
       # it is necessary to order after query in database to preser correct path
       User.where(:neo4j_uuid.in => uuids).
-        to_a.sort_by { |value| uuids.index(value.neo4j_uuid) }
+        to_a.sort_by { |value| uuids.index(value.neo4j_uuid) } # preserving order
     end
   end
 

diff --git a/app/models/user_neo4j.rb b/app/models/user_neo4j.rb
@@ -72,7 +72,6 @@ def friends_by_search(term)
 
       total += (friends_path[item.uuid].length - 2) * 10
       total += item.titles.any? { titles.include?(term) } ? -10 : 0
-      total += item.subtitles.any? { |subtitle| subtitle.include?(term) } ? -5 : 0
 
       total
     end