make Pseudonym#unique_id sis sticky refs #5897

Change-Id: If969d8bfd8844a2dcd5263a11c9bc06dcaa47c55
Reviewed-on: https://gerrit.instructure.com/6092
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>

Author: ccutrer

app/models/pseudonym.rb

@@ -41,7 +41,10 @@ class Pseudonym < ActiveRecord::Base
   has_a_broadcast_policy
 
   attr_accessor :path, :path_type
-  
+
+  include StickySisFields
+  are_sis_sticky :unique_id
+
   acts_as_authentic do |config|
     config.validates_format_of_login_field_options = {:with => /\A\w[\w\.\+\-_@ =]*\z/}
     config.login_field :unique_id

db/migrate/20111010214049_add_pseudonym_sis_stickiness.rb

@@ -0,0 +1,10 @@
+class AddPseudonymSisStickiness < ActiveRecord::Migration
+  def self.up
+    add_column :pseudonyms, :stuck_sis_fields, :text
+    execute("UPDATE pseudonyms SET stuck_sis_fields='unique_id' WHERE sis_source_id<>unique_id")
+  end
+
+  def self.down
+    drop_column :pseudonyms, :stuck_sis_fields
+  end
+end

lib/sis/user_importer.rb

@@ -30,9 +30,11 @@ def process(updates_every, messages)
       importer = Work.new(@batch_id, @root_account, @logger, updates_every, messages)
       User.skip_updating_account_associations do
         User.process_as_sis(@override_sis_stickiness) do
-          yield importer
-          while importer.any_left_to_process?
-            importer.process_batch
+          Pseudonym.process_as_sis(@override_sis_stickiness) do
+            yield importer
+            while importer.any_left_to_process?
+              importer.process_batch
+            end
           end
         end
       end
@@ -123,7 +125,7 @@ def process_batch
             end
 
             pseudo ||= Pseudonym.new
-            pseudo.unique_id = login_id
+            pseudo.unique_id = login_id unless pseudo.stuck_sis_fields.include?(:unique_id)
             pseudo.sis_source_id = login_id
             pseudo.sis_user_id = user_id
             pseudo.account = @root_account

spec/lib/sis_csv_importer_spec.rb

@@ -1032,6 +1032,32 @@ def gen_ssha_password(password)
       p.communication_channel_id.should == user1.communication_channels.unretired.first.id
     end
 
+    it "should handle stickiness" do
+      process_csv_data_cleanly(
+        "user_id,login_id,first_name,last_name,email,status",
+        "user_1,user1,User,Uno,,active"
+      )
+      p = Pseudonym.find_by_unique_id('user1')
+      p.unique_id = 'user5'
+      p.save!
+      process_csv_data_cleanly(
+        "user_id,login_id,first_name,last_name,email,status",
+        "user_1,user3,User,Uno,,active"
+      )
+      p.reload
+      p.unique_id.should == 'user5'
+      Pseudonym.find_by_unique_id('user1').should be_nil
+      Pseudonym.find_by_unique_id('user3').should be_nil
+      process_csv_data_cleanly(
+        "user_id,login_id,first_name,last_name,email,status",
+        "user_1,user3,User,Uno,,active",
+        {:override_sis_stickiness => true}
+      )
+      p.reload
+      p.unique_id.should == 'user3'
+      Pseudonym.find_by_unique_id('user1').should be_nil
+      Pseudonym.find_by_unique_id('user5').should be_nil
+    end
   end
 
   context 'enrollment importing' do