ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-07-15 18:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

limit for 3 guardian code and article list API optimization

Browse Source
This commit is contained in:
jain
2023-08-24 16:08:20 +05:30
parent ab1a2be679
commit e9aa2dfda9
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
base/constants.py
View File

@ -43,7 +43,8 @@ FILE_SIZE = 5 * 1024 * 1024
# String constant for configurable date for allocation lock period # String constant for configurable date for allocation lock period
ALLOCATION_LOCK_DATE = 1 ALLOCATION_LOCK_DATE = 1
# guardian code status tuple
guardian_code_tuple = ('1','3')
"""user type""" """user type"""
USER_TYPE = ( USER_TYPE = (
('1', 'junior'), ('1', 'junior'),

5
guardian/views.py
View File

@ -10,7 +10,7 @@ from rest_framework.permissions import IsAuthenticated
from rest_framework import viewsets, status from rest_framework import viewsets, status
from rest_framework.pagination import PageNumberPagination from rest_framework.pagination import PageNumberPagination
from django.contrib.auth.models import User from django.contrib.auth.models import User
from base.constants import guardian_code_tuple
from rest_framework.filters import SearchFilter from rest_framework.filters import SearchFilter
from django.utils import timezone from django.utils import timezone
@ -178,7 +178,8 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
junior = request.data['junior'] junior = request.data['junior']
junior_id = Junior.objects.filter(id=junior).last() junior_id = Junior.objects.filter(id=junior).last()
guardian_data = Guardian.objects.filter(user=request.user).last() guardian_data = Guardian.objects.filter(user=request.user).last()
if guardian_data.guardian_code not in junior_id.guardian_code: if (guardian_data.guardian_code not in junior_id.guardian_code or
junior_id.guardian_code_status in guardian_code_tuple):
return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST)
allowed_extensions = ['.jpg', '.jpeg', '.png'] allowed_extensions = ['.jpg', '.jpeg', '.png']
if not any(extension in str(image) for extension in allowed_extensions): if not any(extension in str(image) for extension in allowed_extensions):

8
junior/views.py
View File

@ -191,6 +191,8 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
return custom_error_response(ERROR_CODE['2077'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2077'], response_status=status.HTTP_400_BAD_REQUEST)
elif not data: elif not data:
return custom_error_response(ERROR_CODE['2076'], response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(ERROR_CODE['2076'], response_status=status.HTTP_400_BAD_REQUEST)
if data == "Max":
return custom_error_response(ERROR_CODE['2081'], response_status=status.HTTP_400_BAD_REQUEST)
return custom_response(SUCCESS_CODE['3021'], response_status=status.HTTP_200_OK) return custom_response(SUCCESS_CODE['3021'], response_status=status.HTTP_200_OK)
# use AddJuniorSerializer serializer # use AddJuniorSerializer serializer
serializer = AddJuniorSerializer(data=request.data, context=info_data) serializer = AddJuniorSerializer(data=request.data, context=info_data)
@ -209,10 +211,12 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
return none return none
if junior.guardian_code and (guardian.guardian_code in junior.guardian_code): if junior.guardian_code and (guardian.guardian_code in junior.guardian_code):
return False return False
if type(junior.guardian_code) is list: if not junior.guardian_code:
junior.guardian_code = [guardian.guardian_code]
if type(junior.guardian_code) is list and len(junior.guardian_code) < 4:
junior.guardian_code.append(guardian.guardian_code) junior.guardian_code.append(guardian.guardian_code)
else: else:
junior.guardian_code = [guardian.guardian_code] return "Max"
junior.guardian_code_status = str(NUMBER['two']) junior.guardian_code_status = str(NUMBER['two'])
junior.save() junior.save()
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior, JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior,

10
web_admin/serializers/article_serializer.py
View File

@ -219,8 +219,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
""" """
serializer for article API serializer for article API
""" """
article_cards = ArticleCardSerializer(many=True) image = serializers.SerializerMethodField('get_image')
article_survey = ArticleSurveySerializer(many=True)
total_points = serializers.SerializerMethodField('get_total_points') total_points = serializers.SerializerMethodField('get_total_points')
is_completed = serializers.SerializerMethodField('get_is_completed') is_completed = serializers.SerializerMethodField('get_is_completed')
@ -229,8 +228,13 @@ class ArticleListSerializer(serializers.ModelSerializer):
meta class meta class
""" """
model = Article model = Article
fields = ('id', 'title', 'description', 'article_cards', 'article_survey', 'total_points', 'is_completed') fields = ('id', 'title', 'description','image', 'total_points', 'is_completed')
def get_image(self, obj):
"""article image"""
if obj.article_cards.first():
return obj.article_cards.first().image_url
return None
def get_total_points(self, obj): def get_total_points(self, obj):
"""total points of article""" """total points of article"""
total_question = ArticleSurvey.objects.filter(article=obj).count() total_question = ArticleSurvey.objects.filter(article=obj).count()