email verfication and user notification bug

This commit is contained in:
jain
2023-08-16 16:16:05 +05:30
parent 451c3bdae7
commit 60af098e1e

View File

@ -401,12 +401,13 @@ class AdminLoginViewSet(viewsets.GenericViewSet):
class UserEmailVerification(viewsets.ModelViewSet):
"""User Email verification"""
serializer_class = EmailVerificationSerializer
http_method_names = ('post',)
def list(self, request, *args, **kwargs):
def create(self, request, *args, **kwargs):
try:
user_obj = User.objects.filter(username=self.request.GET.get('email')).last()
email_data = UserEmailOtp.objects.filter(email=self.request.GET.get('email'),
otp=self.request.GET.get('otp')).last()
user_obj = User.objects.filter(username=self.request.data.get('email')).last()
email_data = UserEmailOtp.objects.filter(email=self.request.data.get('email'),
otp=self.request.data.get('otp')).last()
if email_data:
input_datetime_str = str(email_data.expired_at)
input_format = "%Y-%m-%d %H:%M:%S.%f%z"
@ -420,12 +421,12 @@ class UserEmailVerification(viewsets.ModelViewSet):
email_data.is_verified = True
email_data.save()
if email_data.user_type == '1':
junior_data = Junior.objects.filter(auth__email=self.request.GET.get('email')).last()
junior_data = Junior.objects.filter(auth__email=self.request.data.get('email')).last()
if junior_data:
junior_data.is_verified = True
junior_data.save()
else:
guardian_data = Guardian.objects.filter(user__email=self.request.GET.get('email')).last()
guardian_data = Guardian.objects.filter(user__email=self.request.data.get('email')).last()
if guardian_data:
guardian_data.is_verified = True
guardian_data.save()
@ -535,7 +536,7 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet):
permission_classes = [IsAuthenticated]
def list(self, request, *args, **kwargs):
"""profile view"""
queryset = self.queryset.filter(user=request.user)
queryset = UserNotification.objects.filter(user=request.user)
serializer = UserNotificationSerializer(queryset, many=True)
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)