From 7f182f482a960bb9826b09692b9cbd0fe7cd9a98 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 9 Feb 2018 15:17:07 +0300 Subject: [PATCH 1/4] Add /users/me/ endpoint --- api/v1/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/v1/views.py b/api/v1/views.py index e934d32a..ea96b54e 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -224,6 +224,12 @@ class UserViewSet(ExtendedModelViewSet): # 'delete': IsAdmin, # } + @list_route(methods=['get']) + def me(self, request): + serializer = self.get_serializer_class() + serialized_data = serializer(instance=request.user) + return Response(serialized_data.data) + @detail_route(methods=['post'], url_path='upload-photo') def upload_photo(self, request, pk=None): user = self.get_object() From 80b7a3c3dffa72166868cb7ad991a20506cf5d60 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 9 Feb 2018 15:20:17 +0300 Subject: [PATCH 2/4] Fix Content ImageText choices key --- api/v1/serializers/content.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1/serializers/content.py b/api/v1/serializers/content.py index 9a338c45..599fccae 100644 --- a/api/v1/serializers/content.py +++ b/api/v1/serializers/content.py @@ -12,7 +12,7 @@ class ContentCreateSerializer(serializers.Serializer): TYPE_CHOICES = ( 'text', 'image', - 'imagetext', + 'image-text', 'video', ) type = serializers.ChoiceField(choices=TYPE_CHOICES) From a7b70011ce13bb9621ff3cfec2a5c0e3ded7b6db Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 9 Feb 2018 15:23:15 +0300 Subject: [PATCH 3/4] Clean not needed --- api/v1/serializers/content.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/api/v1/serializers/content.py b/api/v1/serializers/content.py index 599fccae..e98faee2 100644 --- a/api/v1/serializers/content.py +++ b/api/v1/serializers/content.py @@ -63,8 +63,6 @@ class ImageCreateSerializer(serializers.ModelSerializer): class ImageSerializer(ImageCreateSerializer): - # course = CourseSerializer() - # lesson = LessonSerializer() img = ImageObjectSerializer() @@ -91,8 +89,6 @@ class TextCreateSerializer(serializers.ModelSerializer): class TextSerializer(TextCreateSerializer): pass - # course = CourseSerializer() - # lesson = LessonSerializer() class ImageTextCreateSerializer(serializers.ModelSerializer): @@ -119,8 +115,6 @@ class ImageTextCreateSerializer(serializers.ModelSerializer): class ImageTextSerializer(ImageTextCreateSerializer): - # course = CourseSerializer() - # lesson = LessonSerializer() img = ImageObjectSerializer() @@ -147,8 +141,6 @@ class VideoCreateSerializer(serializers.ModelSerializer): class VideoSerializer(VideoCreateSerializer): pass - # course = CourseSerializer() - # lesson = LessonSerializer() class ContentSerializer(serializers.ModelSerializer): From e53dfae45c9cfada02d86daedd579569af4bf967 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Fri, 9 Feb 2018 15:27:53 +0300 Subject: [PATCH 4/4] Fix material cover id --- api/v1/serializers/course.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/v1/serializers/course.py b/api/v1/serializers/course.py index f04b81ac..d348ce64 100644 --- a/api/v1/serializers/course.py +++ b/api/v1/serializers/course.py @@ -175,13 +175,13 @@ class CourseCreateSerializer(serializers.ModelSerializer): if 'id' in material: m = Material.objects.get(id=material['id']) m.title = material['title'] - m.cover = ImageObject.objects.get(material['cover']) + m.cover = ImageObject.objects.get(id=material['cover']) m.short_description = material['short_description'] m.save() else: m = Material.objects.create( title=material['title'], - cover=ImageObject.objects.get(material['cover']), + cover=ImageObject.objects.get(id=material['cover']), short_description=material['short_description'], ) return course @@ -259,13 +259,13 @@ class CourseCreateSerializer(serializers.ModelSerializer): if 'id' in material: m = Material.objects.get(id=material['id']) m.title = material['title'] - m.cover = ImageObject.objects.get(material['cover']) + m.cover = ImageObject.objects.get(id=material['cover']) m.short_description = material['short_description'] m.save() else: m = Material.objects.create( title=material['title'], - cover=ImageObject.objects.get(material['cover']), + cover=ImageObject.objects.get(id=material['cover']), short_description=material['short_description'], ) course.materials.add(m)