calendar events api: include user_submitted on assignments

refs CNVS-16237

test plan:
  * open your browser console
  * load the calendar
  * open the type=assignment API request
  * verify that each assignment returned has user_submitted
      (on the inner assignment hash)
  * verify that user_submitted corresponds to having a submission

Change-Id: I41f99d3239e040fd6775f13aea88f4ce50b3b33e
Reviewed-on: https://gerrit.instructure.com/42747
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Braden Anderson <braden@instructure.com>

Author: bluej100

app/controllers/calendar_events_api_controller.rb

@@ -306,6 +306,7 @@ def index
     events = Api.paginate(scope, self, api_v1_calendar_events_url)
     ActiveRecord::Associations::Preloader.new(events, :child_events).run if @type == :event
     events = apply_assignment_overrides(events) if @type == :assignment
+    mark_submitted_assignments(@current_user, events) if @type == :assignment
 
     if @errors.empty?
       render :json => events.map { |event| event_json(event, @current_user, session) }
@@ -824,6 +825,15 @@ def apply_assignment_overrides(events)
     events
   end
 
+  def mark_submitted_assignments(user, assignments)
+    submitted_ids = Submission.where("submission_type IS NOT NULL").
+      where(user_id: user, assignment_id: assignments).
+      pluck(:assignment_id)
+    assignments.each do |assignment|
+      assignment.user_submitted = submitted_ids.include? assignment.id
+    end
+  end
+
   def manageable_appointment_group_codes
     return [] unless @current_user
 

app/models/assignment.rb

@@ -54,7 +54,7 @@ class Assignment < ActiveRecord::Base
     :rubric, :context, :grading_standard, :group_category
   ]
 
-  attr_accessor :previous_id, :updating_user, :copying
+  attr_accessor :previous_id, :updating_user, :copying, :user_submitted
 
   attr_reader :assignment_changed
 

lib/api/v1/assignment.rb

@@ -75,6 +75,10 @@ def assignment_json(assignment, user, session, opts = {})
     hash['submission_types'] = assignment.submission_types_array
     hash['has_submitted_submissions'] = assignment.has_submitted_submissions?
 
+    if !assignment.user_submitted.nil?
+      hash['user_submitted'] = assignment.user_submitted
+    end
+
     if assignment.context && assignment.context.turnitin_enabled?
       hash['turnitin_enabled'] = assignment.turnitin_enabled
       hash['turnitin_settings'] = turnitin_settings_json(assignment)

spec/apis/v1/calendar_events_api_spec.rb

@@ -859,6 +859,24 @@ def prepare(as_student = false)
       json.first['due_at'].should be_nil
     end
 
+    it 'should mark assignments with user_submitted' do
+      e1 = @course.assignments.create(:title => '1', :due_at => '2012-01-07 12:00:00')
+      e2 = @course.assignments.create(:title => '2', :due_at => '2012-01-08 12:00:00')
+
+      sub = e1.find_or_create_submission(@user)
+      sub.submission_type = 'online_quiz'
+      sub.workflow_state = 'submitted'
+      sub.save!
+
+      json = api_call(:get, "/api/v1/calendar_events?type=assignment&start_date=2012-01-06&end_date=2012-01-09&context_codes[]=course_#{@course.id}", {
+        :controller => 'calendar_events_api', :action => 'index', :format => 'json', :type => 'assignment',
+        :context_codes => ["course_#{@course.id}"], :start_date => '2012-01-06', :end_date => '2012-01-09'})
+
+      expect(json.size).to eql 2
+      expect(json[0]['assignment']['user_submitted']).to be_truthy
+      expect(json[1]['assignment']['user_submitted']).to be_falsy
+    end
+
     context 'unpublished assignments' do
       before :once do
         @course1 = @course