From c0f20f732dae06848da21a4cd72892f715b42d02 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 10 Jul 2023 21:18:22 +0530 Subject: [PATCH] swagger points --- account/serializers.py | 10 ++++++++-- account/views.py | 11 +++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index e4ad809..47472c0 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -7,7 +7,7 @@ from rest_framework_simplejwt.tokens import RefreshToken """App import""" from guardian.models import Guardian from junior.models import Junior -from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification +from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp from base.constants import GUARDIAN, JUNIOR, SUPERUSER from base.messages import ERROR_CODE_REQUIRED, ERROR_CODE, SUCCESS_CODE, STATUS_CODE_ERROR @@ -233,7 +233,7 @@ class UserDeleteSerializer(serializers.ModelSerializer): passwd = self.context['password'] random_num = random.randint(0,10000) user_tb = User.objects.filter(id=user.id).last() - if user_tb.check_password(passwd): + if user_tb and user_tb.check_password(passwd): user_type_data = UserEmailOtp.objects.filter(email=user.email).last() if user_type == '1' and user_type_data.user_type == '1': junior_data = Junior.objects.filter(auth__email=user_tb.email).first() @@ -291,3 +291,9 @@ class UpdateUserNotificationSerializer(serializers.ModelSerializer): instance.sms_notification = validated_data.get('sms_notification', instance.sms_notification) instance.save() return instance + +class UserPhoneOtpSerializer(serializers.ModelSerializer): + """User Phone serializers""" + class Meta(object): + model = UserPhoneOtp + fields = '__all__' diff --git a/account/views.py b/account/views.py index 1ad142d..ded9a74 100644 --- a/account/views.py +++ b/account/views.py @@ -19,7 +19,7 @@ from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSeriali ForgotPasswordSerializer, ResetPasswordSerializer, ChangePasswordSerializer, GoogleLoginSerializer, UpdateGuardianImageSerializer, UpdateJuniorProfileImageSerializer, DefaultTaskImagesSerializer, DefaultTaskImagesDetailsSerializer, UserDeleteSerializer, - UserNotificationSerializer, UpdateUserNotificationSerializer) + UserNotificationSerializer, UpdateUserNotificationSerializer, UserPhoneOtpSerializer) from rest_framework_simplejwt.tokens import RefreshToken from base.messages import ERROR_CODE, SUCCESS_CODE from guardian.tasks import generate_otp @@ -221,6 +221,7 @@ class ForgotPasswordAPIView(views.APIView): class SendPhoneOtp(viewsets.ModelViewSet): """Send otp on phone""" queryset = UserPhoneOtp.objects.all() + serializer_class = UserPhoneOtpSerializer def create(self, request, *args, **kwargs): otp = generate_otp() phone_number = self.request.data['phone'] @@ -237,6 +238,7 @@ class SendPhoneOtp(viewsets.ModelViewSet): class UserPhoneVerification(viewsets.ModelViewSet): """Send otp on phone""" queryset = UserPhoneOtp.objects.all() + serializer_class = UserPhoneOtpSerializer def list(self, request, *args, **kwargs): try: phone_data = UserPhoneOtp.objects.filter(phone=self.request.GET.get('phone'), @@ -378,7 +380,7 @@ class ReSendEmailOtp(viewsets.ModelViewSet): class ProfileAPIViewSet(viewsets.ModelViewSet): """Profile viewset""" queryset = User.objects.all() - serializer_class = [JuniorProfileSerializer, GuardianProfileSerializer] + serializer_class = JuniorProfileSerializer def list(self, request, *args, **kwargs): """profile view""" if str(self.request.GET.get('user_type')) == '1': @@ -438,7 +440,7 @@ class DeleteUserProfileAPIViewSet(viewsets.GenericViewSet): class UserNotificationAPIViewSet(viewsets.ModelViewSet): - """Profile viewset""" + """notification viewset""" queryset = UserNotification.objects.all() serializer_class = UserNotificationSerializer def list(self, request, *args, **kwargs): @@ -449,7 +451,8 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet): class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet): - """Profile viewset""" + """Update notification viewset""" + queryset = UserNotification.objects.all() serializer_class = UpdateUserNotificationSerializer def create(self, request, *args, **kwargs):