foreman-tasks 0.15.9 → 0.15.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07f034015f51e6df43b28bbef6155ec69b6a7de6060e76342f8da044231fadb
-  data.tar.gz: dd9919d3c5ea799e734494a628519f958dcdc00f8e0b9a2891ee1afd04ac07df
+  metadata.gz: c59c8e933514a6d3ca2f5f0cfa17da2335c24d1821aa9a9d96c8abcf0a935fe7
+  data.tar.gz: 3d7b88cdd625b8ac450b5f36dec1de26374c8a2b265e49c779e581ffc93cef48
 SHA512:
-  metadata.gz: aae83a81b3efa9de6a56044c5c61489564cba70ccde2e0e19ca1224151dcb80341856f75dafd93eb6e57fd73d1416a744f92cd6701b3b7276aa36988d8308537
-  data.tar.gz: d65aee899c9a75b1bdbfeca54b1cd089aa39bd44bd003d76b89a0455d782a27182f72df2f2d8708220d7b6ed33812ea2f90aaac1b8caa43ae3d2d2ba6de0e1df
+  metadata.gz: acd6a37cd6260beece7fc8729b6aa91d40c4b9fff1c8f64620a84ca67cf528e7dcefffc132e010076da9d8083f4da4863753a1eb1b9eaaa10bc8f60d18655d2a
+  data.tar.gz: 4e7aa88a764c0716b28396479cc9c82fdfbf9c00ec4f66576bff55ebc42a630c9814ee7a8528d399c56b10ce297ea662e861cf836a97f5be52bc3d3fd44cd89e

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -16,7 +16,8 @@ module ForemanTasks
     end
 
     def summary
-      render json: Task::Summarizer.new(resource_base, params[:recent_timeframe].to_i).summary
+      scope = resource_base.search_for(current_taxonomy_search).select(:id)
+      render json: Task::Summarizer.new(Task.where(:id => scope), params[:recent_timeframe].to_i).summary
     end
 
     def sub_tasks

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.15.9'.freeze
+  VERSION = '0.15.10'.freeze
 end

data/test/controllers/tasks_controller_test.rb

@@ -41,6 +41,41 @@ module ForemanTasks
           response = JSON.parse(@response.body)
           assert_equal 0, response['stopped']['total']
         end
+
+        describe 'taxonomy scoping' do
+          before do
+            @organizations = [0, 0].map { FactoryBot.create(:organization) }
+            @locations = [0, 0].map { FactoryBot.create(:location) }
+            @tasks = [0, 0].map { FactoryBot.create(:some_task) }
+            @tasks.zip(@organizations, @locations).each do |task, org, loc|
+              Lock.link!(org, task.id)
+              Lock.link!(loc, task.id)
+            end
+          end
+
+          it 'does not limit if unset' do
+            get(:summary, params: { recent_timeframe: 24 }, session: set_session_user)
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_equal 2, response['stopped']['total']
+          end
+
+          it 'finds only tasks with matching taxonomies' do
+            get(:summary, params: { recent_timeframe: 24 },
+                          session: set_session_user.merge(:organization_id => @organizations.first, :location_id => @locations.first))
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_equal 1, response['stopped']['total']
+          end
+
+          it 'find no tasks when taxonomy combination contains no tasks' do
+            get(:summary, params: { recent_timeframe: 24 },
+                          session: set_session_user.merge(:organization_id => @organizations.first, :location_id => @locations.last))
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_equal 0, response['stopped']['total']
+          end
+        end
       end
 
       it 'supports csv export' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.15.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core