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

Merge pull request #227 from KiwiTechLLC/sprint5

Browse Source 
Sprint5
This commit is contained in:
Ankitajain-kiwi
2023-08-18 18:32:21 +05:30
committed by GitHub
parent 4bc91abebf 3921f76f22
commit dfb73a7d36
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guardian/views.py
View File

@ -66,7 +66,7 @@ class SignupViewset(viewsets.ModelViewSet):
"""Generate otp"""
otp = generate_otp()
# expire otp after 1 day
expiry = OTP_EXPIRY
expiry = timezone.now() + timezone.timedelta(days=1)
# create user email otp object
UserEmailOtp.objects.create(email=request.data['email'], otp=otp,
user_type=str(request.data['user_type']), expired_at=expiry)
@ -262,7 +262,7 @@ class ApproveJuniorAPIView(viewsets.ViewSet):
guardian = Guardian.objects.filter(user__email=self.request.user).last()
# fetch junior query
junior_queryset = Junior.objects.filter(id=self.request.data.get('junior_id')).last()
if junior_queryset and junior_queryset.is_deleted:
if junior_queryset and (junior_queryset.is_deleted or not junior_queryset.is_active):
return custom_error_response(ERROR_CODE['2073'], response_status=status.HTTP_400_BAD_REQUEST)
# action 1 is use for approve and 2 for reject
if request.data['action'] == '1':
@ -297,7 +297,7 @@ class ApproveTaskAPIView(viewsets.ViewSet):
task_queryset = JuniorTask.objects.filter(id=self.request.data.get('task_id'),
guardian=guardian,
junior=self.request.data.get('junior_id')).last()
if task_queryset and task_queryset.junior.is_deleted:
if task_queryset and (task_queryset.junior.is_deleted or not task_queryset.junior.is_active):
return custom_error_response(ERROR_CODE['2072'], response_status=status.HTTP_400_BAD_REQUEST)
# use ApproveJuniorSerializer serializer
serializer = ApproveTaskSerializer(context={"guardian_code": guardian.guardian_code,