diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-12 09:27:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 09:27:38 +0100 |
| commit | 54d4e5252be8cd9fa780df46e06541da8263d368 (patch) | |
| tree | 36ea8ee8f190ed388b7eb5f789ff1d305230b0fd /app/controllers | |
| parent | 7bed25f3eabecc84268a4b6c254cc3e0738926b6 (diff) | |
Use Rails' index_by where it makes sense (#15542)
* Use Rails' index_by where it makes sense * Fix tests Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/api/v1/markers_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/cache_concern.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/markers_controller.rb b/app/controllers/api/v1/markers_controller.rb index 28c2ec791..867e6facf 100644 --- a/app/controllers/api/v1/markers_controller.rb +++ b/app/controllers/api/v1/markers_controller.rb @@ -7,7 +7,7 @@ class Api::V1::MarkersController < Api::BaseController before_action :require_user! def index - @markers = current_user.markers.where(timeline: Array(params[:timeline])).each_with_object({}) { |marker, h| h[marker.timeline] = marker } + @markers = current_user.markers.where(timeline: Array(params[:timeline])).index_by(&:timeline) render json: serialize_map(@markers) end diff --git a/app/controllers/concerns/cache_concern.rb b/app/controllers/concerns/cache_concern.rb index 8d82eda5c..3fb4b962a 100644 --- a/app/controllers/concerns/cache_concern.rb +++ b/app/controllers/concerns/cache_concern.rb @@ -38,7 +38,7 @@ module CacheConcern klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!) unless uncached_ids.empty? - uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item } + uncached = klass.where(id: uncached_ids).with_includes.index_by(&:id) uncached.each_value do |item| Rails.cache.write(item, item) |