DA - needs grading

fixes CNVS-15482

test plan:
 * with DA on
 - create an assignment and submit it as several students in different sections
 - as a teacher again, change the assignment to only be visible to one section
   (one that has student submissions)
 > on your dashboard, only the students' submissions from that section
   should show in your 'needs grading' right-side bar
 > on the course dashboard the same should be true
 - as a section limited teacher who is limited to the section with visibility,
   your dashboard and course dashboard should only show
   submissions from your section as needing grading

 * with DA off
 - repeat the steps above and all submissions should be in the needs grading
   count in all places

Change-Id: I6c2fad7d7dea42c2e7edc968e8db113bdcab3a3c
Reviewed-on: https://gerrit.instructure.com/41604
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>

Author: cameronsutter

app/models/assignments/needs_grading_count_query.rb

@@ -13,7 +13,7 @@ def count
         Rails.cache.fetch(['assignment_user_grading_count', assignment, user].cache_key) do
           case visibility_level
           when :full, :limited
-            assignment.needs_grading_count
+            da_enabled? ? manual_count : assignment.needs_grading_count
           when :sections
             section_filtered_submissions.count(:id, distinct: true)
           else
@@ -40,13 +40,21 @@ def count_by_section
       end
     end
 
+    def manual_count
+      assignment.shard.activate do
+        Rails.cache.fetch(['assignment_user_grading_manual_count', assignment, user].cache_key) do
+          all_submissions.count
+        end
+      end
+    end
+
     private
     def section_filtered_submissions
       all_submissions.where('e.course_section_id in (?)', visible_section_ids)
     end
 
     def all_submissions
-      joined_submissions.where(<<-SQL, assignment, course)
+      string = <<-SQL
         submissions.assignment_id = ?
           AND e.course_id = ?
           AND e.type IN ('StudentEnrollment', 'StudentViewEnrollment')
@@ -56,6 +64,13 @@ def all_submissions
             OR (submissions.workflow_state = 'submitted'
               AND (submissions.score IS NULL OR NOT submissions.grade_matches_current_submission)))
         SQL
+
+      if da_enabled?
+        string += <<-SQL
+          AND EXISTS (SELECT * FROM assignment_student_visibilities asv WHERE asv.user_id = submissions.user_id AND asv.assignment_id = submissions.assignment_id)
+        SQL
+      end
+      joined_submissions.where(string, assignment, course)
     end
 
     def joined_submissions
@@ -77,5 +92,9 @@ def section_visibilities
     def course
       assignment.context
     end
+
+    def da_enabled?
+      course.feature_enabled?(:differentiated_assignments)
+    end
   end
 end

app/models/submission.rb

@@ -144,6 +144,11 @@ def self.needs_grading_trigger_sql
       AND #{Enrollment.active_student_subselect("user_id = NEW.user_id AND course_id = assignments.context_id")};
       SQL
 
+    # TODO: add this to the SQL above when DA is on for everybody
+    # and don't forget to run `rake db:generate_trigger_migration`
+    # and remove NeedsGradingCountQuery#manual_count
+    # AND EXISTS(SELECT assignment_student_visibilities.* WHERE assignment_student_visibilities.user_id = NEW.user_id AND assignment_student_visibilities.assignment_id = NEW.assignment_id);
+
     { :default    => default_sql.gsub("{{now}}", "now()"),
       :postgresql => default_sql.gsub("{{now}}", "now() AT TIME ZONE 'UTC'"),
       :sqlite     => default_sql.gsub("{{now}}", "datetime('now')"),

spec/models/assignments/needs_grading_count_query_spec.rb

@@ -90,6 +90,5 @@ module Assignments
         end
       end
     end
-
   end
 end

spec/models/user_spec.rb

@@ -2350,6 +2350,31 @@ def create_course_with_assignment_needing_submitting(opts={})
         @teacher.assignments_needing_grading(:limit => 1).length.should == 1
       end
     end
+
+    context "differentiated assignments" do
+      before :once do
+        @a2 = @course1.assignments.create!(:title => "some assignment 2", :submission_types => ['online_text_entry'])
+        [@studentA, @studentB].each do |student|
+          @a2.submit_homework student, body: "submission for #{student.name}"
+        end
+
+        @section1a = @course1.course_sections.create!(name: 'Section One')
+        student_in_section(@section1a, user: @studentB)
+
+        assignments = @course1.assignments
+        differentiated_assignment(assignment: assignments[0], course_section: @section1b)
+        differentiated_assignment(assignment: assignments[1], course_section: @section1a)
+      end
+
+      it "should not include submissions from students without visibility" do
+        @course1.enable_feature!(:differentiated_assignments)
+        @teacher.assignments_needing_grading.length.should == 2
+      end
+
+      it "should show all submissions with the feature flag off" do
+        @teacher.assignments_needing_grading.length.should == 3
+      end
+    end
   end
 
   describe ".initial_enrollment_type_from_type" do