Commit 1977d2b

@@ -8,10 +8,10 @@ class Api::WorkoutsController < Api::Controller
   end
 
   def create
-    workout = current_user.workouts.build(secure_params)
-    workout.occurred_at = DateTime.now
-    workout.save!
-    render nothing: true, status: :created
+    @workout = current_user.workouts.build(secure_params)
+    @workout.occurred_at = DateTime.now
+    @workout.save!
+    render status: :created
   end
 
   private
@@ -19,13 +19,13 @@ class Api::WorkoutsController < Api::Controller
   def secure_params
     params.require(:workout).permit(
       :routine_id,
-      :body_weight,
+      body_weight: [:amount, :unit],
       exercise_sets_attributes: [
         :exercise_id,
         :target_duration,
         :target_repetitions,
-        :target_weight,
         :type,
+        target_weight: [:amount, :unit],
       ]
     )
   end

@@ -0,0 +1,12 @@
+json.body_weight @workout.body_weight
+json.routine do |routine|
+  json.id @workout.routine.id
+  json.name @workout.routine.name
+end
+json.exercises @workout.sets.group_by(&:exercise) do |exercise, sets|
+  json.id exercise.id
+  json.name exercise.name
+end
+json.sets @workout.sets do |set|
+  json.partial! 'api/sets/set', set: set
+end

@@ -4,6 +4,8 @@ class QuantityType < ActiveRecord::Type::Float
 
     if value.is_a? Quantity
       value.to(:lbs)
+    elsif value.is_a? Hash
+      Quantity.new(value[:amount].to_f, value[:unit].to_sym)
     else
       Quantity.new(value.to_f, :lbs)
     end

@@ -72,11 +72,11 @@ describe Api::WorkoutsController do
       post :create, params: {
         workout: {
           routine_id: routine_b.id,
-          body_weight: body_weight,
+          body_weight: { amount: body_weight.amount, unit: body_weight.unit },
           exercise_sets_attributes: [{
             exercise_id: squat.id,
             target_repetitions: 5,
-            target_weight: 200,
+            target_weight: { amount: 200, unit: 'lbs' },
             type: "WorkSet",
           }]
         }