mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-07-16 02:16:16 +00:00
article bug fixed, changed image name in get image url
This commit is contained in:
@ -62,7 +62,7 @@ class SignupViewset(viewsets.ModelViewSet):
|
|||||||
if request.data['user_type'] in [str(NUMBER['one']), str(NUMBER['two'])]:
|
if request.data['user_type'] in [str(NUMBER['one']), str(NUMBER['two'])]:
|
||||||
serializer = UserSerializer(context=request.data['user_type'], data=request.data)
|
serializer = UserSerializer(context=request.data['user_type'], data=request.data)
|
||||||
if serializer.is_valid():
|
if serializer.is_valid():
|
||||||
user = serializer.save()
|
serializer.save()
|
||||||
"""Generate otp"""
|
"""Generate otp"""
|
||||||
otp = generate_otp()
|
otp = generate_otp()
|
||||||
# expire otp after 1 day
|
# expire otp after 1 day
|
||||||
@ -79,7 +79,9 @@ class SignupViewset(viewsets.ModelViewSet):
|
|||||||
return custom_error_response(ERROR_CODE['2028'], response_status=status.HTTP_400_BAD_REQUEST)
|
return custom_error_response(ERROR_CODE['2028'], response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
class UpdateGuardianProfile(viewsets.ViewSet):
|
class UpdateGuardianProfile(viewsets.ViewSet):
|
||||||
"""Update guardian profile"""
|
"""
|
||||||
|
Update guardian profile
|
||||||
|
"""
|
||||||
serializer_class = CreateGuardianSerializer
|
serializer_class = CreateGuardianSerializer
|
||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ def get_image_url(data):
|
|||||||
return data['image_url']
|
return data['image_url']
|
||||||
elif 'image_url' in data and type(data['image_url']) == str and data['image_url'].startswith('data:image'):
|
elif 'image_url' in data and type(data['image_url']) == str and data['image_url'].startswith('data:image'):
|
||||||
base64_image = base64.b64decode(data.get('image_url').split(',')[1])
|
base64_image = base64.b64decode(data.get('image_url').split(',')[1])
|
||||||
image_name = f"{data['title']} {data.pop('image_name')}" if 'image_name' in data else data['title']
|
image_name = data.pop('image_name') if 'image_name' in data else f"{data['title']}.jpg"
|
||||||
filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image_name}"
|
filename = f"{ARTICLE_CARD_IMAGE_FOLDER}/{image_name}"
|
||||||
# upload image on ali baba
|
# upload image on ali baba
|
||||||
image_url = upload_image_to_alibaba(base64_image, filename)
|
image_url = upload_image_to_alibaba(base64_image, filename)
|
||||||
|
@ -224,8 +224,7 @@ class AnalyticsViewSet(GenericViewSet):
|
|||||||
queryset = JuniorPoints.objects.prefetch_related('junior', 'junior__auth').annotate(rank=Window(
|
queryset = JuniorPoints.objects.prefetch_related('junior', 'junior__auth').annotate(rank=Window(
|
||||||
expression=Rank(),
|
expression=Rank(),
|
||||||
order_by=[F('total_points').desc(), 'junior__created_at']
|
order_by=[F('total_points').desc(), 'junior__created_at']
|
||||||
)).order_by('-total_points', 'junior__created_at')
|
)).order_by('-total_points', 'junior__created_at')[:15]
|
||||||
|
|
||||||
df_leaderboard = pd.DataFrame([
|
df_leaderboard = pd.DataFrame([
|
||||||
{
|
{
|
||||||
'Junior Name': f"{junior.junior.auth.first_name} {junior.junior.auth.last_name}"
|
'Junior Name': f"{junior.junior.auth.first_name} {junior.junior.auth.last_name}"
|
||||||
|
Reference in New Issue
Block a user