From ef5ebc3b696768cbdda49612296ca57f32ba99f8 Mon Sep 17 00:00:00 2001
From: Thomas Hille <thomahi@gmx.de>
Date: Fri, 24 Mar 2017 12:14:53 +0100
Subject: [PATCH] splitted user in groups for assigning bonus exercises

---
 app/models/proxy_exercise.rb | 55 +++++++++++++++++++++++-------------
 lib/user_group_separator.rb  |  3 ++
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/models/proxy_exercise.rb b/app/models/proxy_exercise.rb
index 11b5a545..a425b91b 100644
--- a/app/models/proxy_exercise.rb
+++ b/app/models/proxy_exercise.rb
@@ -53,28 +53,43 @@ class ProxyExercise < ActiveRecord::Base
     end
 
     def find_matching_exercise(user)
-      exercises_user_has_accessed = user.submissions.where("cause IN ('submit','assess')").map{|s| s.exercise}.uniq
-      tags_user_has_seen = exercises_user_has_accessed.map{|ex| ex.tags}.uniq.flatten
-      Rails.logger.debug("exercises_user_has_accessed #{exercises_user_has_accessed.map{|e|e.id}.join(",")}")
+      user_group = UserGroupSeparator.getProxyExerciseGroup(user)
+      case user_group
+        when :dummy_assigment
+          rec_ex = select_easiest_exercise(exercises)
+          @reason[:reason] = "dummy group"
+          Rails.logger.debug("assigned user to dummy group, and gave him exercise: #{rec_ex.title}")
+          rec_ex
+        when :random_assigment
+          @reason[:reason] = "random group"
+          rec_ex = exercises.shuffle.first
+          Rails.logger.debug("assigned user to random group, and gave him exercise: #{rec_ex.title}")
+          rec_ex
+        when :recommended_assignment
+          exercises_user_has_accessed = user.submissions.where("cause IN ('submit','assess')").map{|s| s.exercise}.uniq.compact
+          tags_user_has_seen = exercises_user_has_accessed.map{|ex| ex.tags}.uniq.flatten
+          Rails.logger.debug("exercises_user_has_accessed #{exercises_user_has_accessed.map{|e|e.id}.join(",")}")
 
-      # find execises
-      potential_recommended_exercises = []
-      exercises.each do |ex|
-        ## find exercises which have only tags the user has already seen
-        if (ex.tags - tags_user_has_seen).empty?
-          potential_recommended_exercises << ex
-        end
-      end
-      Rails.logger.debug("potential_recommended_exercises: #{potential_recommended_exercises.map{|e|e.id}}")
-      # if all exercises contain tags which the user has never seen, recommend easiest exercise
-      if potential_recommended_exercises.empty?
-        Rails.logger.debug("matched easiest exercise in pool")
-        @reason[:reason] = "easiest exercise in pool. empty potential exercises"
-        select_easiest_exercise(exercises)
-      else
-        recommended_exercise = select_best_matching_exercise(user, exercises_user_has_accessed, potential_recommended_exercises)
-        recommended_exercise
+          # find execises
+          potential_recommended_exercises = []
+          exercises.each do |ex|
+            ## find exercises which have only tags the user has already seen
+            if (ex.tags - tags_user_has_seen).empty?
+              potential_recommended_exercises << ex
+            end
+          end
+          Rails.logger.debug("potential_recommended_exercises: #{potential_recommended_exercises.map{|e|e.id}}")
+          # if all exercises contain tags which the user has never seen, recommend easiest exercise
+          if potential_recommended_exercises.empty?
+            Rails.logger.debug("matched easiest exercise in pool")
+            @reason[:reason] = "easiest exercise in pool. empty potential exercises"
+            select_easiest_exercise(exercises)
+          else
+            recommended_exercise = select_best_matching_exercise(user, exercises_user_has_accessed, potential_recommended_exercises)
+            recommended_exercise
+          end
       end
+
     end
     private :find_matching_exercise
 
diff --git a/lib/user_group_separator.rb b/lib/user_group_separator.rb
index 320cce96..b46757ad 100644
--- a/lib/user_group_separator.rb
+++ b/lib/user_group_separator.rb
@@ -16,10 +16,13 @@ class UserGroupSeparator
   def self.getProxyExerciseGroup(user)
     lastDigitCreatedAt = user.created_at.to_i % 10
     if lastDigitCreatedAt < 2 # 0,1
+      puts "dummy"
       :dummy_assigment
     elsif lastDigitCreatedAt < 4 # 2,3
+      puts "random_assignment"
       :random_assigment
     else # 4,5,6,7,8,9
+      puts "recommended_assignment"
       :recommended_assignment
     end
   end