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

api/v1/serializers.py

@@ -51,8 +51,7 @@ class GallerySerializer(serializers.ModelSerializer):
         )
 
 
-class GalleryImageSerializer(serializers.ModelSerializer):
+class GalleryImageCreateSerializer(serializers.ModelSerializer):
-    img = ImageObjectSerializer()
 
     class Meta:
         model = GalleryImage
@@ -71,6 +70,10 @@ class GalleryImageSerializer(serializers.ModelSerializer):
         )
 
 
+class GalleryImageSerializer(GalleryImageCreateSerializer):
+    img = ImageObjectSerializer()
+
+
 class MaterialSerializer(serializers.ModelSerializer):
 
     class Meta:
@@ -322,25 +325,7 @@ class UserSerializer(serializers.ModelSerializer):
         )
 
 
-class CoverImageSerializer(serializers.Serializer):
-    cover = Base64ImageField(
-        required=False, allow_empty_file=True, allow_null=True
-    )
-
-
 class UserPhotoSerializer(serializers.Serializer):
     photo = Base64ImageField(
         required=False, allow_empty_file=True, allow_null=True
     )
-
-
-class ContentImageSerializer(serializers.Serializer):
-    img = Base64ImageField(
-        required=False, allow_empty_file=True, allow_null=True
-    )
-
-
-class GalleryImageSerializer(serializers.Serializer):
-    image = Base64ImageField(
-        required=False, allow_empty_file=True, allow_null=True
-    )

api/v1/views.py

@@ -11,11 +11,10 @@ from .serializers import (
     MaterialSerializer, LikeSerializer,
     ImageSerializer, TextSerializer,
     ImageTextSerializer, VideoSerializer,
-    GallerySerializer, GalleryImageSerializer,
+    GallerySerializer, GalleryImageSerializer, GalleryImageCreateSerializer,
     UserSerializer, UserPhotoSerializer,
-    LessonSerializer, ContentImageSerializer,
+    LessonSerializer, CourseRetrieveSerializer,
-    GalleryImageSerializer, CoverImageSerializer,
+    ImageObjectSerializer,
-    CourseRetrieveSerializer, ImageObjectSerializer,
 )
 from .permissions import IsAdmin, IsAdminOrIsSelf, IsAuthorOrAdmin, IsAuthorObjectOrAdmin
 
@@ -161,8 +160,12 @@ class GalleryImageViewSet(ExtendedModelViewSet):
     queryset = GalleryImage.objects.select_related(
         'gallery', 'img',
     ).all()
-    serializer_class = GalleryImageSerializer
+    serializer_class = GalleryImageCreateSerializer
     search_fields = ('gallery__title',)
+    serializer_class_map = {
+        'list': GalleryImageSerializer,
+        'retrieve': GalleryImageSerializer,
+    }
     # permission_classes = (IsAuthorOrAdmin,)
     # permission_map = {
     #     'delete': IsAdmin,

apps/course/models.py

@@ -38,7 +38,7 @@ class Course(models.Model):
         null=True, blank=True,
     )
     price = models.DecimalField(
-        'Цена курса', help_text='Если цены нету, то курс бесплатный',
+        'Цена курса', help_text='Если цена не выставлена, то курс бесплатный',
         max_digits=10, decimal_places=2, null=True, blank=True
     )
     is_infinite = models.BooleanField(default=False)