xonecas.io
3517
Mt

meal_tracker / commit 2fdae61

Use viewsets

xonecas2020-03-04 2fdae612e9d65834e4523bcca2d59887a1273da0 parent 74b1085

8 files changed

bmi_api/serializers.py+23−0
@@ -1,8 +1,31 @@
1+from django.contrib.auth.models import User
2+
13 from rest_framework import serializers
24
35 from .models import Meal
46
57
8+class UserSerializer(serializers.ModelSerializer):
9+ class Meta:
10+ model = User
11+ fields = ('id', 'username', 'password', 'email', 'first_name', 'last_name',)
12+ write_only_fields = ('password',)
13+ read_only_fields = ('id',)
14+
15+ def create(self, validated_data):
16+ user = User.objects.create(
17+ username=validated_data['username'],
18+ email=validated_data['email'],
19+ first_name=validated_data['first_name'],
20+ last_name=validated_data['last_name']
21+ )
22+
23+ user.set_password(validated_data['password'])
24+ user.save()
25+
26+ return user
27+
28+
629 class MealSerializer(serializers.ModelSerializer):
730 class Meta:
831 model = Meal
bmi_api/tests.py+5−5
@@ -23,7 +23,7 @@ class MealListTest(TestCase):
2323 date=eight_hours_later, time=eight_hours_later.time())
2424
2525 def test_get_all_meals(self):
26- response = client.get(reverse('meal_list'))
26+ response = client.get(reverse('meals-list'))
2727 serializer = MealSerializer(Meal.objects.all(), many=True)
2828
2929 self.assertEqual(response.data, serializer.data)
@@ -32,7 +32,7 @@ class MealListTest(TestCase):
3232 def test_create_new_meal(self):
3333 yesterday_lunch = datetime.now() - timedelta(hours=24)
3434 response = client.post(
35- reverse('meal_list'),
35+ reverse('meals-list'),
3636 data=json.dumps({
3737 'text': 'Quick small lunch',
3838 'calories': 190,
@@ -52,7 +52,7 @@ class MealDetailTest(TestCase):
5252 text='Lunch time', calories='200')
5353
5454 def test_get_meal_by_pk(self):
55- response = client.get(reverse('meal_detail', kwargs={'pk': self.meal.pk}))
55+ response = client.get(reverse('meals-detail', kwargs={'pk': self.meal.pk}))
5656 serializer = MealSerializer(Meal.objects.get(pk=self.meal.pk))
5757
5858 self.assertEqual(response.data, serializer.data)
@@ -61,7 +61,7 @@ class MealDetailTest(TestCase):
6161 def test_edit_meal(self):
6262 yesterday_lunch = datetime.now() - timedelta(hours=24)
6363 response = client.put(
64- reverse('meal_detail', kwargs={'pk': self.meal.pk}),
64+ reverse('meals-detail', kwargs={'pk': self.meal.pk}),
6565 data=json.dumps({
6666 'text': 'small lunch',
6767 'calories': 110,
@@ -74,6 +74,6 @@ class MealDetailTest(TestCase):
7474 self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
7575
7676 def test_delete_meal(self):
77- response = client.delete(reverse('meal_detail', kwargs={'pk': self.meal.pk}))
77+ response = client.delete(reverse('meals-detail', kwargs={'pk': self.meal.pk}))
7878
7979 self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
bmi_api/urls.py+11−0
@@ -0,0 +1,11 @@
1+from django.conf.urls import url, include
2+from rest_framework import routers
3+from .views import UserViewSet, MealViewSet
4+
5+router = routers.DefaultRouter()
6+router.register(r'users', UserViewSet)
7+router.register(r'meals', MealViewSet)
8+
9+urlpatterns = [
10+ url(r'^', include(router.urls)),
11+]
bmi_api/views.py+10−45
@@ -1,51 +1,16 @@
1-from rest_framework.response import Response
2-from rest_framework.decorators import api_view
3-from rest_framework import status
1+from django.contrib.auth.models import User
42
5-from .models import Meal
6-from .serializers import MealSerializer
7-
8-
9-@api_view(['GET', 'POST'])
10-def meal_list(request):
11- if request.method == 'GET':
12- data = Meal.objects.all()
13- serializer = MealSerializer(data, context={'request': request}, many=True)
14-
15- return Response(serializer.data)
16-
17- elif request.method == 'POST':
18- serializer = MealSerializer(data=request.data)
19-
20- if serializer.is_valid():
21- serializer.save()
22- return Response(status=status.HTTP_201_CREATED)
3+from rest_framework import viewsets
234
24- return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
25-
26-
27-@api_view(['GET', 'PUT', 'DELETE'])
28-def meal_detail(request, pk):
29- try:
30- meal = Meal.objects.get(pk=pk)
31- except Meal.DoesNotExist:
32- return Response(status=status.HTTP_404_NOT_FOUND)
33-
34- if request.method == 'GET':
35- serializer = MealSerializer(meal, context={'request': request})
36-
37- return Response(serializer.data)
38-
39- elif request.method == 'PUT':
40- serializer = MealSerializer(data=request.data, context={'request': request})
5+from .models import Meal
6+from .serializers import MealSerializer, UserSerializer
417
42- if serializer.is_valid():
43- serializer.save()
44- return Response(status=status.HTTP_204_NO_CONTENT)
458
46- return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
9+class UserViewSet(viewsets.ModelViewSet):
10+ queryset = User.objects.all()
11+ serializer_class = UserSerializer
4712
48- elif request.method == 'DELETE':
49- meal.delete()
5013
51- return Response(status=status.HTTP_204_NO_CONTENT)
14+class MealViewSet(viewsets.ModelViewSet):
15+ queryset = Meal.objects.all()
16+ serializer_class = MealSerializer
bmi_track/urls.py+3−4
@@ -13,13 +13,12 @@ Including another URLconf
1313 1. Import the include() function: from django.urls import include, path
1414 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
1515 """
16+from django.conf.urls import include, url
1617 from django.contrib import admin
17-from django.urls import path, re_path
18+from django.urls import path
1819
19-from bmi_api import views
2020
2121 urlpatterns = [
2222 path('admin/', admin.site.urls),
23- re_path(r'api/meals/$', views.meal_list, name='meal_list'),
24- re_path(r'api/meals/(?P<pk>[0-9]+)$', views.meal_detail, name='meal_detail'),
23+ url(r'^api/', include('bmi_api.urls'))
2524 ]
bmi_ui/package-lock.json+124−0
@@ -2186,6 +2186,37 @@
21862186 "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
21872187 "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
21882188 },
2189+ "axios": {
2190+ "version": "0.19.2",
2191+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
2192+ "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
2193+ "requires": {
2194+ "follow-redirects": "1.5.10"
2195+ },
2196+ "dependencies": {
2197+ "debug": {
2198+ "version": "3.1.0",
2199+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
2200+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
2201+ "requires": {
2202+ "ms": "2.0.0"
2203+ }
2204+ },
2205+ "follow-redirects": {
2206+ "version": "1.5.10",
2207+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
2208+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
2209+ "requires": {
2210+ "debug": "=3.1.0"
2211+ }
2212+ },
2213+ "ms": {
2214+ "version": "2.0.0",
2215+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
2216+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
2217+ }
2218+ }
2219+ },
21892220 "axobject-query": {
21902221 "version": "2.1.2",
21912222 "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz",
@@ -2685,6 +2716,11 @@
26852716 "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
26862717 "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
26872718 },
2719+ "bootstrap": {
2720+ "version": "4.4.1",
2721+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
2722+ "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
2723+ },
26882724 "brace-expansion": {
26892725 "version": "1.1.11",
26902726 "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3112,6 +3148,11 @@
31123148 }
31133149 }
31143150 },
3151+ "classnames": {
3152+ "version": "2.2.6",
3153+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
3154+ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
3155+ },
31153156 "clean-css": {
31163157 "version": "4.2.3",
31173158 "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -3507,6 +3548,15 @@
35073548 "sha.js": "^2.4.8"
35083549 }
35093550 },
3551+ "create-react-context": {
3552+ "version": "0.3.0",
3553+ "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
3554+ "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
3555+ "requires": {
3556+ "gud": "^1.0.0",
3557+ "warning": "^4.0.3"
3558+ }
3559+ },
35103560 "cross-spawn": {
35113561 "version": "6.0.5",
35123562 "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -4102,6 +4152,14 @@
41024152 "utila": "~0.4"
41034153 }
41044154 },
4155+ "dom-helpers": {
4156+ "version": "3.4.0",
4157+ "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
4158+ "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
4159+ "requires": {
4160+ "@babel/runtime": "^7.1.2"
4161+ }
4162+ },
41054163 "dom-serializer": {
41064164 "version": "0.2.2",
41074165 "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
@@ -5707,6 +5765,11 @@
57075765 "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
57085766 "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
57095767 },
5768+ "gud": {
5769+ "version": "1.0.0",
5770+ "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
5771+ "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
5772+ },
57105773 "gzip-size": {
57115774 "version": "5.1.1",
57125775 "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -9178,6 +9241,11 @@
91789241 "ts-pnp": "^1.1.2"
91799242 }
91809243 },
9244+ "popper.js": {
9245+ "version": "1.16.1",
9246+ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
9247+ "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
9248+ },
91819249 "portfinder": {
91829250 "version": "1.0.25",
91839251 "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
@@ -10602,6 +10670,25 @@
1060210670 "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
1060310671 "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="
1060410672 },
10673+ "react-lifecycles-compat": {
10674+ "version": "3.0.4",
10675+ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
10676+ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
10677+ },
10678+ "react-popper": {
10679+ "version": "1.3.7",
10680+ "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
10681+ "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==",
10682+ "requires": {
10683+ "@babel/runtime": "^7.1.2",
10684+ "create-react-context": "^0.3.0",
10685+ "deep-equal": "^1.1.1",
10686+ "popper.js": "^1.14.4",
10687+ "prop-types": "^15.6.1",
10688+ "typed-styles": "^0.0.7",
10689+ "warning": "^4.0.2"
10690+ }
10691+ },
1060510692 "react-scripts": {
1060610693 "version": "3.4.0",
1060710694 "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.0.tgz",
@@ -10662,6 +10749,30 @@
1066210749 "workbox-webpack-plugin": "4.3.1"
1066310750 }
1066410751 },
10752+ "react-transition-group": {
10753+ "version": "2.9.0",
10754+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
10755+ "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
10756+ "requires": {
10757+ "dom-helpers": "^3.4.0",
10758+ "loose-envify": "^1.4.0",
10759+ "prop-types": "^15.6.2",
10760+ "react-lifecycles-compat": "^3.0.4"
10761+ }
10762+ },
10763+ "reactstrap": {
10764+ "version": "8.4.1",
10765+ "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.4.1.tgz",
10766+ "integrity": "sha512-oAjp9PYYUGKl7SLXwrQ1oRIrYw0MqfO2mUqYgGapFKHG2uwjEtLip5rYxtMujkGx3COjH5FX1WtcfNU4oqpH0Q==",
10767+ "requires": {
10768+ "@babel/runtime": "^7.2.0",
10769+ "classnames": "^2.2.3",
10770+ "prop-types": "^15.5.8",
10771+ "react-lifecycles-compat": "^3.0.4",
10772+ "react-popper": "^1.3.6",
10773+ "react-transition-group": "^2.3.1"
10774+ }
10775+ },
1066510776 "read-pkg": {
1066610777 "version": "3.0.0",
1066710778 "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -12514,6 +12625,11 @@
1251412625 "mime-types": "~2.1.24"
1251512626 }
1251612627 },
12628+ "typed-styles": {
12629+ "version": "0.0.7",
12630+ "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
12631+ "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
12632+ },
1251712633 "typedarray": {
1251812634 "version": "0.0.6",
1251912635 "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -12805,6 +12921,14 @@
1280512921 "makeerror": "1.0.x"
1280612922 }
1280712923 },
12924+ "warning": {
12925+ "version": "4.0.3",
12926+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
12927+ "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
12928+ "requires": {
12929+ "loose-envify": "^1.0.0"
12930+ }
12931+ },
1280812932 "watchpack": {
1280912933 "version": "1.6.0",
1281012934 "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
bmi_ui/package.json+4−1
@@ -6,9 +6,12 @@
66 "@testing-library/jest-dom": "^4.2.4",
77 "@testing-library/react": "^9.4.1",
88 "@testing-library/user-event": "^7.2.1",
9+ "axios": "^0.19.2",
10+ "bootstrap": "^4.4.1",
911 "react": "^16.13.0",
1012 "react-dom": "^16.13.0",
11- "react-scripts": "3.4.0"
13+ "react-scripts": "3.4.0",
14+ "reactstrap": "^8.4.1"
1215 },
1316 "scripts": {
1417 "start": "react-scripts start",
bmi_ui/src/index.js+1−0
@@ -1,6 +1,7 @@
11 import React from 'react';
22 import ReactDOM from 'react-dom';
33 import './index.css';
4+import 'bootstrap/dist/css/bootstrap.min.css';
45 import App from './App';
56 import * as serviceWorker from './serviceWorker';