Handling edge case when fewer than 2 active ideas

Dhruv Kapadia
1 parent f25abd1e
Showing 6 changed files with 40 additions and 45 deletions Show diff stats
app/controllers/choices_controller.rb
app/controllers/prompts_controller.rb
app/controllers/questions_controller.rb
app/models/choice.rb
app/models/question.rb
lib/activation.rb
@@ -80,7 +80,7 @@ class ChoicesController &lt; InheritedResources::Base
         visitor_ideas = Proc.new { |options| options[:builder].tag!('visitor_ideas', visitor.items.count) }
         format.xml { render :xml => @choice.to_xml(:procs => [saved_choice_id, choice_status, visitor_votes, visitor_ideas]), :status => :ok }
-        # format.xml { render :xml => @question.picked_prompt.to_xml(:methods => [:left_choice_text, :right_choice_text], :procs => [saved_choice_id, choice_status]), :status => :ok }
+	# TODO: Why are we rendering a question here? Is the prompt being used later on?
         format.json { render :json => @question.to_json(:procs => [saved_choice_id, choice_status]), :status => :ok }
       else
         format.xml { render :xml => @choice.errors, :status => :unprocessable_entity }
@@ -98,7 +98,6 @@ class ChoicesController &lt; InheritedResources::Base
     respond_to do |format|
       if @choice.activate!
         logger.info "successfully activated choice #{@choice.inspect}"
-	Question.update_counters(@question.id, :inactive_choices_count => -1)
         format.xml { render :xml => true }
         format.json { render :json => true }
       else
@@ -121,7 +120,6 @@ class ChoicesController &lt; InheritedResources::Base
         format.json { render :json => false }
       elsif @choice.deactivate!
         logger.info "successfully deactivated choice #{@choice.inspect}"
-	Question.update_counters(@question.id, :inactive_choices_count => 1 )
         format.xml { render :xml => true }
         format.json { render :json => true }
       else
@@ -197,7 +195,6 @@ class ChoicesController &lt; InheritedResources::Base
     respond_to do |format|
 	    if @choice.deactivate!
                     flag = Flag.create!(flag_params)
-		    puts "I AM CREATING A FLAG FOR #{@choice.inspect}"
 		    format.xml { render :xml => @choice.to_xml, :status => :created }
 		    format.json { render :json => @choice.to_json, :status => :created }
 	    else
@@ -67,9 +67,7 @@ class PromptsController &lt; InheritedResources::Base
     #@prompt.choices.each(&:compute_score!)
     respond_to do |format|
-      if successful
-        
-	next_prompt = @question.choose_prompt
+      if successful && next_prompt = @question.choose_prompt
         visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
         @a = current_user.record_appearance(visitor, next_prompt)
@@ -111,6 +109,7 @@ class PromptsController &lt; InheritedResources::Base
     authenticate
     logger.info "#{current_user.inspect} is skipping."
     @question = Question.find(params[:question_id])
+
     @prompt = @question.prompts.find(params[:id]) #, :include => [{ :left_choice => :item }, { :right_choice => :item }])
     time_viewed = params['params']['time_viewed']
@@ -125,23 +124,7 @@ class PromptsController &lt; InheritedResources::Base
     respond_to do |format|
-      if @skip = current_user.record_skip(visitor_identifier, appearance_lookup, @prompt, time_viewed, :skip_reason => skip_reason)
-
-	if @question.uses_catchup?
-	      logger.info("Question #{@question.id} is using catchup algorithm!")
-	      @next_prompt = @question.pop_prompt_queue
-	      if @next_prompt.nil?
-		      @question.record_prompt_cache_miss
-		      logger.info("Catchup prompt cache miss! Nothing in prompt_queue")
-		      @next_prompt = @question.catchup_choose_prompt
-	      else
-		      @question.record_prompt_cache_hit
-	      end
-	      @question.send_later :add_prompt_to_queue
-	else
-		@next_prompt = @question.picked_prompt
-	end
-
+      if @skip = current_user.record_skip(visitor_identifier, appearance_lookup, @prompt, time_viewed, :skip_reason => skip_reason) && @next_prompt = @question.choose_prompt
         visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
         @a = current_user.record_appearance(visitor, @next_prompt)
@@ -152,11 +135,11 @@ class PromptsController &lt; InheritedResources::Base
         visitor_ideas = Proc.new { |options| options[:builder].tag!('visitor_ideas', visitor.items.count) }
-        format.xml { render :xml =>  @question.picked_prompt.to_xml(:procs => [appearance_id, visitor_votes, visitor_ideas],:methods => [:left_choice_text, :right_choice_text]), :status => :ok }
-        format.json { render :json => @question.picked_prompt.to_json, :status => :ok }
+        format.xml { render :xml =>  @next_prompt.to_xml(:procs => [appearance_id, visitor_votes, visitor_ideas],:methods => [:left_choice_text, :right_choice_text]), :status => :ok }
+        format.json { render :json => @next_prompt.to_json, :status => :ok }
       else
-        format.xml { render :xml => @skip, :status => :unprocessable_entity }
-        format.json { render :json => @skip, :status => :unprocessable_entity }
+        format.xml { render :xml => @prompt.to_xml, :status => :conflict}
+        format.json { render :json => @prompt.to_xml, :status => :conflict}
       end
     end
   end
@@ -60,6 +60,17 @@ class QuestionsController &lt; InheritedResources::Base
       @p = @question.choose_prompt(:algorithm => params[:algorithm])
+      if @p.nil?
+	      # could not find a prompt to choose
+	      # I don't know the best http code for the api to respond, but 409 seems the closes
+	      respond_to do |format|
+              format.xml { render :xml => @question, :status => :conflict  and return} 
+              format.json { render :json => @question, :status => :conflict and return} 
+	      end
+
+      end
+      # @question.create_new_appearance - returns appearance, which we can then get the prompt from.
+      # At the very least add 'if create_appearance is true,
       # we sometimes request a question when no prompt is displayed
       # TODO It would be a good idea to find these places and treat them like barebones
       if !visitor_identifier.blank? 
 class Choice < ActiveRecord::Base
-  include Activation
   belongs_to :question, :counter_cache => true
   belongs_to :item
@@ -103,6 +102,22 @@ class Choice &lt; ActiveRecord::Base
   end
+  def activate!
+    (self.active = true)
+    self.save!
+    Question.update_counters(self.question_id, :inactive_choices_count => -1)
+  end
+  
+  def suspend!
+    (self.active = false)
+    self.save!
+  end
+  
+  def deactivate!
+    (self.active = false)
+    self.save!
+    Question.update_counters(self.question_id, :inactive_choices_count => 1)
+  end
   protected
@@ -31,6 +31,11 @@ class Question &lt; ActiveRecord::Base
   def choose_prompt(options = {})
+          # if there is one or fewer active choices, we won't be able to find a prompt
+	  if self.choices_count - self.inactive_choices_count <= 1 
+		  return nil
+	  end
+
 	  if self.uses_catchup? || options[:algorithm] == "catchup"
 	      logger.info("Question #{self.id} is using catchup algorithm!")
 	      next_prompt = self.pop_prompt_queue
@@ -1,16 +0,0 @@
-module Activation
-  def activate!
-    (self.active = true)
-    self.save!
-  end
-  
-  def suspend!
-    (self.active = false)
-    self.save!
-  end
-  
-  def deactivate!
-    (self.active = false)
-    self.save!
-  end
-end
 \ No newline at end of file
	@@ -60,6 +60,17 @@ class QuestionsController < InheritedResources::Base		@@ -60,6 +60,17 @@ class QuestionsController < InheritedResources::Base
60		60
61	@p = @question.choose_prompt(:algorithm => params[:algorithm])	61	@p = @question.choose_prompt(:algorithm => params[:algorithm])
62		62
		63	+ if @p.nil?
		64	+ # could not find a prompt to choose
		65	+ # I don't know the best http code for the api to respond, but 409 seems the closes
		66	+ respond_to do \|format\|
		67	+ format.xml { render :xml => @question, :status => :conflict and return}
		68	+ format.json { render :json => @question, :status => :conflict and return}
		69	+ end
		70	+
		71	+ end
		72	+ # @question.create_new_appearance - returns appearance, which we can then get the prompt from.
		73	+ # At the very least add 'if create_appearance is true,
63	# we sometimes request a question when no prompt is displayed	74	# we sometimes request a question when no prompt is displayed
64	# TODO It would be a good idea to find these places and treat them like barebones	75	# TODO It would be a good idea to find these places and treat them like barebones
65	if !visitor_identifier.blank?	76	if !visitor_identifier.blank?
1	class Choice < ActiveRecord::Base	1	class Choice < ActiveRecord::Base
2	- include Activation
3		2
4	belongs_to :question, :counter_cache => true	3	belongs_to :question, :counter_cache => true
5	belongs_to :item	4	belongs_to :item
	@@ -103,6 +102,22 @@ class Choice < ActiveRecord::Base		@@ -103,6 +102,22 @@ class Choice < ActiveRecord::Base
103		102
104	end	103	end
105		104
		105	+ def activate!
		106	+ (self.active = true)
		107	+ self.save!
		108	+ Question.update_counters(self.question_id, :inactive_choices_count => -1)
		109	+ end
		110	+
		111	+ def suspend!
		112	+ (self.active = false)
		113	+ self.save!
		114	+ end
		115	+
		116	+ def deactivate!
		117	+ (self.active = false)
		118	+ self.save!
		119	+ Question.update_counters(self.question_id, :inactive_choices_count => 1)
		120	+ end
106		121
107	protected	122	protected
108		123
	@@ -1,16 +0,0 @@		@@ -1,16 +0,0 @@
1	-module Activation
2	- def activate!
3	- (self.active = true)
4	- self.save!
5	- end
6	-
7	- def suspend!
8	- (self.active = false)
9	- self.save!
10	- end
11	-
12	- def deactivate!
13	- (self.active = false)
14	- self.save!
15	- end
16	-end
17	\ No newline at end of file	0	\ No newline at end of file