Refactoring prompt picking logic into question model

Dhruv Kapadia
1 parent 96626af3
Showing 4 changed files with 35 additions and 32 deletions Show diff stats
app/controllers/prompts_controller.rb
app/controllers/questions_controller.rb
app/models/question.rb
spec/models/question_spec.rb
@@ -68,28 +68,15 @@ class PromptsController &lt; InheritedResources::Base
     #@prompt.choices.each(&:compute_score!)
     respond_to do |format|
       if successful
-	#catchup_marketplace_ids = [120, 117, 1, 116]
-	#TODO refactor into question model
-	if @question.uses_catchup?
-	      logger.info("Question #{@question.id} is using catchup algorithm!")
-	      next_prompt = @question.pop_prompt_queue
-	      if next_prompt.nil?
-		      logger.info("Catchup prompt cache miss! Nothing in prompt_queue")
-		      next_prompt = @question.catchup_choose_prompt
-	      end
-	      @question.send_later :add_prompt_to_queue
-	else
-		next_prompt = @question.picked_prompt
-	end
-
+        
+	next_prompt = @question.choose_prompt
         visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
         @a = current_user.record_appearance(visitor, next_prompt)
 	appearance_id = Proc.new { |options| options[:builder].tag!('appearance_id', @a.lookup) }
-      
 	visitor_votes = Proc.new { |options| options[:builder].tag!('visitor_votes', visitor.votes.count(:conditions => {:question_id => @question.id})) }
-      visitor_ideas = Proc.new { |options| options[:builder].tag!('visitor_ideas', visitor.items.count) }
+        visitor_ideas = Proc.new { |options| options[:builder].tag!('visitor_ideas', visitor.items.count) }
         format.xml { render :xml => next_prompt.to_xml(:procs => [appearance_id, visitor_votes, visitor_ideas], :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok }
         format.json { render :json => next_prompt.to_json(:procs => [appearance_id, visitor_votes, visitor_ideas], :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok }
@@ -57,22 +57,8 @@ class QuestionsController &lt; InheritedResources::Base
     @question = Question.find(params[:id])
     visitor_identifier = params[:visitor_identifier]
     unless params[:barebones]
-      if params[:algorithm] && params[:algorithm] == "catchup"
-	      logger.info("Question #{@question.id} requested catchup algorithm!")
-
-	      @p = @question.pop_prompt_queue
-	      if @p.nil?
-		      logger.info("Catchup prompt cache miss! Nothing in prompt_queue")
-		      @p = @question.catchup_choose_prompt
-		      @question.record_prompt_cache_miss
-	      else
-		      @question.record_prompt_cache_hit
-	      end
-	      @question.send_later :add_prompt_to_queue
-
-      else
-	      @p = @question.picked_prompt
-      end
+      
+      @p = @question.choose_prompt(:algorithm => params[:algorithm])
       # 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
@@ -29,6 +29,28 @@ class Question &lt; ActiveRecord::Base
     choices_count
   end
+  def choose_prompt(options = {})
+
+	  if self.uses_catchup? || options[:algorithm] == "catchup"
+	      logger.info("Question #{self.id} is using catchup algorithm!")
+	      next_prompt = self.pop_prompt_queue
+	      if next_prompt.nil?
+		      logger.info("DEBUG Catchup prompt cache miss! Nothing in prompt_queue")
+		      next_prompt = self.catchup_choose_prompt
+		      record_prompt_cache_miss
+	      else
+		      record_prompt_cache_hit
+	      end
+	      self.send_later :add_prompt_to_queue
+	      return next_prompt
+	  else
+	      #Standard choose prompt at random
+              next_prompt = self.picked_prompt
+	      return next_prompt
+	  end
+          
+  end
+
  #TODO: generalize for prompts of rank > 2
  #TODO: add index for rapid finding
  def picked_prompt(rank = 2)
@@ -59,12 +59,20 @@ describe Question do
 		  @catchup_q = Factory.create(:aoi_question, :site => user, :creator => user.default_visitor)
 		  @catchup_q.it_should_autoactivate_ideas = true
+		  @catchup_q.uses_catchup = true
 		  @catchup_q.save!
 		  100.times.each do |num|
 			  user.create_choice("visitor identifier", @catchup_q, {:data => num.to_s, :local_identifier => "exmaple"})
 		  end
 	  end
+
+
+	  it "should create a delayed job after requesting a prompt" do
+		  proc { @catchup_q.choose_prompt}.should change(Delayed::Job, :count).by(1)
+	  end
+
+
 	  it "should choose an active prompt using catchup algorithm on a large number of choices" do 
 		  @catchup_q.reload
 		  # Sanity check, 2 extra choices are autocreated when empty question created
	@@ -57,22 +57,8 @@ class QuestionsController < InheritedResources::Base		@@ -57,22 +57,8 @@ class QuestionsController < InheritedResources::Base
57	@question = Question.find(params[:id])	57	@question = Question.find(params[:id])
58	visitor_identifier = params[:visitor_identifier]	58	visitor_identifier = params[:visitor_identifier]
59	unless params[:barebones]	59	unless params[:barebones]
60	- if params[:algorithm] && params[:algorithm] == "catchup"
61	- logger.info("Question #{@question.id} requested catchup algorithm!")
62	-
63	- @p = @question.pop_prompt_queue
64	- if @p.nil?
65	- logger.info("Catchup prompt cache miss! Nothing in prompt_queue")
66	- @p = @question.catchup_choose_prompt
67	- @question.record_prompt_cache_miss
68	- else
69	- @question.record_prompt_cache_hit
70	- end
71	- @question.send_later :add_prompt_to_queue
72	-
73	- else
74	- @p = @question.picked_prompt
75	- end	60	+
		61	+ @p = @question.choose_prompt(:algorithm => params[:algorithm])
76		62
77	# we sometimes request a question when no prompt is displayed	63	# we sometimes request a question when no prompt is displayed
78	# TODO It would be a good idea to find these places and treat them like barebones	64	# TODO It would be a good idea to find these places and treat them like barebones
	@@ -29,6 +29,28 @@ class Question < ActiveRecord::Base		@@ -29,6 +29,28 @@ class Question < ActiveRecord::Base
29	choices_count	29	choices_count
30	end	30	end
31		31
		32	+ def choose_prompt(options = {})
		33	+
		34	+ if self.uses_catchup? \|\| options[:algorithm] == "catchup"
		35	+ logger.info("Question #{self.id} is using catchup algorithm!")
		36	+ next_prompt = self.pop_prompt_queue
		37	+ if next_prompt.nil?
		38	+ logger.info("DEBUG Catchup prompt cache miss! Nothing in prompt_queue")
		39	+ next_prompt = self.catchup_choose_prompt
		40	+ record_prompt_cache_miss
		41	+ else
		42	+ record_prompt_cache_hit
		43	+ end
		44	+ self.send_later :add_prompt_to_queue
		45	+ return next_prompt
		46	+ else
		47	+ #Standard choose prompt at random
		48	+ next_prompt = self.picked_prompt
		49	+ return next_prompt
		50	+ end
		51	+
		52	+ end
		53	+
32	#TODO: generalize for prompts of rank > 2	54	#TODO: generalize for prompts of rank > 2
33	#TODO: add index for rapid finding	55	#TODO: add index for rapid finding
34	def picked_prompt(rank = 2)	56	def picked_prompt(rank = 2)