ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-27 17:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #168 from KiwiTechLLC/ZBKADM-69

Browse Source 
otp, verify otp and login bug resolved
This commit is contained in:
dilipshrivastwa-kiwi
2023-08-09 14:21:58 +05:30
committed by GitHub
parent 08750813ce c9ee482512
commit 823c5ea4c4
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web_admin/views/auth.py
View File

@ -33,7 +33,7 @@ class ForgotAndResetPasswordViewSet(GenericViewSet):
if serializer.is_valid():
serializer.save()
return custom_response(SUCCESS_CODE['3015'])
return custom_error_response(ERROR_CODE['2063'], status.HTTP_400_BAD_REQUEST)
return custom_error_response(ERROR_CODE['2000'], status.HTTP_400_BAD_REQUEST)
@action(methods=['post'], url_name='verify-otp', url_path='verify-otp',
detail=False, serializer_class=AdminVerifyOTPSerializer)
@ -45,7 +45,7 @@ class ForgotAndResetPasswordViewSet(GenericViewSet):
serializer = self.serializer_class(data=request.data)
if serializer.is_valid():
return custom_response(SUCCESS_CODE['3011'])
return custom_error_response(ERROR_CODE['2063'], status.HTTP_400_BAD_REQUEST)
return custom_error_response(ERROR_CODE['2008'], status.HTTP_400_BAD_REQUEST)
@action(methods=['post'], url_name='create-password', url_path='create-password',
detail=False, serializer_class=AdminCreatePasswordSerializer)
@ -59,5 +59,5 @@ class ForgotAndResetPasswordViewSet(GenericViewSet):
user = USER.objects.filter(email=serializer.validated_data.get('email')).first()
user.set_password(serializer.validated_data.get('new_password'))
user.save()
return custom_response(SUCCESS_CODE['3007'])
return custom_response(SUCCESS_CODE['3006'])
return custom_error_response(ERROR_CODE['2064'], status.HTTP_400_BAD_REQUEST)

7
web_admin/views/user_management.py
View File

@ -55,11 +55,12 @@ class UserManagementViewSet(GenericViewSet, mixins.ListModelMixin,
:return:
"""
queryset = self.get_queryset()
count = queryset.count()
queryset = queryset.filter(
(Q(junior_profile__is_verified=True) | Q(guardian_profile__is_verified=True)))
paginator = self.pagination_class()
paginated_queryset = paginator.paginate_queryset(queryset, request)
serializer = self.serializer_class(paginated_queryset, many=True)
return custom_response(None, data=serializer.data, count=count)
return custom_response(None, data=serializer.data, count=queryset.count())
def retrieve(self, request, *args, **kwargs):
"""
@ -69,7 +70,7 @@ class UserManagementViewSet(GenericViewSet, mixins.ListModelMixin,
:return: user details
"""
if self.request.query_params.get('user_type') not in [dict(USER_TYPE).get('1'), dict(USER_TYPE).get('2')]:
return custom_error_response('Action not allowed', status.HTTP_400_BAD_REQUEST)
return custom_error_response(ERROR_CODE['2067'], status.HTTP_400_BAD_REQUEST)
queryset = self.queryset
if self.request.query_params.get('user_type') == dict(USER_TYPE).get('2'):
queryset = queryset.filter(guardian_profile__user__id=kwargs['pk'])