@@ -5,24 +5,52 @@ from rest_framework import serializers
55 from .models import Meal, UserPreferences
66
77
8+class UserPreferencesSerializer(serializers.ModelSerializer):
9+
10+ class Meta:
11+ model = UserPreferences
12+ fields = ['user', 'max_calories']
13+ read_only_fields = ['user']
14+
15+
816 class UserSerializer(serializers.ModelSerializer):
17+ preferences = UserPreferencesSerializer()
918
1019 class Meta:
1120 model = User
12- fields = ['id', 'username', 'password']
21+ fields = ['id', 'username', 'password', 'preferences']
1322 read_only_fields = ['id']
1423 extra_kwargs = {'password': {'write_only': True}}
24+ depth = 2
1525
16- def create(self, validated_data):
17- user = User.objects.create(
18- username=validated_data['username'],
19- )
20- user.set_password(validated_data['password'])
21- user.save()
26+ def create(self, validated_data):
27+ preferences_data = validated_data.pop('preferences')
28+ password = validated_data.pop('password')
29+
30+ user = User.objects.create(**validated_data)
31+ user.set_password(password)
32+ user.save()
2233
23- # UserPreferences.objects.create(user=user, max_calories=validated_data['max_calories'])
34+ UserPreferences.objects.create(user=user, **preferences_data)
35+
36+ return user
37+
38+ def update(self, user, validated_data):
39+ preferences_data = validated_data.pop('preferences')
40+ preferences, created = UserPreferences.objects.get_or_create(user=user)
41+
42+ user.username = validated_data.get('username', user.username)
43+ user.save()
44+
45+ if (created):
46+ preferences.max_calories = preferences_data.get('max_calories')
47+ else:
48+ preferences.max_calories = preferences_data.get(
49+ 'max_calories', preferences.max_calories
50+ )
51+ preferences.save()
2452
25- return user
53+ return user
2654
2755
2856 class MealSerializer(serializers.ModelSerializer):