Refactor average worktime and add it to exercise statistics per user

app/models/exercise.rb

@@ -42,11 +42,9 @@ class Exercise < ActiveRecord::Base
     return user_count == 0 ? 0 : submissions.count() / user_count.to_f()
   end
 
-  def average_working_time
+  def user_working_time_query
-    self.class.connection.execute("""
+    """
-      SELECT avg(working_time) as average_time
+      SELECT user_id,
-      FROM
-        (SELECT user_id,
              sum(working_time_new) AS working_time
       FROM
         (SELECT user_id,
@@ -58,10 +56,25 @@ class Exercise < ActiveRecord::Base
                                                         ORDER BY id)) AS working_time
             FROM submissions
             WHERE exercise_id=#{id}) AS foo) AS bar
-         GROUP BY user_id) AS baz;
+      GROUP BY user_id
+    """
+  end
+
+  def average_working_time
+    self.class.connection.execute("""
+      SELECT avg(working_time) as average_time
+      FROM
+        (#{user_working_time_query}) AS baz;
     """).first['average_time']
   end
 
+  def average_working_time_for(user_id)
+    self.class.connection.execute("""
+      #{user_working_time_query}
+      HAVING user_id = #{user_id}
+    """).first['working_time']
+  end
+
   def duplicate(attributes = {})
     exercise = dup
     exercise.attributes = attributes

app/views/exercises/statistics.html.slim

@@ -23,5 +23,4 @@ h1 = @exercise
             td = "#{user.name} (#{user.email})"
             td = submissions.maximum('score')
             td = submissions.count('id')
-            - seconds = submissions.maximum('created_at') - submissions.minimum('created_at')
+            td = @exercise.average_working_time_for(user.id) or 0
-            td = "#{distance_of_time_in_words(seconds)} (#{seconds})"