Merge pull request #12 from rockstarr-programmerr/dev

Dev

Author: rockstarr-programmerr

account/models.py

@@ -7,11 +7,6 @@
 from account.managers import (CustomUserManager, StudentManager,
                               TeacherManager, UserTypes)
 
-AVATAR_WIDTH = 256
-AVATAR_HEIGHT = 256
-AVATAR_THUMBNAIL_WIDTH = 64
-AVATAR_THUMBNAIL_HEIGHT = 64
-
 
 class User(AbstractUser):
     Types = UserTypes
@@ -59,21 +54,6 @@ class User(AbstractUser):
     def __str__(self):
         return f'{self.name} ({self.email}) - {self.get_user_type_display()}'
 
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        self._make_thumbnail(self.avatar, AVATAR_WIDTH, AVATAR_HEIGHT)
-        self._make_thumbnail(self.avatar_thumbnail, AVATAR_THUMBNAIL_WIDTH, AVATAR_THUMBNAIL_HEIGHT)
-
-    @staticmethod
-    def _make_thumbnail(image, width, height):
-        if image and (
-            image.width > width or
-            image.height > height
-        ):
-            with Image.open(image.path) as f:
-                f.thumbnail((width, height))
-                f.save(image.path)
-
     def is_teacher(self):
         return self.user_type == self.Types.TEACHER
 

account/serializers.py

@@ -1,7 +1,11 @@
+import io
+
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.password_validation import validate_password
+from django.core.files.images import ImageFile
 from django.utils.translation import gettext as _
+from PIL import Image
 from rest_framework import serializers
 
 User = get_user_model()
@@ -26,7 +30,12 @@ class Meta:
     def validate(self, attrs):
         attrs = super().validate(attrs)
         if 'avatar' in attrs:
-            attrs['avatar_thumbnail'] = attrs['avatar']
+            avatar = attrs['avatar']
+            if avatar:
+                attrs['avatar'] = self._make_thumbnail(avatar, 256, 256)
+                attrs['avatar_thumbnail'] = self._make_thumbnail(avatar, 64, 64)
+            else:
+                attrs['avatar_thumbnail'] = avatar  # When remove avatar, also remove avatar_thumbnail
         return attrs
 
     def validate_avatar(self, img):
@@ -42,6 +51,17 @@ def validate_avatar(self, img):
 
         return img
 
+    @staticmethod
+    def _make_thumbnail(image, width, height):
+        thumb = Image.open(image)
+        thumb.thumbnail((width, height))
+
+        buffer = io.BytesIO()
+        thumb.save(buffer, format=thumb.format)
+
+        data = ImageFile(buffer, name=image.name)
+        return data
+
 
 class RegisterTeacherSerializer(UserSerializer):
     class Meta(UserSerializer.Meta):

classroom/business/teacher/classroom.py

@@ -1,7 +1,8 @@
 import secrets
+import os
 
-from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.core.files.storage import default_storage
 
 from classroom.tasks import send_temp_password_for_new_students_task
 
@@ -73,19 +74,15 @@ def resend_password_emails(classroom, email):
     )
 
 
-def upload_reading_exercise_image(image, request=None):
-    path = settings.MEDIA_ROOT / 'classroom' / 'reading_exercises' / 'uploaded_images' / image.name
-    path.parent.mkdir(parents=True, exist_ok=True)
-    if path.exists():
-        unique_name = path.stem + secrets.token_urlsafe(nbytes=8)
-        path = path.parent / f'{unique_name}{path.suffix}'
+def upload_reading_exercise_image(image):
+    directory = 'classroom/reading_exercises/uploaded_images'
+    path = f'{directory}/{image.name}'
 
-    with open(path, 'wb+') as destination:
-        for chunk in image.chunks():
-            destination.write(chunk)
+    if default_storage.exists(path):
+        img_name, img_ext = os.path.splitext(image.name)
+        unique_name = img_name + secrets.token_urlsafe(nbytes=8)
+        path = f'{directory}/{unique_name}{img_ext}'
 
-    rpath = path.relative_to(settings.BASE_DIR)
-    url = '/' + str(rpath).replace('\\', '/')
-    if request:
-        url = request.build_absolute_uri(url)
+    default_storage.save(path, image)
+    url = default_storage.url(path)
     return url

classroom/views/exercise.py

@@ -43,6 +43,6 @@ def upload_image(self, request):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         image = serializer.validated_data['image']
-        image_url = business.upload_reading_exercise_image(image, request=request)
+        image_url = business.upload_reading_exercise_image(image)
         serializer = self.get_serializer(instance={'image_url': image_url})
         return Response(serializer.data)

keep_learning/settings.py

@@ -58,6 +58,13 @@
     CELERY_BROKER_URL=(str, 'amqp://kl_user:kl_password@localhost:5672/kl_vhost'),
     WEB_LOGIN_URL=(str, 'http://localhost:8080/login'),
     WEB_RESET_PASSWORD_URL=(str, 'http://localhost:8080/new-password'),
+    DEFAULT_FILE_STORAGE=(str, 'django.core.files.storage.FileSystemStorage'),
+
+    AWS_S3_ACCESS_KEY_ID=(str, ''),
+    AWS_S3_SECRET_ACCESS_KEY=(str, ''),
+    AWS_STORAGE_BUCKET_NAME=(str, ''),
+    AWS_S3_REGION_NAME=(str, ''),
+    AWS_S3_FILE_OVERWRITE=(bool, False),
 )
 # reading .env file
 env_file = str(BASE_DIR / '.env')
@@ -285,3 +292,11 @@
 WEB_RESET_PASSWORD_URL = env('WEB_RESET_PASSWORD_URL')
 
 MAX_UPLOAD_SIZE_MEGABYTES = 10
+
+DEFAULT_FILE_STORAGE = env('DEFAULT_FILE_STORAGE')
+
+AWS_S3_ACCESS_KEY_ID = env('AWS_S3_ACCESS_KEY_ID')
+AWS_S3_SECRET_ACCESS_KEY = env('AWS_S3_SECRET_ACCESS_KEY')
+AWS_STORAGE_BUCKET_NAME = env('AWS_STORAGE_BUCKET_NAME')
+AWS_S3_REGION_NAME = env('AWS_S3_REGION_NAME')
+AWS_S3_FILE_OVERWRITE = env('AWS_S3_FILE_OVERWRITE')

requirements.txt

@@ -1,6 +1,8 @@
 amqp==5.0.6
 asgiref==3.4.1
 billiard==3.6.4.0
+boto3==1.18.64
+botocore==1.21.64
 celery==5.1.2
 click==7.1.2
 click-didyoumean==0.3.0
@@ -11,16 +13,20 @@ django-cors-headers==3.9.0
 django-crispy-forms==1.13.0
 django-environ==0.7.0
 django-filter==21.1
+django-storages==1.12.2
 djangorestframework==3.12.4
 djangorestframework-simplejwt==4.8.0
+jmespath==0.10.0
 kombu==5.1.0
 Markdown==3.3.4
 Pillow==8.3.2
 prompt-toolkit==3.0.20
 PyJWT==2.1.0
 python-dateutil==2.8.2
 pytz==2021.3
+s3transfer==0.5.0
 six==1.16.0
 sqlparse==0.4.2
+urllib3==1.26.7
 vine==5.0.0
 wcwidth==0.2.5