Merge remote-tracking branch 'parent/main' into upstream-20240517

2024-05-17 08:53:59 +09:00 · 2024-05-17 08:53:59 +09:00 · 094ff9d2ee
commit 094ff9d2ee
parent d5e9bc5247 b2388be71e
153 changed files with 1412 additions and 631 deletions
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/api/v1/bookmarks_controller.rb
@ -15,11 +15,11 @@ class Api::V1::BookmarksController < Api::BaseController
  private

  def load_statuses
-    cached_bookmarks
+    preloaded_bookmarks
  end

-  def cached_bookmarks
-    cache_collection(results.map(&:status), Status)
+  def preloaded_bookmarks
+    preload_collection(results.map(&:status), Status)
  end

  def results