Merge branch 'dev' into sprint3

This commit is contained in:
Ankitajain-kiwi
2023-07-19 17:51:58 +05:30
committed by GitHub
12 changed files with 203 additions and 5 deletions

View File

@ -1,11 +1,11 @@
"""Views of Guardian"""
"""Third party Django app"""
# django imports
from rest_framework.permissions import IsAuthenticated
from rest_framework import viewsets, status
from rest_framework.pagination import PageNumberPagination
from django.contrib.auth.models import User
from django.utils import timezone
"""Import Django app"""
# Import guardian's model,
# Import junior's model,
@ -19,7 +19,6 @@ from django.utils import timezone
# Import account's serializer
# Import account's task
from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer,
TopJuniorSerializer, ApproveJuniorSerializer, ApproveTaskSerializer)
from .models import Guardian, JuniorTask
@ -31,6 +30,8 @@ from account.utils import custom_response, custom_error_response
from base.messages import ERROR_CODE, SUCCESS_CODE
from base.constants import NUMBER
from .utils import upload_image_to_alibaba
from notifications.constants import REGISTRATION
from notifications.utils import send_notification
""" Define APIs """
# Define Signup API,
@ -62,6 +63,7 @@ class SignupViewset(viewsets.ModelViewSet):
user_type=str(request.data['user_type']), expired_at=expiry)
"""Send email to the register user"""
send_otp_email(request.data['email'], otp)
send_notification(REGISTRATION, None, request.auth.payload['user_id'], {})
return custom_response(SUCCESS_CODE['3001'],
response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)