mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/hasaccess
Vitaly Baev 8 years ago
parent a101f7ca6a ce2ed4a70b
commit 2f44392e4c
7 changed files with 315 additions and 271 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      api/v1/__init__.py
  2. 25
      api/v1/serializers/__init__.py
  3. 217
      api/v1/serializers/content.py
  4. 245
      api/v1/serializers/course.py
  5. 53
      api/v1/serializers/user.py
  6. 12
      api/v1/views.py
  7. 3
      apps/content/admin.py

31
api/v1/__init__.py
Unescape View File

@ -1,11 +1,6 @@
import imghdr
import base64
import six
import uuid
from django.core.files.base import ContentFile
from rest_framework import serializers, viewsets
from rest_framework import viewsets
from rest_framework.response import Response
# https://gist.github.com/ivlevdenis/a0c8f5b472b6b8550bbb016c6a30e0be
@ -48,27 +43,3 @@ class ExtendViewSet(object):
class ExtendedModelViewSet(ExtendViewSet, viewsets.ModelViewSet):
pass
class Base64ImageField(serializers.ImageField):
def to_internal_value(self, data):
if isinstance(data, six.string_types):
if 'data:' in data and ';base64,' in data:
header, data = data.split(';base64,')
try:
decoded_file = base64.b64decode(data)
except TypeError:
self.fail('invalid_image')
file_name = str(uuid.uuid4())[:12]
file_extension = self.get_file_extension(
file_name, decoded_file)
complete_file_name = "%s.%s" % (file_name, file_extension,)
data = ContentFile(decoded_file, name=complete_file_name)
return super().to_internal_value(data)
def get_file_extension(self, file_name, decoded_file):
extension = imghdr.what(file_name, decoded_file)
extension = "jpg" if extension == "jpeg" else extension
return extension

25
api/v1/serializers/__init__.py
Unescape View File

@ -0,0 +1,25 @@
from rest_framework import serializers
class Base64ImageField(serializers.ImageField):
def to_internal_value(self, data):
if isinstance(data, six.string_types):
if 'data:' in data and ';base64,' in data:
header, data = data.split(';base64,')
try:
decoded_file = base64.b64decode(data)
except TypeError:
self.fail('invalid_image')
file_name = str(uuid.uuid4())[:12]
file_extension = self.get_file_extension(
file_name, decoded_file)
complete_file_name = "%s.%s" % (file_name, file_extension,)
data = ContentFile(decoded_file, name=complete_file_name)
return super().to_internal_value(data)
def get_file_extension(self, file_name, decoded_file):
extension = imghdr.what(file_name, decoded_file)
extension = "jpg" if extension == "jpeg" else extension
return extension

217
api/v1/serializers/content.py
Unescape View File

@ -0,0 +1,217 @@
import imghdr
import base64
import six
import uuid
from django.core.files.base import ContentFile
from rest_framework import serializers
from apps.content.models import (
Content, Image, Text, ImageText, Video,
Gallery, GalleryImage, ImageObject,
)
from . import Base64ImageField
# from .course import CourseSerializer
class ContentCreateSerializer(serializers.Serializer):
TYPE_CHOICES = (
'text',
'image',
'imagetext',
'video',
)
type = serializers.ChoiceField(choices=TYPE_CHOICES)
data = serializers.JSONField()
class ImageObjectSerializer(serializers.ModelSerializer):
image = Base64ImageField(
required=True, allow_empty_file=False, allow_null=False, read_only=False,
)
class Meta:
model = ImageObject
fields = (
'id',
'image',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class ImageCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Image
fields = (
'id',
'course',
'lesson',
'title',
'position',
'img',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class ImageSerializer(ImageCreateSerializer):
# course = CourseSerializer()
# lesson = LessonSerializer()
img = ImageObjectSerializer()
class TextCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Text
fields = (
'id',
'course',
'lesson',
'title',
'position',
'created_at',
'update_at',
) + ('txt',)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class TextSerializer(TextCreateSerializer):
pass
# course = CourseSerializer()
# lesson = LessonSerializer()
class ImageTextCreateSerializer(serializers.ModelSerializer):
class Meta:
model = ImageText
fields = (
'id',
'course',
'lesson',
'title',
'position',
'img',
'txt',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class ImageTextSerializer(ImageTextCreateSerializer):
# course = CourseSerializer()
# lesson = LessonSerializer()
img = ImageObjectSerializer()
class VideoCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Video
fields = (
'id',
'course',
'lesson',
'title',
'position',
'created_at',
'update_at',
) + ('url',)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class VideoSerializer(VideoCreateSerializer):
pass
# course = CourseSerializer()
# lesson = LessonSerializer()
class ContentSerializer(serializers.ModelSerializer):
class Meta:
model = Content
def to_representation(self, obj):
if isinstance(obj, Image):
return ImageSerializer(obj, context=self.context).to_representation(obj)
elif isinstance(obj, Text):
return TextSerializer(obj, context=self.context).to_representation(obj)
elif isinstance(obj, ImageText):
return ImageTextSerializer(obj, context=self.context).to_representation(obj)
elif isinstance(obj, Video):
return VideoSerializer(obj, context=self.context).to_representation(obj)
return super(ContentSerializer, self).to_representation(obj)
class GallerySerializer(serializers.ModelSerializer):
class Meta:
model = Gallery
fields = (
'id',
'title',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class GalleryImageCreateSerializer(serializers.ModelSerializer):
class Meta:
model = GalleryImage
fields = (
'id',
'gallery',
'img',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class GalleryImageSerializer(GalleryImageCreateSerializer):
img = ImageObjectSerializer()

245
api/v1/serializers.py → api/v1/serializers/course.py
Unescape View File

@ -1,77 +1,11 @@
from django.contrib.auth import get_user_model
from rest_framework import serializers
from . import Base64ImageField
from apps.course.models import Category, Course, Material, Lesson, Like
from apps.content.models import (
Image, Text, ImageText, Video,
Gallery, GalleryImage, ImageObject,
)
User = get_user_model()
class ImageObjectSerializer(serializers.ModelSerializer):
image = Base64ImageField(
required=True, allow_empty_file=False, allow_null=False, read_only=False,
)
class Meta:
model = ImageObject
fields = (
'id',
'image',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class GallerySerializer(serializers.ModelSerializer):
class Meta:
model = Gallery
fields = (
'id',
'title',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class GalleryImageCreateSerializer(serializers.ModelSerializer):
class Meta:
model = GalleryImage
fields = (
'id',
'gallery',
'img',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class GalleryImageSerializer(GalleryImageCreateSerializer):
img = ImageObjectSerializer()
from .content import (
ImageObjectSerializer, ContentSerializer, ContentCreateSerializer,
GallerySerializer, GalleryImageSerializer,
)
class MaterialCreateSerializer(serializers.ModelSerializer):
@ -130,19 +64,8 @@ class CategorySerializer(serializers.ModelSerializer):
)
class ContentSerializer(serializers.Serializer):
TYPE_CHOICES = (
'text',
'image',
'imagetext',
'video',
)
type = serializers.ChoiceField(choices=TYPE_CHOICES)
data = serializers.JSONField()
class CourseCreateSerializer(serializers.ModelSerializer):
content = serializers.ListSerializer(child=ContentSerializer())
content = serializers.ListSerializer(child=ContentCreateSerializer())
materials = MaterialSerializer(many=True)
class Meta:
@ -214,7 +137,7 @@ class CourseCreateSerializer(serializers.ModelSerializer):
course=course,
img=Image.objects.get(c['data']['img']),
)
elif c['type'] == 'imagetext':
elif c['type'] == 'image-text':
if 'id' in c['data']:
it = ImageText.objects.get(id=c['data']['id'])
it.position = c['data']['position']
@ -352,6 +275,7 @@ class CourseSerializer(CourseCreateSerializer):
materials = MaterialSerializer(many=True)
cover = ImageObjectSerializer()
gallery = GallerySerializer()
content = ContentSerializer(many=True)
class LessonCreateSerializer(serializers.ModelSerializer):
@ -380,158 +304,3 @@ class LessonCreateSerializer(serializers.ModelSerializer):
class LessonSerializer(LessonCreateSerializer):
course = CourseSerializer()
cover = ImageObjectSerializer()
class ImageCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Image
fields = (
'id',
'course',
'lesson',
'title',
'position',
'img',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class ImageSerializer(ImageCreateSerializer):
course = CourseSerializer()
lesson = LessonSerializer()
img = ImageObjectSerializer()
class TextCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Text
fields = (
'id',
'course',
'lesson',
'title',
'position',
'created_at',
'update_at',
) + ('txt',)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class TextSerializer(TextCreateSerializer):
course = CourseSerializer()
lesson = LessonSerializer()
class ImageTextCreateSerializer(serializers.ModelSerializer):
class Meta:
model = ImageText
fields = (
'id',
'course',
'lesson',
'title',
'position',
'img',
'txt',
'created_at',
'update_at',
)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class ImageTextSerializer(ImageTextCreateSerializer):
course = CourseSerializer()
lesson = LessonSerializer()
img = ImageObjectSerializer()
class VideoCreateSerializer(serializers.ModelSerializer):
class Meta:
model = Video
fields = (
'id',
'course',
'lesson',
'title',
'position',
'created_at',
'update_at',
) + ('url',)
read_only_fields = (
'id',
'created_at',
'update_at',
)
class VideoSerializer(VideoCreateSerializer):
course = CourseSerializer()
lesson = LessonSerializer()
class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = (
'id',
'username',
'email',
'first_name',
'last_name',
'is_staff',
'is_active',
'date_joined',
'role',
'gender',
'country',
'city',
'about',
'instagram',
'facebook',
'twitter',
'pinterest',
'youtube',
'vkontakte',
'fb_id',
'fb_data',
'is_email_proved',
'photo',
)
read_only_fields = (
'id',
'photo',
'date_joined',
'is_staff',
'fb_id',
'fb_data',
)
class UserPhotoSerializer(serializers.Serializer):
photo = Base64ImageField(
required=False, allow_empty_file=True, allow_null=True
)

53
api/v1/serializers/user.py
Unescape View File

@ -0,0 +1,53 @@
from django.contrib.auth import get_user_model
from rest_framework import serializers
from . import Base64ImageField
User = get_user_model()
class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = (
'id',
'username',
'email',
'first_name',
'last_name',
'is_staff',
'is_active',
'date_joined',
'role',
'gender',
'country',
'city',
'about',
'instagram',
'facebook',
'twitter',
'pinterest',
'youtube',
'vkontakte',
'fb_id',
'fb_data',
'is_email_proved',
'photo',
)
read_only_fields = (
'id',
'photo',
'date_joined',
'is_staff',
'fb_id',
'fb_data',
)
class UserPhotoSerializer(serializers.Serializer):
photo = Base64ImageField(
required=False, allow_empty_file=True, allow_null=True
)

12
api/v1/views.py
Unescape View File

@ -6,20 +6,26 @@ from rest_framework.decorators import detail_route, list_route
from rest_framework.response import Response
from . import ExtendedModelViewSet
from .serializers import (
from .serializers.course import (
CategorySerializer, LikeSerializer,
CourseSerializer, CourseCreateSerializer,
MaterialSerializer, MaterialCreateSerializer,
LessonSerializer, LessonCreateSerializer,
)
from .serializers.content import (
ImageSerializer, ImageCreateSerializer,
TextSerializer, TextCreateSerializer,
ImageTextSerializer, ImageTextCreateSerializer,
VideoSerializer, VideoCreateSerializer,
GallerySerializer,
GalleryImageSerializer, GalleryImageCreateSerializer,
UserSerializer, UserPhotoSerializer,
LessonSerializer, LessonCreateSerializer,
ImageObjectSerializer,
)
from .serializers.user import (
UserSerializer, UserPhotoSerializer,
)
from .permissions import IsAdmin, IsAdminOrIsSelf, IsAuthorOrAdmin, IsAuthorObjectOrAdmin
from apps.course.models import Category, Course, Material, Lesson, Like

3
apps/content/admin.py
Unescape View File

@ -23,6 +23,9 @@ class ImageObjectAdmin(admin.ModelAdmin):
class ContentChildAdmin(PolymorphicChildModelAdmin):
base_model = Content
base_fieldsets = (
(None, {'fields': ('course', 'lesson', 'title', 'position',)}),
)
@admin.register(Image)

Write Preview
Loading…
Cancel
Save