diff --git a/account/utils.py b/account/utils.py index 357f2d1..d33b267 100644 --- a/account/utils.py +++ b/account/utils.py @@ -24,6 +24,7 @@ from account.models import UserDelete from base.messages import ERROR_CODE from django.utils import timezone from base.constants import NUMBER +from junior.models import JuniorPoints # Define delete # user account condition, # Define delete @@ -91,8 +92,9 @@ def junior_account_update(user_tb): junior_data.is_active = False junior_data.is_verified = False junior_data.guardian_code = '{}' - junior_data.guardian_code_status = str(NUMBER['1']) + junior_data.guardian_code_status = str(NUMBER['one']) junior_data.save() + JuniorPoints.objects.filter(junior=junior_data).delete() def guardian_account_update(user_tb): """update guardian account after delete the user account""" diff --git a/account/views.py b/account/views.py index 0f9747e..593be1c 100644 --- a/account/views.py +++ b/account/views.py @@ -23,7 +23,7 @@ from django.conf import settings # local imports from guardian.models import Guardian -from junior.models import Junior +from junior.models import Junior, JuniorPoints from guardian.utils import upload_image_to_alibaba from account.models import UserDeviceDetails, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification from django.contrib.auth.models import User @@ -97,6 +97,8 @@ class GoogleLoginMixin(object): referral_code=generate_code(ZOD, user_obj.id) ) serializer = JuniorSerializer(junior_query) + position = Junior.objects.all().count() + JuniorPoints.objects.create(junior=junior_query, position=position) if str(user_type) == '2': guardian_query = Guardian.objects.create(user=user_obj, is_verified=True, is_active=True, image=profile_picture,signup_method='2', @@ -147,6 +149,8 @@ class SigninWithApple(views.APIView): junior_code=generate_code(JUN, user.id), referral_code=generate_code(ZOD, user.id)) serializer = JuniorSerializer(junior_query) + position = Junior.objects.all().count() + JuniorPoints.objects.create(junior=junior_query, position=position) if str(user_type) == '2': guardian_query = Guardian.objects.create(user=user, is_verified=True, is_active=True, signup_method='3',