From 522eb6cfa36052ae5371efe14c0ce4f0bded6b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 3 Oct 2023 19:36:40 +0200 Subject: [PATCH] Add and apply Rails/SelectMap rule This rule was introduced in rubocop-rails 2.21.0. Using `pluck` is easier to read. --- .rubocop.yml | 3 +++ app/controllers/admin/poll/officer_assignments_controller.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7863dd09c..90759c3ac 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -460,6 +460,9 @@ Rails/SaveBang: Enabled: true Severity: refactor +Rails/SelectMap: + Enabled: true + Rails/SkipsModelValidations: Enabled: true ForbiddenMethods: diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb index 82e45a182..71432bb2a 100644 --- a/app/controllers/admin/poll/officer_assignments_controller.rb +++ b/app/controllers/admin/poll/officer_assignments_controller.rb @@ -7,7 +7,7 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController @officers = ::Poll::Officer .includes(:user) .order("users.username") - .where(id: @poll.officer_assignments.select(:officer_id).distinct.map(&:officer_id)) + .where(id: @poll.officer_assignments.distinct.pluck(:officer_id)) .page(params[:page]) .per(50) end