From 89dda61bff58e1afd5782fce695974c1a0f7a710 Mon Sep 17 00:00:00 2001 From: jain Date: Wed, 23 Aug 2023 17:46:20 +0530 Subject: [PATCH] google login with user type and is published article only display --- account/views.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/account/views.py b/account/views.py index 2785ae1..8dbb2f7 100644 --- a/account/views.py +++ b/account/views.py @@ -91,7 +91,7 @@ class GoogleLoginMixin(object): response_status=status.HTTP_400_BAD_REQUEST ) serializer = JuniorSerializer(junior_query) - if str(user_type) == '2': + elif str(user_type) == '2': guardian_query = Guardian.objects.filter(user=user_data.last()).last() if not guardian_query: return custom_error_response( @@ -99,6 +99,11 @@ class GoogleLoginMixin(object): response_status=status.HTTP_400_BAD_REQUEST ) serializer = GuardianSerializer(guardian_query) + else: + return custom_error_response( + ERROR_CODE["2069"], + response_status=status.HTTP_400_BAD_REQUEST + ) return custom_response(SUCCESS_CODE['3003'], serializer.data, response_status=status.HTTP_200_OK) @@ -113,13 +118,19 @@ class GoogleLoginMixin(object): serializer = JuniorSerializer(junior_query) position = Junior.objects.all().count() JuniorPoints.objects.create(junior=junior_query, position=position) - if str(user_type) == '2': + elif str(user_type) == '2': guardian_query = Guardian.objects.create(user=user_obj, is_verified=True, is_active=True, image=profile_picture,signup_method='2', guardian_code=generate_code(GRD, user_obj.id), referral_code=generate_code(ZOD, user_obj.id) ) serializer = GuardianSerializer(guardian_query) + else: + user_obj.delete() + return custom_error_response( + ERROR_CODE["2069"], + response_status=status.HTTP_400_BAD_REQUEST + ) device_detail, created = UserDeviceDetails.objects.get_or_create(user=user_obj) if device_detail: device_detail.device_id = device_id @@ -168,7 +179,7 @@ class SigninWithApple(views.APIView): response_status=status.HTTP_400_BAD_REQUEST ) serializer = JuniorSerializer(junior_data) - if str(user_type) == '2': + elif str(user_type) == '2': guardian_data = Guardian.objects.filter(user=user).last() if not guardian_data: return custom_error_response( @@ -176,6 +187,11 @@ class SigninWithApple(views.APIView): response_status=status.HTTP_400_BAD_REQUEST ) serializer = GuardianSerializer(guardian_data) + else: + return custom_error_response( + ERROR_CODE["2069"], + response_status=status.HTTP_400_BAD_REQUEST + ) return custom_response(SUCCESS_CODE['3003'], serializer.data, response_status=status.HTTP_200_OK) @@ -189,13 +205,19 @@ class SigninWithApple(views.APIView): serializer = JuniorSerializer(junior_query) position = Junior.objects.all().count() JuniorPoints.objects.create(junior=junior_query, position=position) - if str(user_type) == '2': + elif str(user_type) == '2': guardian_query = Guardian.objects.create(user=user, is_verified=True, is_active=True, signup_method='3', guardian_code=generate_code(GRD, user.id), referral_code=generate_code(ZOD, user.id)) serializer = GuardianSerializer(guardian_query) - device_detail, created = UserDeviceDetails.objects.get_or_create(user=user_obj) + else: + user.delete() + return custom_error_response( + ERROR_CODE["2069"], + response_status=status.HTTP_400_BAD_REQUEST + ) + device_detail, created = UserDeviceDetails.objects.get_or_create(user=user) if device_detail: device_detail.device_id = device_id device_detail.save()