Merge branch 'master' into user_exercise_feedback_backend

# Conflicts:
#	app/views/application/_navigation.html.slim

app/models/error_template.rb

@@ -0,0 +1,8 @@
+class ErrorTemplate < ActiveRecord::Base
+  belongs_to :execution_environment
+  has_and_belongs_to_many :error_template_attributes
+
+  def to_s
+    "#{id} [#{name}]"
+  end
+end

app/models/error_template_attribute.rb

@@ -0,0 +1,7 @@
+class ErrorTemplateAttribute < ActiveRecord::Base
+  has_and_belongs_to_many :error_template
+
+  def to_s
+    "#{id} [#{key}]"
+  end
+end

app/models/execution_environment.rb

@@ -11,6 +11,7 @@ class ExecutionEnvironment < ActiveRecord::Base
   has_many :exercises
   belongs_to :file_type
   has_many :hints
+  has_many :error_templates
 
   scope :with_exercises, -> { where('id IN (SELECT execution_environment_id FROM exercises)') }
 

app/models/proxy_exercise.rb

@@ -36,8 +36,8 @@ class ProxyExercise < ActiveRecord::Base
           Rails.logger.debug("retrieved assigned exercise for user #{user.id}: Exercise #{assigned_user_proxy_exercise.exercise}" )
           assigned_user_proxy_exercise.exercise
         else
+          Rails.logger.debug("find new matching exercise for user #{user.id}" )
           matching_exercise =
-              Rails.logger.debug("find new matching exercise for user #{user.id}" )
               begin
                 find_matching_exercise(user)
               rescue => e #fallback
@@ -72,7 +72,7 @@ class ProxyExercise < ActiveRecord::Base
 
           # find exercises
           potential_recommended_exercises = []
-          exercises.where("expected_difficulty > 1").each do |ex|
+          exercises.where("expected_difficulty >= 1").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
@@ -85,8 +85,7 @@ class ProxyExercise < ActiveRecord::Base
             @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
+            select_best_matching_exercise(user, exercises_user_has_accessed, potential_recommended_exercises)
           end
       end
 
@@ -238,4 +237,4 @@ class ProxyExercise < ActiveRecord::Base
       exercises.order(:expected_difficulty).first
     end
 
-end
+end

app/models/structured_error.rb

@@ -0,0 +1,12 @@
+class StructuredError < ActiveRecord::Base
+  belongs_to :error_template
+  belongs_to :file, class_name: 'CodeOcean::File'
+
+  def self.create_from_template(template, message_buffer)
+    instance = self.create(error_template: template)
+    template.error_template_attributes.each do |attribute|
+      StructuredErrorAttribute.create_from_template(attribute, instance, message_buffer)
+    end
+    instance
+  end
+end

app/models/structured_error_attribute.rb

@@ -0,0 +1,17 @@
+class StructuredErrorAttribute < ActiveRecord::Base
+  belongs_to :structured_error
+  belongs_to :error_template_attribute
+
+  def self.create_from_template(attribute, structured_error, message_buffer)
+    match = false
+    value = nil
+    result = message_buffer.match(attribute.regex)
+    if result != nil
+      match = true
+      if result.captures.size > 0
+        value = result.captures[0]
+      end
+    end
+    self.create(structured_error: structured_error, error_template_attribute: attribute, value: value, match: match)
+  end
+end