allow adding course users by sis id

test plan:
* create a user and login with a sis id
* confirm that the user can be added to a course
through the course 'People' page, by including
their sis id in the list (just as with the login id)

closes #CNVS-7086

Change-Id: Ia4369ba5e78083c233b3921aa1b9246f2db6824e
Reviewed-on: https://gerrit.instructure.com/22647
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>

Author: maneframe

lib/user_list.rb

@@ -148,11 +148,13 @@ def resolve
     # Search for matching pseudonyms
     Shard.partition_by_shard(all_account_ids) do |account_ids|
       Pseudonym.active.
-          select('unique_id AS address, users.name AS name, user_id, account_id').
+          select('unique_id AS address, users.name AS name, user_id, account_id, sis_user_id').
           joins(:user).
-          where("pseudonyms.workflow_state='active' AND LOWER(unique_id) IN (?) AND account_id IN (?)", @addresses.map {|x| x[:address].downcase}, account_ids).
+          where("pseudonyms.workflow_state='active' AND (LOWER(unique_id) IN (?) OR sis_user_id IN (?)) AND account_id IN (?)", @addresses.map {|x| x[:address].downcase}, @addresses.map {|x| x[:address]}, account_ids).
           map { |pseudonym| pseudonym.attributes.symbolize_keys }.each do |login|
-        addresses = @addresses.select { |a| a[:address].downcase == login[:address].downcase }
+        addresses = @addresses.select { |a| a[:address].downcase == login[:address].downcase ||
+            a[:address] ==  login[:sis_user_id]}
+        login.delete(:sis_user_id)
         addresses.each do |address|
           # already found a matching pseudonym
           if address[:user_id]

spec/lib/user_list_spec.rb

@@ -138,19 +138,25 @@
     ul.duplicate_addresses.length.should == 1
   end
 
-  it "should process login ids and email addresses" do
+  it "should process login ids, SIS ids, and email addresses" do
     user = User.create!(:name => 'A 112351243')
     user.pseudonyms.create!(:unique_id => "A112351243", :account => @account)
     user = User.create!(:name => 'user 1')
     user.pseudonyms.create!(:unique_id => "user1", :account => @account)
-    ul = UserList.new regular + "," + %{user1,test@example.com,A112351243,"thomas walsh" <test2@example.com>, "walsh, thomas" <test3@example.com>}, :root_account => @account
+    user = User.create!(:name => 'sneaky hobbitses')
+    p = user.pseudonyms.create!(:unique_id => "whatever", :account => @account)
+    p.sis_user_id = '9001'
+    p.save!
+
+    ul = UserList.new regular + "," + %{user1,test@example.com,A112351243,"thomas walsh" <test2@example.com>, 9001, "walsh, thomas" <test3@example.com>}, :root_account => @account
     ul.addresses.map{|x| [x[:name], x[:address], x[:type]]}.should eql([
         ["Shaw, Ryan", "ryankshaw@gmail.com", :email],
         ["Last, First", "lastfirst@gmail.com", :email],
         ["user 1", "user1", :pseudonym],
         [nil, "test@example.com", :email],
         ["A 112351243", "A112351243", :pseudonym],
         ["thomas walsh", "test2@example.com", :email],
+        ["sneaky hobbitses", "whatever", :pseudonym],
         ["walsh, thomas", "test3@example.com", :email]])
     ul.errors.should == []
     ul.duplicate_addresses.should == []