foreman_openscap 11.1.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b3bfa25d840fcba478a79cbee0da5f3de4eda1095ec03cc87d26cfbf8c5bfb
-  data.tar.gz: 7c86148de41cc1afd8ead44b7eb3f3659911f897c6fc4a516fbd12cf99f60867
+  metadata.gz: 96e4d934fc2d51a5bbe4bc72af3571327447e6b6216e23841978440fea078f25
+  data.tar.gz: 7b652d18b0d2a663ab6808dcb13a76eeed2fcc9d55d8cfc5b5cde46becdf4a2f
 SHA512:
-  metadata.gz: 6f5434d27ffab638c2bd96540f0b3c66f177c02e0895fd72a1a7e4ca17eb668c3e7c8ebf682dcdb822e1f307a633048346b8ffe77e9c59316b63313972a7296b
-  data.tar.gz: 81a5b077c0b91f665ac6f69ea41a9d253b49889cc2515bd1bf3a138218afd2e10829077de287050c546755b89c6e9c69b4be474fbb880dc8c22a0291a2b3c48f
+  metadata.gz: 579169b33271da9334e095c53bc57d2b09b0eed9638c45b26562d77e22d902a1d313be9880b2276e24fae45b372417823d119a34e158e183505160f84e84066d
+  data.tar.gz: 5f05c3cdd6e9ab5030ddf719d79f6ab9dce2462791e0219b865abdf339d61364ab4dd2f1aa7fbe021c7d8c11d2768fe336cd386c135294630c17c55de96479f4

data/app/controllers/arf_reports_controller.rb

@@ -13,8 +13,7 @@ class ArfReportsController < ApplicationController
     # Avoid using includes() with nested associations and "order by" together. Otherwise,
     # includes() will use join tables instead and Rails somehow create many objects and
     # high memory consumption.
-    @arf_reports_pg = resource_base.search_for(params[:search], :order => params[:order])
-                                   .paginate(:page => params[:page], :per_page => params[:per_page])
+    @arf_reports_pg = resource_base_search_and_page.load
     arf_report_ids = @arf_reports_pg.pluck(:id)
     @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
                                 .where(id: arf_report_ids)

data/app/models/foreman_openscap/arf_report.rb

@@ -53,11 +53,14 @@ module ForemanOpenscap
 
     scope :failed, lambda { where("(#{report_status_column} >> #{bit_mask 'failed'}) > 0") }
     scope :not_failed, lambda { where("(#{report_status_column} >> #{bit_mask 'failed'}) = 0") }
+    virtual_column_scope :select_compliance_failed, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'failed'}) as compliance_failed") }
 
     scope :othered, lambda { where("(#{report_status_column} >> #{bit_mask 'othered'}) > 0").merge(not_failed) }
     scope :not_othered, lambda { where("(#{report_status_column} >> #{bit_mask 'othered'}) = 0") }
+    virtual_column_scope :select_compliance_othered, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'othered'}) as compliance_othered") }
 
     scope :passed, lambda { where("(#{report_status_column} >> #{bit_mask 'passed'}) > 0").merge(not_failed).merge(not_othered) }
+    virtual_column_scope :select_compliance_passed, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'passed'}) as compliance_passed") }
 
     scope :by_rule_result, lambda { |rule_name, rule_result| joins(:sources).where(:sources => { :value => rule_name }, :logs => { :result => rule_result }) }
 

data/lib/foreman_openscap/engine.rb

@@ -40,7 +40,7 @@ module ForemanOpenscap
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_openscap do
-          requires_foreman '>= 3.16'
+          requires_foreman '>= 3.17'
           register_gettext
 
           apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "11.1.0".freeze
+  VERSION = "12.0.0".freeze
 end

data/test/functional/api/v2/compliance/arf_reports_controller_test.rb

@@ -436,6 +436,30 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
     assert_equal report.id, response['results'].first["id"].to_i
   end
 
+  test "should order by compliance_[failed|passed|othered]" do
+    reports_cleanup
+    policy = FactoryBot.create(:policy)
+    create_arf_report_for_search({ "passed" => 4, "othered" => 0, "failed" => 1 }, policy)
+    create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, policy)
+    create_arf_report_for_search({ "passed" => 15, "othered" => 9, "failed" => 0 }, policy)
+    create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 7 }, policy)
+
+    get :index, :params => { :order => "compliance_failed DESC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal 7, response['results'].first['failed']
+
+    get :index, :params => { :order => "compliance_passed DESC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal 15, response['results'].first['passed']
+
+    get :index, :params => { :order => "compliance_othered DESC" }, :session => set_session_user
+    assert_response :success
+    response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal 9, response['results'].first['othered']
+  end
+
   private
 
   def reports_cleanup

data/test/functional/arf_reports_controller_test.rb

@@ -37,4 +37,13 @@ class ArfReportsControllerTest < ActionController::TestCase
     get :download_html, :params => { :id => arf_report.id }, :session => set_session_user
     assert_equal report_html, @response.body
   end
+
+  test "should order arf reports by compliance_[failed|passed|othered]" do
+    get :index, params: { order: "compliance_failed DESC" }, :session => set_session_user
+    assert_response :success
+    get :index, params: { order: "compliance_passed DESC" }, :session => set_session_user
+    assert_response :success
+    get :index, params: { order: "compliance_othered DESC" }, :session => set_session_user
+    assert_response :success
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 12.0.0
 platform: ruby
 authors:
 - slukasik@redhat.com