Use BsRequest FindFor query class to find bs_requests related to proj…

…ects and packages

src/api/app/controllers/concerns/webui/requests_filter.rb

@@ -47,8 +47,8 @@ def filter_by_involvement(filter_involvement, project = nil, package = nil)
   end
 
   def filter_by_involvement_for_project(filter_by_involvement, project)
-    target = BsRequest.with_actions.where(bs_request_actions: { target_project: project.name })
-    source = BsRequest.with_actions.where(bs_request_actions: { source_project: project.name })
+    target = BsRequest::FindFor::Project.new({project: project.name, source_or_target: 'target'}).all
+    source = BsRequest::FindFor::Project.new({project: project.name, source_or_target: 'source'}).all
     case filter_by_involvement
     when 'all'
       target.or(source)
@@ -60,8 +60,8 @@ def filter_by_involvement_for_project(filter_by_involvement, project)
   end
 
   def filter_by_involvement_for_package(filter_by_involvement, project, package)
-    target = BsRequest.with_actions.where(bs_request_actions: { target_project: project.name, target_package: package.name })
-    source = BsRequest.with_actions.where(bs_request_actions: { source_project: project.name, source_package: package.name })
+    target = BsRequest::FindFor::Project.new({project: project.name, package: package.name, source_or_target: 'target'}).all
+    source = BsRequest::FindFor::Project.new({project: project.name, package: package.name, source_or_target: 'source'}).all
     case filter_by_involvement
     when 'all'
       target.or(source)

src/api/app/models/bs_request/find_for/base.rb

@@ -64,6 +64,10 @@ def quote(str)
       def creator
         @parameters[:creator]
       end
+
+      def source_or_target
+        @parameters[:source_or_target]
+      end
     end
   end
 end

src/api/app/models/bs_request/find_for/project.rb

@@ -7,8 +7,12 @@ def all
         @where_conditions = []
         @where_values = []
 
-        bs_request_actions_conditions('source')
-        bs_request_actions_conditions('target')
+        if source_or_target.present?
+          bs_request_actions_conditions(source_or_target)
+        else
+          bs_request_actions_conditions('source')
+          bs_request_actions_conditions('target')
+        end
 
         reviews_conditions