xonecas.io
3517
Mt

meal_tracker / commit c22b36b

Finish User and UserPreferences and fix CORS

Finished the relationship between user and their preferences to store
the max_calories per day value.

Altered the config to allow requests from the UI

xonecas2020-03-06 c22b36ba616b4d607b6ee58d90ed1a8bb3b8c7f4 parent ab13372

7 files changed

bmi_api/admin.py+4−1
@@ -1,3 +1,6 @@
11 from django.contrib import admin
2+from .models import UserPreferences, Meal
23
3-# Register your models here.
4+
5+admin.site.register(UserPreferences)
6+admin.site.register(Meal)
bmi_api/migrations/0001_initial.py+9−1
@@ -1,4 +1,4 @@
1-# Generated by Django 3.0.4 on 2020-03-05 14:42
1+# Generated by Django 3.0.4 on 2020-03-06 11:05
22
33 from django.conf import settings
44 from django.db import migrations, models
@@ -14,6 +14,14 @@ class Migration(migrations.Migration):
1414 ]
1515
1616 operations = [
17+ migrations.CreateModel(
18+ name='UserPreferences',
19+ fields=[
20+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21+ ('max_calories', models.IntegerField(default=2000)),
22+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
23+ ],
24+ ),
1725 migrations.CreateModel(
1826 name='Meal',
1927 fields=[
bmi_api/migrations/0002_auto_20200306_1115.py+21−0
@@ -0,0 +1,21 @@
1+# Generated by Django 3.0.4 on 2020-03-06 11:15
2+
3+from django.conf import settings
4+from django.db import migrations, models
5+import django.db.models.deletion
6+
7+
8+class Migration(migrations.Migration):
9+
10+ dependencies = [
11+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
12+ ('bmi_api', '0001_initial'),
13+ ]
14+
15+ operations = [
16+ migrations.AlterField(
17+ model_name='userpreferences',
18+ name='user',
19+ field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='preferences', to=settings.AUTH_USER_MODEL),
20+ ),
21+ ]
bmi_api/models.py+2−2
@@ -3,8 +3,8 @@ from django.db import models
33
44
55 class UserPreferences(models.Model):
6- user = models.OneToOneField(User, on_delete=models.CASCADE)
7- max_calories = models.IntegerField()
6+ user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='preferences')
7+ max_calories = models.IntegerField(default=2000)
88
99
1010 class Meal(models.Model):
bmi_api/permissions.py+3−0
@@ -4,6 +4,9 @@ from rest_framework import permissions
44 class IsOwnerOrReadOnly(permissions.BasePermission):
55
66 def has_object_permission(self, request, view, obj):
7+ if request.user.is_staff:
8+ return True
9+
710 if request.method in permissions.SAFE_METHODS:
811 return True
912
bmi_api/serializers.py+37−9
@@ -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):
bmi_track/settings.py+14−4
@@ -38,23 +38,30 @@ INSTALLED_APPS = [
3838 'django.contrib.messages',
3939 'django.contrib.staticfiles',
4040 'rest_framework',
41+ 'rest_framework.authtoken',
4142 'corsheaders',
4243 'bmi_api',
4344 ]
4445
46+REST_FRAMEWORK = {
47+ 'DEFAULT_AUTHENTICATION_CLASSES': (
48+ 'rest_framework.authentication.TokenAuthentication',
49+ 'rest_framework.authentication.BasicAuthentication',
50+ 'rest_framework.authentication.SessionAuthentication',
51+ ),
52+}
53+
4554 MIDDLEWARE = [
55+ 'corsheaders.middleware.CorsMiddleware',
4656 'django.middleware.security.SecurityMiddleware',
4757 'django.contrib.sessions.middleware.SessionMiddleware',
4858 'django.middleware.common.CommonMiddleware',
49- 'django.middleware.csrf.CsrfViewMiddleware',
59+ # 'django.middleware.csrf.CsrfViewMiddleware',
5060 'django.contrib.auth.middleware.AuthenticationMiddleware',
5161 'django.contrib.messages.middleware.MessageMiddleware',
5262 'django.middleware.clickjacking.XFrameOptionsMiddleware',
53- 'corsheaders.middleware.CorsMiddleware',
5463 ]
5564
56-CORS_ORIGIN_ALLOW_ALL = True
57-
5865 ROOT_URLCONF = 'bmi_track.urls'
5966
6067 TEMPLATES = [
@@ -124,3 +131,6 @@ USE_TZ = True
124131 # https://docs.djangoproject.com/en/3.0/howto/static-files/
125132
126133 STATIC_URL = '/static/'
134+
135+# CORS
136+CORS_ORIGIN_ALLOW_ALL = True