mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-08-26 06:09:41 +00:00
email verfication and user notification bug
This commit is contained in:
@ -401,12 +401,13 @@ class AdminLoginViewSet(viewsets.GenericViewSet):
|
|||||||
class UserEmailVerification(viewsets.ModelViewSet):
|
class UserEmailVerification(viewsets.ModelViewSet):
|
||||||
"""User Email verification"""
|
"""User Email verification"""
|
||||||
serializer_class = EmailVerificationSerializer
|
serializer_class = EmailVerificationSerializer
|
||||||
|
http_method_names = ('post',)
|
||||||
|
|
||||||
def list(self, request, *args, **kwargs):
|
def create(self, request, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
user_obj = User.objects.filter(username=self.request.GET.get('email')).last()
|
user_obj = User.objects.filter(username=self.request.data.get('email')).last()
|
||||||
email_data = UserEmailOtp.objects.filter(email=self.request.GET.get('email'),
|
email_data = UserEmailOtp.objects.filter(email=self.request.data.get('email'),
|
||||||
otp=self.request.GET.get('otp')).last()
|
otp=self.request.data.get('otp')).last()
|
||||||
if email_data:
|
if email_data:
|
||||||
input_datetime_str = str(email_data.expired_at)
|
input_datetime_str = str(email_data.expired_at)
|
||||||
input_format = "%Y-%m-%d %H:%M:%S.%f%z"
|
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.is_verified = True
|
||||||
email_data.save()
|
email_data.save()
|
||||||
if email_data.user_type == '1':
|
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:
|
if junior_data:
|
||||||
junior_data.is_verified = True
|
junior_data.is_verified = True
|
||||||
junior_data.save()
|
junior_data.save()
|
||||||
else:
|
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:
|
if guardian_data:
|
||||||
guardian_data.is_verified = True
|
guardian_data.is_verified = True
|
||||||
guardian_data.save()
|
guardian_data.save()
|
||||||
@ -535,7 +536,7 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet):
|
|||||||
permission_classes = [IsAuthenticated]
|
permission_classes = [IsAuthenticated]
|
||||||
def list(self, request, *args, **kwargs):
|
def list(self, request, *args, **kwargs):
|
||||||
"""profile view"""
|
"""profile view"""
|
||||||
queryset = self.queryset.filter(user=request.user)
|
queryset = UserNotification.objects.filter(user=request.user)
|
||||||
serializer = UserNotificationSerializer(queryset, many=True)
|
serializer = UserNotificationSerializer(queryset, many=True)
|
||||||
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user