Merge branch 'dev' into sprint5

account/views.py

@@ -39,7 +39,7 @@ from base.messages import ERROR_CODE, SUCCESS_CODE
 from base.constants import NUMBER, ZOD, JUN, GRD, USER_TYPE_FLAG
 from guardian.tasks import generate_otp
 from account.utils import (send_otp_email, send_support_email, custom_response, custom_error_response,
-                           generate_code, OTP_EXPIRY, user_device_details)
+                           generate_code, OTP_EXPIRY, user_device_details, send_all_email)
 from junior.serializers import JuniorProfileSerializer
 from guardian.serializers import GuardianProfileSerializer
 
@@ -193,15 +193,30 @@ class UpdateProfileImage(views.APIView):
             return custom_error_response(ERROR_CODE['2036'],response_status=status.HTTP_400_BAD_REQUEST)
 
 class ChangePasswordAPIView(views.APIView):
-    """change password"""
+    """
+    change password"
+    """
     serializer_class = ChangePasswordSerializer
     permission_classes = [IsAuthenticated]
+
     def post(self, request):
-        serializer = ChangePasswordSerializer(context=request.user, data=request.data)
+        """
+        POST request to change current login user password
+        """
+        serializer = ChangePasswordSerializer(
+            context=request.user,
+            data=request.data
+        )
         if serializer.is_valid():
             serializer.save()
-            return custom_response(SUCCESS_CODE['3007'], response_status=status.HTTP_200_OK)
-        return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
+            return custom_response(
+                SUCCESS_CODE['3007'],
+                response_status=status.HTTP_200_OK
+            )
+        return custom_error_response(
+            serializer.errors,
+            response_status=status.HTTP_400_BAD_REQUEST
+        )
 
 class ResetPasswordAPIView(views.APIView):
     """Reset password"""
@@ -213,40 +228,40 @@ class ResetPasswordAPIView(views.APIView):
         return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
 
 class ForgotPasswordAPIView(views.APIView):
-    """Forgot password"""
+    """
+    Forgot password
+    """
+    serializer_class = ForgotPasswordSerializer
 
     def post(self, request):
-        serializer = ForgotPasswordSerializer(data=request.data)
-        if serializer.is_valid():
-            email = serializer.validated_data['email']
-            try:
-                User.objects.get(email=email)
-            except User.DoesNotExist:
-                return custom_error_response(ERROR_CODE['2004'], response_status=status.HTTP_404_NOT_FOUND)
-            verification_code = generate_otp()
-            # Send the verification code to the user's email
-            from_email = settings.EMAIL_FROM_ADDRESS
-            recipient_list = [email]
-            send_templated_mail(
-                template_name='email_reset_verification.email',
-                from_email=from_email,
-                recipient_list=recipient_list,
-                context={
-                    'verification_code': verification_code
-                }
-            )
-            expiry = timezone.now() + timezone.timedelta(days=1)
-            user_data, created = UserEmailOtp.objects.get_or_create(email=email)
-            if created:
-                user_data.expired_at = expiry
-                user_data.save()
-            if user_data:
-                user_data.otp = verification_code
-                user_data.expired_at = expiry
-                user_data.save()
-            return custom_response(SUCCESS_CODE['3015'],
-                                   response_status=status.HTTP_200_OK)
-        return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
+
+        """
+        Post method to validate serializer
+        """
+        serializer = self.serializer_class(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        email = serializer.validated_data['email']
+        # generate otp
+        verification_code = generate_otp()
+        # Send the verification code to the user's email
+        send_all_email.delay(
+            'email_reset_verification.email', email, verification_code
+        )
+        expiry = OTP_EXPIRY
+        user_data, created = UserEmailOtp.objects.get_or_create(
+            email=email
+        )
+        if created:
+            user_data.expired_at = expiry
+            user_data.save()
+        if user_data:
+            user_data.otp = verification_code
+            user_data.expired_at = expiry
+            user_data.save()
+        return custom_response(
+            SUCCESS_CODE['3015'],
+            response_status=status.HTTP_200_OK
+        )
 
 class SendPhoneOtp(viewsets.ModelViewSet):
     """Send otp on phone"""