Merge branch 'hotfix/improve-feed-scores'

bogdaneee · Aug 29, 2022 · 45445ad · 45445ad
2 parents b1b3a07 + ac74781
commit 45445ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@
 /config/database.yml
 .DS_Store
 /storage/*
+
+.idea/
diff --git a/app/controllers/api/scores_controller.rb b/app/controllers/api/scores_controller.rb
@@ -5,7 +5,7 @@ class ScoresController < ApplicationController
     before_action :validate_score_user_id, only: :destroy
 
     def user_feed
-      scores = Score.all.order(played_at: :desc, id: :desc)
+      scores = Score.all.order(played_at: :desc, id: :desc).includes(:user)
       serialized_scores = scores.map(&:serialize)
 
       response = {

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -69,12 +69,12 @@
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    # config.default_formatter = "doc"
-  end
+  # if config.files_to_run.one?
+  # Use the documentation formatter for detailed output,
+  # unless a formatter has already been configured
+  # (e.g. via a command-line flag).
+  # config.default_formatter = "doc"
+  # end
 
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running