Commit 29b140d

mo khan <mo@mokhan.ca>
2017-02-18 00:17:19
chain scopes.
1 parent 234b8db
Changed files (2)
app/models/training_history.rb
@@ -45,7 +45,7 @@ class TrainingHistory
   end
 
   def to_line_chart
-    user.workouts.to_line_chart(exercise)
+    user.workouts.with_exercise(exercise).to_line_chart
   end
 
   private
app/models/workout.rb
@@ -13,11 +13,8 @@ class Workout < ApplicationRecord
   scope :with_exercise, ->(exercise) do
     joins(:exercises).where(exercises: { id: exercise.id }).distinct
   end
-  scope :grouped_by_occurrence, ->(exercise) do
-    joins(:exercise_sets).where(exercise_sets: { exercise_id: exercise }).group(:occurred_at)
-  end
-  scope :to_line_chart, ->(exercise) do
-    grouped_by_occurrence(exercise).recent.maximum(:target_weight)
+  scope :to_line_chart, -> do
+    group(:occurred_at).recent.maximum(:target_weight)
   end
 
   def train(exercise, target_weight, repetitions:, set: nil)