copy rubrics associated with assignment even when not selected

Previously rubrics used by an assignment wouldn't copy unless
the rubric was selected. This makes it so that an assignment
will always bring its rubric when copied.

This also copies the two rubric properties you can select
when adding a rubric to an assignment.

Test Plan:
 * Create an assignment with a rubric. Mark the rubric to be used for grading
 * Copy the course and don't select the rubric to be copied
 * In the new course the rubric should be there, and should be used for grading

closes #8474 #8475

Change-Id: I3c117c10c159fed2d8a3d6c083f8251e8a97bee6
Reviewed-on: https://gerrit.instructure.com/10606
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>

Author: bracken

app/models/assignment.rb

@@ -1569,7 +1569,12 @@ def self.import_from_migration(hash, context, item=nil)
     new_record = item.new_record?
     if hash[:rubric_migration_id]
       rubric = context.rubrics.find_by_migration_id(hash[:rubric_migration_id])
-      rubric.associate_with(item, context, :purpose => 'grading') if rubric
+      if rubric
+        assoc = rubric.associate_with(item, context, :purpose => 'grading')
+        assoc.use_for_grading = !!hash[:rubric_use_for_grading] if hash.has_key?(:rubric_use_for_grading)
+        assoc.hide_score_total = !!hash[:rubric_hide_score_total] if hash.has_key?(:rubric_hide_score_total)
+        assoc.save
+      end
     end
     if hash[:grading_standard_migration_id]
       gs = context.grading_standards.find_by_migration_id(hash[:grading_standard_migration_id])

lib/cc/assignment_resources.rb

@@ -80,7 +80,12 @@ def self.create_assignment(node, assignment)
       node.peer_reviews_due_at CCHelper::ims_datetime(assignment.peer_reviews_due_at) if assignment.peer_reviews_due_at
       node.assignment_group_identifierref CCHelper.create_key(assignment.assignment_group)
       node.grading_standard_identifierref CCHelper.create_key(assignment.grading_standard) if assignment.grading_standard
-      node.rubric_identifierref CCHelper.create_key(assignment.rubric) if assignment.rubric
+      if assignment.rubric
+        assoc = assignment.rubric_association
+        node.rubric_identifierref CCHelper.create_key(assignment.rubric)
+        node.rubric_use_for_grading assoc.use_for_grading
+        node.rubric_hide_score_total assoc.hide_score_total
+      end
       node.quiz_identifierref CCHelper.create_key(assignment.quiz) if assignment.quiz
       node.allowed_extensions assignment.allowed_extensions.join(',') unless assignment.allowed_extensions.blank?
       atts = [:points_possible, :min_score, :max_score, :mastery_score, :grading_type,

lib/cc/importer/canvas/assignment_converter.rb

@@ -57,7 +57,8 @@ def convert_assignment(meta_doc, html_doc=nil)
       end
       ["all_day", "turnitin_enabled", "peer_reviews_assigned", "peer_reviews", 
        "automatic_peer_reviews", "anonymous_peer_reviews", "freeze_on_copy",
-       "grade_group_students_individually", "external_tool_new_tab"].each do |bool_val|
+       "grade_group_students_individually", "external_tool_new_tab",
+       "rubric_use_for_grading", "rubric_hide_score_total"].each do |bool_val|
         val = get_bool_val(meta_doc, bool_val)
         assignment[bool_val] = val unless val.nil?
       end

lib/cc/rubrics.rb

@@ -40,7 +40,12 @@ def create_rubrics(document=nil)
       ) do |rubrics_node|
         @course.rubric_associations.each do |assoc|
           rubric = assoc.rubric
-          next if rubric.nil? || !rubric.active? || !export_object?(rubric) || imported_rubrics[rubric.id]
+          next if rubric.nil? || !rubric.active? || imported_rubrics[rubric.id]
+          if !export_object?(rubric)
+            if assoc.association_type != "Assignment" || !export_object?(assoc.association)
+              next
+            end
+          end
           imported_rubrics[rubric.id] = true
 
           migration_id = CCHelper.create_key(rubric)

lib/cc/xsd/cccv1p0.xsd

@@ -77,6 +77,8 @@
       <xs:element name="assignment_group_identifierref" type="xs:string" minOccurs="0"/>
       <xs:element name="grading_standard_identifierref" type="xs:string" minOccurs="0"/>
       <xs:element name="rubric_identifierref" type="xs:string" minOccurs="0"/>
+      <xs:element name="rubric_use_for_grading" type="xs:boolean" minOccurs="0"/>
+      <xs:element name="rubric_hide_score_total" type="xs:boolean" minOccurs="0"/>
       <xs:element name="quiz_identifierref" type="xs:string" minOccurs="0"/>
       <xs:element name="allowed_extensions" type="xs:string" minOccurs="0"/>
       <xs:element name="points_possible" type="xs:float" minOccurs="0"/>

spec/models/content_migration_spec.rb

@@ -438,20 +438,42 @@ def mig_id(obj)
       @copy_to.discussion_topics.find_by_migration_id(mig_id(topic)).should_not be_nil
     end
 
-    it "should still associate rubrics and assignments" do
-      rubric = @copy_from.rubrics.new
-      rubric.title = "Rubric"
-      rubric.data = [{:ratings=>[{:criterion_id=>"309_6312", :points=>5, :description=>"Full Marks", :id=>"blank", :long_description=>""}, {:criterion_id=>"309_6312", :points=>0, :description=>"No Marks", :id=>"blank_2", :long_description=>""}], :points=>5, :description=>"Description of criterion", :id=>"309_6312", :long_description=>""}]
-      rubric.save!
+    def create_rubric_asmnt
+      @rubric = @copy_from.rubrics.new
+      @rubric.title = "Rubric"
+      @rubric.data = [{:ratings=>[{:criterion_id=>"309_6312", :points=>5, :description=>"Full Marks", :id=>"blank", :long_description=>""}, {:criterion_id=>"309_6312", :points=>0, :description=>"No Marks", :id=>"blank_2", :long_description=>""}], :points=>5, :description=>"Description of criterion", :id=>"309_6312", :long_description=>""}]
+      @rubric.save!
 
-      assignment = @copy_from.assignments.create!(:title => "some assignment", :assignment_group => @group, :points_possible => 12)
-      rubric.associate_with(assignment, @copy_from, :purpose => 'grading', :use_for_grading => true)
+      @assignment = @copy_from.assignments.create!(:title => "some assignment", :points_possible => 12)
+      assoc = @rubric.associate_with(@assignment, @copy_from, :purpose => 'grading', :use_for_grading => true)
+      assoc.hide_score_total = true
+      assoc.use_for_grading = true
+      assoc.save!
+    end
+
+    it "should still associate rubrics and assignments and copy rubric association properties" do
+      create_rubric_asmnt
+      run_course_copy
+
+      rub = @copy_to.rubrics.find_by_migration_id(mig_id(@rubric))
+      rub.should_not be_nil
+      asmnt2 = @copy_to.assignments.find_by_migration_id(mig_id(@assignment))
+      asmnt2.rubric.id.should == rub.id
+      asmnt2.rubric_association.use_for_grading.should == true
+      asmnt2.rubric_association.hide_score_total.should == true
+    end
 
+    it "should copy rubrics associated with assignments when rubric isn't selected" do
+      create_rubric_asmnt
+      @cm.copy_options = {
+              :assignments => {mig_id(@assignment) => "1"},
+      }
+      @cm.save!
       run_course_copy
 
-      rub = @copy_to.rubrics.find_by_migration_id(mig_id(rubric))
+      rub = @copy_to.rubrics.find_by_migration_id(mig_id(@rubric))
       rub.should_not be_nil
-      asmnt2 = @copy_to.assignments.find_by_migration_id(mig_id(assignment))
+      asmnt2 = @copy_to.assignments.find_by_migration_id(mig_id(@assignment))
       asmnt2.rubric.id.should == rub.id
     end