From 32476149bce05657473f7a922d7517183fefef1a Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 25 Jul 2023 15:33:22 +0530 Subject: [PATCH] article card folder name change --- base/constants.py | 2 ++ web_admin/serializers.py | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/base/constants.py b/base/constants.py index b351cde..3c1501c 100644 --- a/base/constants.py +++ b/base/constants.py @@ -107,3 +107,5 @@ MAX_ARTICLE_SURVEY = 10 # real time url time_url = "http://worldtimeapi.org/api/timezone/Asia/Riyadh" + +ARTICLE_CARD_IMAGE_FOLDER = 'article-card-images' diff --git a/web_admin/serializers.py b/web_admin/serializers.py index 7027c47..185482f 100644 --- a/web_admin/serializers.py +++ b/web_admin/serializers.py @@ -5,8 +5,8 @@ web_admin serializers file from rest_framework import serializers from django.contrib.auth import get_user_model -from base.constants import ARTICLE_SURVEY_POINTS, MAX_ARTICLE_CARD, MIN_ARTICLE_SURVEY, MAX_ARTICLE_SURVEY, NUMBER, \ - USER_TYPE +from base.constants import (ARTICLE_SURVEY_POINTS, MAX_ARTICLE_CARD, MIN_ARTICLE_SURVEY, MAX_ARTICLE_SURVEY, NUMBER, + USER_TYPE, ARTICLE_CARD_IMAGE_FOLDER) # local imports from base.messages import ERROR_CODE from guardian.utils import upload_image_to_alibaba @@ -34,7 +34,7 @@ class ArticleCardSerializer(serializers.ModelSerializer): def create(self, validated_data): if 'image' in validated_data and validated_data['image'] is not None: image = validated_data.pop('image') - filename = f"article/{image.name}" + filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}" # upload image on ali baba validated_data['image_url'] = upload_image_to_alibaba(image, filename) article_card = ArticleCard.objects.create(article_id='1', **validated_data) @@ -113,7 +113,7 @@ class ArticleSerializer(serializers.ModelSerializer): card = pop_id(card) if 'image' in card and card['image'] is not None: image = card.pop('image') - filename = f"article/{image.name}" + filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}" # upload image on ali baba card['image_url'] = upload_image_to_alibaba(image, filename) ArticleCard.objects.create(article=article, **card) @@ -149,7 +149,7 @@ class ArticleSerializer(serializers.ModelSerializer): card.description = card_data.get('description', card.description) if 'image' in card_data and card_data['image'] is not None: image = card_data.pop('image') - filename = f"article/{image.name}" + filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}" # upload image on ali baba card.image_url = upload_image_to_alibaba(image, filename) card.save() @@ -157,7 +157,7 @@ class ArticleSerializer(serializers.ModelSerializer): card_data = pop_id(card_data) if 'image' in card_data and card_data['image'] is not None: image = card_data.pop('image') - filename = f"article/{image.name}" + filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}" # upload image on ali baba card_data['image_url'] = upload_image_to_alibaba(image, filename) ArticleCard.objects.create(article=instance, **card_data) @@ -218,7 +218,7 @@ class DefaultArticleCardImageSerializer(serializers.ModelSerializer): :return: card_image object """ image = validated_data.pop('image') - filename = f"article/{image.name}" + filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}" if image and image.size == NUMBER['zero']: raise serializers.ValidationError(ERROR_CODE['2035']) # upload image on ali baba @@ -276,4 +276,3 @@ class UserManagementListSerializer(serializers.ModelSerializer): return dict(USER_TYPE).get('1') else: return None -