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

optimized task status code

Browse Source
This commit is contained in:
jain
2023-09-04 15:22:15 +05:30
parent 20fa6e43da
commit 116fb00358
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
account/utils.py
View File

@ -313,3 +313,12 @@ def make_special_password(length=10):
password_list = list(password)
random.shuffle(password_list)
return ''.join(password_list)
def task_status_fun(status_value):
"""task status"""
task_status_value = ['1']
if str(status_value) == '2':
task_status_value = ['2', '4']
elif str(status_value) == '3':
task_status_value = ['3', '5', '6']
return task_status_value

8
guardian/views.py
View File

@ -37,7 +37,7 @@ from .models import Guardian, JuniorTask
from junior.models import Junior, JuniorPoints, JuniorGuardianRelationship
from account.models import UserEmailOtp, UserNotification, UserDeviceDetails
from .tasks import generate_otp
from account.utils import custom_response, custom_error_response, OTP_EXPIRY, send_otp_email
from account.utils import custom_response, custom_error_response, send_otp_email, task_status_fun
from base.messages import ERROR_CODE, SUCCESS_CODE
from base.constants import NUMBER, GUARDIAN_CODE_STATUS, GUARDIAN
from .utils import upload_image_to_alibaba
@ -159,11 +159,7 @@ class TaskListAPIView(viewsets.ModelViewSet):
current_page = self.request.GET.get('page')
junior = self.request.GET.get('junior')
queryset = self.get_queryset()
task_status = ['1']
if str(status_value) == '2':
task_status = ['2', '4']
elif str(status_value) == '3':
task_status = ['3', '5', '6']
task_status = task_status_fun(status_value)
if status_value and not junior:
queryset = queryset.filter(task_status__in=task_status)
elif status_value and junior:

8
junior/views.py
View File

@ -44,7 +44,7 @@ from guardian.models import Guardian, JuniorTask
from guardian.serializers import TaskDetailsSerializer, TaskDetailsjuniorSerializer
from base.messages import ERROR_CODE, SUCCESS_CODE
from base.constants import NUMBER, ARTICLE_STATUS, none, GUARDIAN
from account.utils import custom_response, custom_error_response
from account.utils import custom_response, custom_error_response, task_status_fun
from guardian.utils import upload_image_to_alibaba
from .utils import update_positions_based_on_points
from notifications.utils import send_notification
@ -369,11 +369,7 @@ class JuniorTaskListAPIView(viewsets.ModelViewSet):
status_value = self.request.GET.get('status')
current_page = self.request.GET.get('page')
queryset = self.get_queryset()
task_status = ['1']
if str(status_value) == '2':
task_status = ['2', '4']
elif str(status_value) == '3':
task_status = ['3', '5', '6']
task_status = task_status_fun(status_value)
if status_value:
queryset = queryset.filter(task_status__in=task_status)
paginator = self.pagination_class()