ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-26 16:44:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108 from KiwiTechLLC/ZBKADM-67

Browse Source 
article card folder name change
This commit is contained in:
dilipshrivastwa-kiwi
2023-07-25 15:52:22 +05:30
committed by GitHub
parent c57224ad0e 32476149bc
commit cc3490b059
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/constants.py
View File

@ -107,3 +107,5 @@ MAX_ARTICLE_SURVEY = 10
# real time url # real time url
time_url = "http://worldtimeapi.org/api/timezone/Asia/Riyadh" time_url = "http://worldtimeapi.org/api/timezone/Asia/Riyadh"
ARTICLE_CARD_IMAGE_FOLDER = 'article-card-images'

15
web_admin/serializers.py
View File

@ -5,8 +5,8 @@ web_admin serializers file
from rest_framework import serializers from rest_framework import serializers
from django.contrib.auth import get_user_model 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, \ from base.constants import (ARTICLE_SURVEY_POINTS, MAX_ARTICLE_CARD, MIN_ARTICLE_SURVEY, MAX_ARTICLE_SURVEY, NUMBER,
USER_TYPE USER_TYPE, ARTICLE_CARD_IMAGE_FOLDER)
# local imports # local imports
from base.messages import ERROR_CODE from base.messages import ERROR_CODE
from guardian.utils import upload_image_to_alibaba from guardian.utils import upload_image_to_alibaba
@ -34,7 +34,7 @@ class ArticleCardSerializer(serializers.ModelSerializer):
def create(self, validated_data): def create(self, validated_data):
if 'image' in validated_data and validated_data['image'] is not None: if 'image' in validated_data and validated_data['image'] is not None:
image = validated_data.pop('image') image = validated_data.pop('image')
filename = f"article/{image.name}" filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}"
# upload image on ali baba # upload image on ali baba
validated_data['image_url'] = upload_image_to_alibaba(image, filename) validated_data['image_url'] = upload_image_to_alibaba(image, filename)
article_card = ArticleCard.objects.create(article_id='1', **validated_data) article_card = ArticleCard.objects.create(article_id='1', **validated_data)
@ -113,7 +113,7 @@ class ArticleSerializer(serializers.ModelSerializer):
card = pop_id(card) card = pop_id(card)
if 'image' in card and card['image'] is not None: if 'image' in card and card['image'] is not None:
image = card.pop('image') image = card.pop('image')
filename = f"article/{image.name}" filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}"
# upload image on ali baba # upload image on ali baba
card['image_url'] = upload_image_to_alibaba(image, filename) card['image_url'] = upload_image_to_alibaba(image, filename)
ArticleCard.objects.create(article=article, **card) ArticleCard.objects.create(article=article, **card)
@ -149,7 +149,7 @@ class ArticleSerializer(serializers.ModelSerializer):
card.description = card_data.get('description', card.description) card.description = card_data.get('description', card.description)
if 'image' in card_data and card_data['image'] is not None: if 'image' in card_data and card_data['image'] is not None:
image = card_data.pop('image') image = card_data.pop('image')
filename = f"article/{image.name}" filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}"
# upload image on ali baba # upload image on ali baba
card.image_url = upload_image_to_alibaba(image, filename) card.image_url = upload_image_to_alibaba(image, filename)
card.save() card.save()
@ -157,7 +157,7 @@ class ArticleSerializer(serializers.ModelSerializer):
card_data = pop_id(card_data) card_data = pop_id(card_data)
if 'image' in card_data and card_data['image'] is not None: if 'image' in card_data and card_data['image'] is not None:
image = card_data.pop('image') image = card_data.pop('image')
filename = f"article/{image.name}" filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image.name}"
# upload image on ali baba # upload image on ali baba
card_data['image_url'] = upload_image_to_alibaba(image, filename) card_data['image_url'] = upload_image_to_alibaba(image, filename)
ArticleCard.objects.create(article=instance, **card_data) ArticleCard.objects.create(article=instance, **card_data)
@ -218,7 +218,7 @@ class DefaultArticleCardImageSerializer(serializers.ModelSerializer):
:return: card_image object :return: card_image object
""" """
image = validated_data.pop('image') 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']: if image and image.size == NUMBER['zero']:
raise serializers.ValidationError(ERROR_CODE['2035']) raise serializers.ValidationError(ERROR_CODE['2035'])
# upload image on ali baba # upload image on ali baba
@ -276,4 +276,3 @@ class UserManagementListSerializer(serializers.ModelSerializer):
return dict(USER_TYPE).get('1') return dict(USER_TYPE).get('1')
else: else:
return None return None