fix quiz re-importing with unique assignment index

test plan:
* create a course with a published quiz
* export the course to .imscc file
* reimport the file back into the course
* should not give an import error

* copy the course
* import the file into the new course
* should not get an import error

* create a new course
* import the file into the course
* copy in from the original course
* should not get an import error

fixes #CNVS-7249

Change-Id: Ieb5d5cf9de0cb8a1465f2f7e704c5db0cef7098e
Reviewed-on: https://gerrit.instructure.com/23010
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>

Author: maneframe

app/models/assignment.rb

@@ -1520,7 +1520,7 @@ def self.process_migration(data, migration)
   end
 
 
-  def self.import_from_migration(hash, context, item=nil)
+  def self.import_from_migration(hash, context, item=nil, quiz=nil)
     hash = hash.with_indifferent_access
     return nil if hash[:migration_id] && hash[:assignments_to_import] && !hash[:assignments_to_import][hash[:migration_id]]
     item ||= find_by_context_type_and_context_id_and_id(context.class.to_s, context.id, hash[:id])
@@ -1609,14 +1609,18 @@ def self.import_from_migration(hash, context, item=nil)
       gs = context.grading_standards.find_by_migration_id(hash[:grading_standard_migration_id])
       item.grading_standard = gs if gs
     end
-    if hash[:quiz_migration_id]
-      if quiz = context.quizzes.find_by_migration_id(hash[:quiz_migration_id])
-        # the quiz is published because it has an assignment
-        quiz.assignment = item
-        quiz.generate_quiz_data
-        quiz.published_at = Time.now
-        quiz.workflow_state = 'available'
-        quiz.save
+    if quiz
+      item.quiz = quiz
+    elsif hash[:quiz_migration_id]
+      if q = context.quizzes.find_by_migration_id(hash[:quiz_migration_id])
+        if !item.quiz || item.quiz.id == q.id
+          # the quiz is published because it has an assignment
+          q.assignment = item
+          q.generate_quiz_data
+          q.published_at = Time.now
+          q.workflow_state = 'available'
+          q.save
+        end
       end
       item.submission_types = 'online_quiz'
       item.saved_by = :quiz

app/models/quiz.rb

@@ -1067,7 +1067,8 @@ def self.import_from_migration(hash, context, question_data, item=nil, allow_upd
     item.reload # reload to catch question additions
 
     if hash[:assignment] && hash[:available]
-      item.assignment = Assignment.import_from_migration(hash[:assignment], context, item.assignment)
+      hash[:assignment][:migration_id] += "_#{item.id}" if hash[:assignment][:migration_id]
+      item.assignment = Assignment.import_from_migration(hash[:assignment], context, item.assignment, item)
     elsif !item.assignment && grading = hash[:grading]
       # The actual assignment will be created when the quiz is published
       item.quiz_type = 'assignment'

lib/canvas/migration/migrator_helper.rb

@@ -194,6 +194,10 @@ def prepend_id_to_questions(questions, prepend_value=nil)
   def prepend_id_to_assessments(assessments, prepend_value=nil)
     assessments.each do |a|
       a[:migration_id] = prepend_id(a[:migration_id], prepend_value)
+      if h = a[:assignment]
+        h[:migration_id] = prepend_id(h[:migration_id], prepend_value)
+      end
+
       a[:questions].each do |q|
         if q[:question_type] == "question_reference"
           q[:migration_id] = prepend_id(q[:migration_id], prepend_value)

spec/lib/cc/importer/canvas_cartridge_converter_spec.rb

@@ -920,7 +920,7 @@ def import_learning_outcomes
 
     Quiz.import_from_migration(quiz_hash, @copy_to, {})
     q = @copy_to.quizzes.find_by_migration_id("ie3d8f8adfad423eb225229c539cdc450")
-    a = @copy_to.assignments.find_by_migration_id("i0c012cbae54b972138520466e557f5e4")
+    a = q.assignment
     a.assignment_group.id.should == ag.id
     q.assignment_group_id.should == ag.id
   end

spec/models/content_migration_spec.rb

@@ -767,6 +767,40 @@ def create_outcome(context, group=nil)
       @copy_to.quizzes.find_by_migration_id(mig_id(@quiz)).should_not be_nil
     end
 
+    it "should create a new assignment if copying a new quiz (even if the assignment migration_id matches)" do
+      pending unless Qti.qti_enabled?
+      quiz = @copy_from.quizzes.create!(:title => "new quiz")
+      quiz2 = @copy_to.quizzes.create!(:title => "already existing quiz")
+
+      [quiz, quiz2].each do |q|
+        q.did_edit
+        q.offer!
+      end
+
+      a = quiz2.assignment
+      a.migration_id = mig_id(quiz.assignment)
+      a.save!
+
+      run_course_copy
+
+      @copy_to.quizzes.map(&:title).sort.should == ["already existing quiz", "new quiz"]
+      @copy_to.assignments.map(&:title).sort.should == ["already existing quiz", "new quiz"]
+
+      # Re-copying should find and update the old "new" quiz and assignment
+      @cm = ContentMigration.new(:context => @copy_to, :user => @user, :source_course => @copy_from, :copy_options => {:everything => "1"})
+      @cm.user = @user
+      @cm.migration_settings[:import_immediately] = true
+      @cm.save!
+
+      quiz.title = "mwhaha changed"
+      quiz.save!
+
+      run_course_copy
+
+      @copy_to.quizzes.map(&:title).sort.should == ["already existing quiz", "mwhaha changed"]
+      @copy_to.assignments.map(&:title).sort.should == ["already existing quiz", "mwhaha changed"]
+    end
+
     it "should have correct question count on copied surveys and practive quizzes" do
       pending unless Qti.qti_enabled?
       sp = @copy_from.quizzes.create!(:title => "survey pub", :quiz_type => "survey")