Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11427 from vpereira/search_controller_search_method
Refactor SearchController extracting query to query object
- Loading branch information
Showing
5 changed files
with
167 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| class SearchFinder | ||
| include ActiveModel::Validations | ||
|
|
||
| attr_reader :included_classes, :relation, :what, :render_all, :params, :search_items, :preloaded_classes | ||
|
|
||
| validates :what, inclusion: [:package, :project, :repository, :request, :person, :channel, :channel_binary, :released_binary, :issue] | ||
|
|
||
| def initialize(what:, search_items: [], render_all: false, params: {}) | ||
| @what = what | ||
| @render_all = render_all | ||
| @search_items = search_items | ||
| @params = params | ||
| @included_classes = [] | ||
| @preloaded_classes = [] | ||
| end | ||
|
|
||
| def call | ||
| return [] unless valid? | ||
|
|
||
| case what | ||
| when :package | ||
| @relation = packages | ||
| when :project | ||
| @relation = projects | ||
| when :repository | ||
| @relation = repositories | ||
| when :request | ||
| @relation = bs_requests | ||
| @preloads = bs_request_preloads | ||
| when :person | ||
| @relation = users | ||
| when :channel, :channel_binary | ||
| @relation = channel_binaries | ||
| when :released_binary | ||
| @relation = binary_releases | ||
| when :issue | ||
| @relation = issues | ||
| end | ||
| @relation.includes(@included_classes).references(@included_classes).preload(@preloaded_classes) | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def bs_request_preloads | ||
| [:reviews, { review_history_elements: :user }, | ||
| { bs_request_actions: :bs_request_action_accept_info }] | ||
| end | ||
|
|
||
| def packages | ||
| @included_classes = [:project] | ||
| Package.where(id: search_items).order('projects.name', :name) | ||
| end | ||
|
|
||
| def projects | ||
| if render_all | ||
| @included_classes = [:repositories] | ||
| Project.where(id: search_items).order(:name) | ||
| else | ||
| Project.where(id: search_items).order(:name).select('projects.id,projects.name') | ||
| end | ||
| end | ||
|
|
||
| def repositories | ||
| @included_classes = [:project] | ||
| Repository.where(id: search_items) | ||
| end | ||
|
|
||
| def bs_requests | ||
| BsRequest.where(id: search_items).order(:id) | ||
| end | ||
|
|
||
| def users | ||
| User.where(id: search_items).order(:login) | ||
| end | ||
|
|
||
| def channel_binaries | ||
| ChannelBinary.where(id: search_items) | ||
| end | ||
|
|
||
| def binary_releases | ||
| BinaryRelease.where(id: search_items) | ||
| end | ||
|
|
||
| def issues | ||
| @included_classes = [:issue_tracker] | ||
| Issue.where(id: search_items) | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| require 'rails_helper' | ||
|
|
||
| RSpec.describe SearchFinder do | ||
| describe 'validation' do | ||
| context 'valid' do | ||
| let(:finder) { described_class.new(what: :package) } | ||
|
|
||
| it { expect(finder).to be_valid } | ||
| end | ||
|
|
||
| context 'invalid' do | ||
| let(:finder) { described_class.new(what: :packaage) } | ||
|
|
||
| it { expect(finder).not_to be_valid } | ||
| end | ||
| end | ||
|
|
||
| describe 'search for package' do | ||
| let!(:package) { create(:package, name: 'bar') } | ||
| let(:finder) { described_class.new(what: :package, search_items: [package.id]) } | ||
|
|
||
| it { expect(finder.call).to include(package) } | ||
|
|
||
| describe 'instance variables' do | ||
| before do | ||
| finder.call | ||
| end | ||
|
|
||
| it { expect(finder.included_classes).to include(:project) } | ||
| end | ||
| end | ||
|
|
||
| describe 'search for project' do | ||
| let!(:project) { create(:project, name: 'foo') } | ||
|
|
||
| context 'render all = false' do | ||
| let(:finder) { described_class.new(what: :project, search_items: [project.id]) } | ||
|
|
||
| it { expect(finder.call).to include(project) } | ||
| end | ||
|
|
||
| context 'render all = true' do | ||
| let(:finder) { described_class.new(what: :project, render_all: true, search_items: [project.id]) } | ||
|
|
||
| before do | ||
| finder.call | ||
| end | ||
|
|
||
| it { expect(finder.call).to include(project) } | ||
| it { expect(finder.included_classes).to include(:repositories) } | ||
| it { expect(finder.relation.first.title).not_to be_nil } | ||
| end | ||
| end | ||
| end |