WIP

exercise/serializers.py

@@ -3,6 +3,12 @@ from .models import *
 from muscle.models import ExerciseMuscle
 from equipment.models import WorkoutEquipment
 from muscle.serializers import ExerciseMuscleSerializer
+from equipment.serializers import WorkoutEquipmentSerializer
+
+class ExerciseMuscleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ExerciseMuscle
+        fields = '__all__'
 
 class ExerciseSerializer(serializers.ModelSerializer):
     muscles = serializers.SerializerMethodField()
@@ -15,9 +21,11 @@ class ExerciseSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def get_muscles(self, obj): 
-        objs = ExerciseMuscle.objects.filter(exercise=obj).values_list('muscle__name', flat=True)
-        return objs
+        objs = ExerciseMuscle.objects.filter(exercise=obj)
+        data = ExerciseMuscleSerializer(objs, many=True).data
+        return data
     
     def get_equipment(self, obj): 
-        objs = WorkoutEquipment.objects.filter(exercise=obj).values_list('equipment__name', flat=True)
-        return objs
+        objs = WorkoutEquipment.objects.filter(exercise=obj)
+        data = WorkoutEquipmentSerializer(objs, many=True).data
+        return data