Only display issues from active projects in searchbar (#203)

* Add filter to only display Tickets from active projects

* Check status when searching for project name

* Refactor to use on_active_project scope

* Add test for IssueSearcher

Author: timlandolt

app/controllers/completion_controller.rb

@@ -17,8 +17,10 @@ def search_term
   end
 
   def scoped_issues
-    scope = Issue.cross_project_scope(@project, params[:scope]).visible
-    scope.includes(:project, :tracker)
+    Issue
+      .cross_project_scope(@project, params[:scope])
+      .visible
+      .includes(:project, :tracker)
   end
 
   def format_issues_json(issues)

app/services/issue_searcher.rb

@@ -6,6 +6,8 @@ class IssueSearcher
   TICKET_OPEN_STATUS = true
 
   def call(search_term, issues)
+    issues = issues.on_active_project
+
     issues = if search_term.present?
                search_by_term(search_term, issues)
              else
@@ -32,9 +34,10 @@ def find_by_id(search_term, issues)
 
   def hits_by_project(search_term)
     project_arel = Project.arel_table
-    Issue.left_joins(:project, :time_entries)
+    Issue.left_joins(:time_entries)
          .select('issues.*, COUNT(time_entries.id) as time_entries_count')
          .group('issues.id')
+         .on_active_project
          .where(project_arel[:name].lower.matches("%#{search_term.downcase}%"))
          .open(TICKET_OPEN_STATUS)
          .order('time_entries_count DESC')

test/unit/issue_searcher_test.rb

@@ -14,11 +14,14 @@ class IssueSearcherTest < ActiveSupport::TestCase
     User.current = User.find(2)
     @service = IssueSearcher.new
     renuo_project = create(:project, name: 'Renuo Project', identifier: 'renuo_project')
-    @projects = [renuo_project, Project.first, Project.second, Project.third]
+    closed_project = create(:project, name: 'Closed Project', identifier: 'closed_project',
+                                      status: Project::STATUS_CLOSED)
+    @projects = [renuo_project, Project.first, Project.second, Project.third, closed_project]
     @issues = [
       create(:issue, id: 100, subject: 'Very special Renuo issue', project: @projects[0]),
       create(:issue, id: 101, subject: 'Second special Renuo issue', project: @projects[1]),
-      create(:issue, :closed, id: 102, subject: 'Closed issue', project: @projects[2])
+      create(:issue, :closed, id: 102, subject: 'Closed issue', project: @projects[2]),
+      create(:issue, id: 200, subject: 'My project is not open', project: closed_project)
     ]
   end
 
@@ -42,6 +45,14 @@ class IssueSearcherTest < ActiveSupport::TestCase
     assert_equal [], @service.call(search_term, Issue.all)
   end
 
+  test 'call - filters issues belonging to a closed project' do
+    issue_search_term = 'My project is not open'
+    project_search_term = 'closed project'
+
+    assert_not_includes @service.call(issue_search_term, Issue.all), @issues[3]
+    assert_not_includes @service.call(project_search_term, Issue.all), @issues[3]
+  end
+
   test 'call - hits by id are first' do
     second_issue = FactoryBot.create(:issue, id: 103, subject: '100th issue', project: Project.first)