From f84c412504e51518a9a09b94dcbd5f3ee3fbc126 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:58:52 +0100 Subject: [PATCH] Refactor scope :filter_by_years --- app/models/bulk_upload.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb index c6f62ba7e..be9dc0a7d 100644 --- a/app/models/bulk_upload.rb +++ b/app/models/bulk_upload.rb @@ -25,12 +25,7 @@ class BulkUpload < ApplicationRecord } scope :filter_by_id, ->(id) { where(id:) } - scope :filter_by_years, lambda { |years, _user = nil| - first_year = years.shift - query = where(year: first_year) - years.each { |year| query = query.or(where(year:)) } - query.all - } + scope :filter_by_years, ->(years, _user = nil) { where(year: years) } scope :filter_by_uploaded_by, ->(user_id, _user = nil) { where(user_id:) } scope :filter_by_user_text_search, ->(param, _user = nil) { where(user_id: User.search_by(param).select(:id)) } scope :filter_by_user, ->(user_id, _user = nil) { user_id.present? ? where(user_id:) : all }