Merge branch 'feature/api' of gitlab.com:lilcity/backend into feature/create-edit-courses

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)
@@ -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):

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)

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()