fix question counts for quizzes on index page

fixes CNVS-7357

test plan
- make sure that the question counts are correct for both unpublished/published
  quizzes on the index page

Change-Id: I7fdaa9d4d762455ad7caa2ac82282a98e8385811
Reviewed-on: https://gerrit.instructure.com/23053
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>

Author: Derek DeVries

app/models/quiz.rb

@@ -412,7 +412,11 @@ def question_count(force_check=false)
     end
     question_count || 0
   end
-  
+
+  def available_question_count
+    published? ? question_count : unpublished_question_count
+  end
+
   # Returns data for the SAVED version of the quiz.  That is, not
   # the version found by gathering relationships on the Quiz data models,
   # but the version being held in Quiz.quiz_data.  Caches the result

lib/api/v1/quiz.rb

@@ -78,7 +78,7 @@ def quiz_json(quiz, context, user, session)
     hash = api_json(quiz, user, session, API_ALLOWED_QUIZ_OUTPUT_FIELDS).merge(
       :html_url => polymorphic_url([context, quiz]),
       :mobile_url => polymorphic_url([context, quiz], :persist_headless => 1, :force_user => 1),
-      :question_count => quiz.question_count + quiz.unpublished_question_count,
+      :question_count => quiz.available_question_count,
       :published => quiz.published?
     )
     locked_json(hash, quiz, user, 'quiz', :context => context)

spec/models/quiz_spec.rb

@@ -323,6 +323,25 @@
     q.unpublished_question_count.should eql(3)
   end
 
+  it "should return an available question count for unpublished questions" do
+    q = @course.quizzes.create!(:title => "new quiz")
+    q.quiz_questions.create!
+    q.quiz_questions.create!
+    q.save
+
+    q.reload.available_question_count.should eql(2)
+  end
+
+  it "should return an available question count for published questions" do
+    q = @course.quizzes.create!(:title => "new quiz")
+    q.quiz_questions.create!
+    q.quiz_questions.create!
+    q.save
+    q.publish!
+
+    q.reload.available_question_count.should eql(2)
+  end
+
   it "should return processed root entries for each question/group" do
     q = @course.quizzes.create!(:title => "new quiz")
     g = q.quiz_groups.create!(:name => "group 1", :pick_count => 1, :question_points => 2)