OTWO-7207 Remove enlistments only on project deletion (#1771)

blackducksoftware · Mar 7, 2024 · 30ba479 · 30ba479
1 parent 32ca50f
commit 30ba479
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/controllers/autocompletes_controller.rb b/app/controllers/autocompletes_controller.rb
@@ -6,7 +6,7 @@ class AutocompletesController < ApplicationController
   before_action :set_projects_to_ignore, only: :projects_for_stack
 
   def account
-    accounts = params[:term].blank? ? [] : Account.simple_search(params[:term])
+    accounts = params[:term].blank? ? [] : Account.in_good_standing.simple_search(params[:term])
     render json: accounts.map { |a| { login: a.login, name: a.name, value: a.login, id: a.id } }
   end
 

diff --git a/app/models/project.rb b/app/models/project.rb
@@ -105,7 +105,7 @@ def badges_summary
   end
 
   def after_undo(current_user)
-    remove_enlistments(current_user)
+    remove_enlistments(current_user) if deleted?
   end
 
   class << self

diff --git a/test/controllers/autocompletes_controller_test.rb b/test/controllers/autocompletes_controller_test.rb
@@ -5,11 +5,15 @@
 class AutocompletesControllerTest < ActionController::TestCase
   describe 'account' do
     it 'should return account hash' do
-      account = create(:account)
-      get :account, params: { term: account.login }, xhr: true
+      account = create(:account, login: 'good-user')
+      create(:account, level: Account::Access::SPAM, login: 'bad-user-1')
+      create(:account, level: Account::Access::DISABLED, login: 'bad-user-2')
+
+      get :account, params: { term: '-user' }, xhr: true
       assert_response :ok
 
       result = JSON.parse(response.body)
+      _(result.count).must_equal 1
       _(result.first['login']).must_equal account.login
       _(result.first['value']).must_equal account.login
       _(result.first['name']).must_equal account.name