exclude non-active e-mail address from user search

fixes instructuregh-689

test plan:
 * see the github ticket

Change-Id: I90a29ca9b898c72e4aeb4c0a00ebcb3d91dd1880
Reviewed-on: https://gerrit.instructure.com/62996
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>

Author: ccutrer

lib/user_search.rb

@@ -96,13 +96,13 @@ def self.complex_sql
       (EXISTS (SELECT 1 FROM #{Pseudonym.quoted_table_name}
          WHERE #{like_condition('pseudonyms.sis_user_id')} 
            AND pseudonyms.user_id = users.id 
-           AND (pseudonyms.workflow_state IS NULL 
-             OR pseudonyms.workflow_state != 'deleted'))
-           OR (#{like_condition('users.name')}) 
-             OR EXISTS (SELECT 1 FROM #{CommunicationChannel.quoted_table_name}
-               WHERE communication_channels.user_id = users.id 
-                 AND (communication_channels.path_type = ? 
-                 AND #{like_condition('communication_channels.path')})))
+           AND pseudonyms.workflow_state='active')
+       OR (#{like_condition('users.name')})
+       OR EXISTS (SELECT 1 FROM #{CommunicationChannel.quoted_table_name}
+         WHERE communication_channels.user_id = users.id
+           AND communication_channels.path_type = ?
+           AND #{like_condition('communication_channels.path')}
+           AND communication_channels.workflow_state='active'))
     SQL
   end
 

spec/lib/user_search_spec.rb

@@ -162,7 +162,11 @@
         end
 
         describe 'searching on emails' do
-          before { user.communication_channels.create!(:path => 'the.giver@example.com', :path_type => CommunicationChannel::TYPE_EMAIL) }
+          let(:cc) { user.communication_channels.create!(path: 'the.giver@example.com') }
+
+          before do
+            cc.confirm!
+          end
 
           it 'matches against an email' do
             expect(UserSearch.for_user_in_context("the.giver", course, user)).to eq [user]
@@ -175,7 +179,12 @@
           end
 
           it 'will not match channels where the type is not email' do
-            user.communication_channels.last.update_attributes!(:path_type => CommunicationChannel::TYPE_TWITTER)
+            cc.update_attributes!(:path_type => CommunicationChannel::TYPE_TWITTER)
+            expect(UserSearch.for_user_in_context("the.giver", course, user)).to eq []
+          end
+
+          it "doesn't match retired channels" do
+            cc.retire!
             expect(UserSearch.for_user_in_context("the.giver", course, user)).to eq []
           end
         end