Skip to content

Commit 26cbfb4

Browse files
committed
Refs #11753 - remove elastic search from content view filter rules
1 parent 05d0124 commit 26cbfb4

8 files changed

+8
-107
lines changed

app/controllers/katello/api/v2/content_view_filter_rules_controller.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ class Api::V2::ContentViewFilterRulesController < Api::V2::ApiController
66
api :GET, "/content_view_filters/:content_view_filter_id/rules", N_("List filter rules")
77
param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
88
def index
9-
options = sort_params
10-
options[:load_records?] = true
11-
options[:filters] = [{ :terms => { :id => ContentViewFilter.rule_ids_for(@filter) } }]
12-
13-
@search_service.model = ContentViewFilter.rule_class_for(@filter)
14-
respond(:collection => item_search(ContentViewFilter.rule_class_for(@filter), params, options))
9+
ids = ContentViewFilter.rule_ids_for(@filter)
10+
results = ids.map { |id| ContentViewFilter.rule_class_for(@filter).find(id) }
11+
collection = {
12+
:results => results.uniq,
13+
:subtotal => results.count,
14+
:total => results.count
15+
}
16+
respond :collection => collection
1517
end
1618

1719
api :POST, "/content_view_filters/:content_view_filter_id/rules",

app/models/katello/content_view_erratum_filter_rule.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module Katello
22
class ContentViewErratumFilterRule < Katello::Model
33
self.include_root_in_json = false
44

5-
include Glue::ElasticSearch::ContentViewErratumFilterRule if SETTINGS[:katello][:use_elasticsearch]
6-
75
belongs_to :filter,
86
:class_name => "Katello::ContentViewErratumFilter",
97
:inverse_of => :erratum_rules,

app/models/katello/content_view_package_filter_rule.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module Katello
22
class ContentViewPackageFilterRule < Katello::Model
33
self.include_root_in_json = false
44

5-
include Glue::ElasticSearch::ContentViewPackageFilterRule if SETTINGS[:katello][:use_elasticsearch]
6-
75
belongs_to :filter,
86
:class_name => "Katello::ContentViewPackageFilter",
97
:inverse_of => :package_rules,

app/models/katello/content_view_package_group_filter_rule.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module Katello
22
class ContentViewPackageGroupFilterRule < Katello::Model
33
self.include_root_in_json = false
44

5-
include Glue::ElasticSearch::ContentViewPackageGroupFilterRule if SETTINGS[:katello][:use_elasticsearch]
6-
75
belongs_to :filter,
86
:class_name => "Katello::ContentViewPackageGroupFilter",
97
:inverse_of => :package_group_rules,

app/models/katello/glue/elastic_search/content_view_erratum_filter_rule.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

app/models/katello/glue/elastic_search/content_view_package_filter_rule.rb

Lines changed: 0 additions & 32 deletions
This file was deleted.

app/models/katello/glue/elastic_search/content_view_package_group_filter_rule.rb

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/controllers/api/v2/content_view_filter_rules_controller_test.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ def permissions
1818

1919
def setup
2020
setup_controller_defaults_api
21-
@request.env['HTTP_ACCEPT'] = 'application/json'
22-
@request.env['CONTENT_TYPE'] = 'application/json'
23-
@fake_search_service = @controller.load_search_service(Support::SearchService::FakeSearchService.new)
2421
models
2522
permissions
2623
end

0 commit comments

Comments
 (0)