Commit eeeb135

mo khan <mo@mokhan.ca>
2016-12-25 18:29:14
load each of the target sets.
master
1 parent 4b56d95
Changed files (3)
app
views
api
sets
_set.json.jbuilder
workouts
new.json.jbuilder
spec
controllers
api
workouts_controller_spec.rb
app/views/api/sets/_set.json.jbuilder
@@ -1,7 +1,7 @@
 json.id set.id
+json.exercise_id set.exercise.id
 json.type set.type
-json.target_weight set.target_weight.pretty_print
-json.weight_per_side set.weight_per_side
+json.target_weight set.target_weight.to_h
 json.target_repetitions set.target_repetitions
 json.actual_repetitions set.actual_repetitions
 json.actual_duration set.actual_duration
app/views/api/workouts/new.json.jbuilder
@@ -7,6 +7,6 @@ json.exercises @workout.sets.group_by(&:exercise) do |exercise, sets|
   json.id exercise.id
   json.name exercise.name
 end
-#json.sets @workout.sets.group_by(&:exercise) do |exercise, set|
-  #json.partial! 'sets/set', set: set
-#end
+json.sets @workout.sets do |set|
+  json.partial! 'api/sets/set', set: set
+end
spec/controllers/api/workouts_controller_spec.rb
@@ -38,11 +38,29 @@ describe Api::WorkoutsController do
         { id: planks.id, name: planks.name, },
         { id: squat.id, name: squat.name, },
       ])
-      #expect(json[:sets]).to eql({
-        #squat.id => [
-          #{ id: nil, type: 'WorkSet', target: { amount: 315, unit: 'lbs' }, actual: nil }
-        #]
-      #})
+      expect(json[:sets]).to match_array([
+        { id: nil, exercise_id: squat.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: squat.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: squat.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: squat.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: squat.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: bench_press.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: bench_press.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: bench_press.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: bench_press.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: bench_press.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: barbell_row.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: barbell_row.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: barbell_row.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: barbell_row.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: barbell_row.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: dips.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: dips.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: dips.id, type: 'WorkSet', target_weight: 45.lbs.to_h, target_repetitions: 5, actual_repetitions: nil, target_duration: nil, actual_duration: nil },
+        { id: nil, exercise_id: planks.id, type: 'WorkSet', target_weight: 0.lbs.to_h, target_repetitions: 1, actual_repetitions: nil, target_duration: 60, actual_duration: nil },
+        { id: nil, exercise_id: planks.id, type: 'WorkSet', target_weight: 0.lbs.to_h, target_repetitions: 1, actual_repetitions: nil, target_duration: 60, actual_duration: nil },
+        { id: nil, exercise_id: planks.id, type: 'WorkSet', target_weight: 0.lbs.to_h, target_repetitions: 1, actual_repetitions: nil, target_duration: 60, actual_duration: nil },
+      ])
     end
   end
 end