ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-08-26 06:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes of guardian code status in necessary API

Browse Source
This commit is contained in:
jain
2023-08-26 17:48:13 +05:30
parent cf9376663c
commit eb4e09964d
5 changed files with 56 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
junior/serializers.py
View File

@ -92,13 +92,11 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
# condition for guardian code
if guardian_code:
if not junior.guardian_code:
print("111111111")
junior.guardian_code = []
junior.guardian_code_status = []
junior.guardian_code.extend(guardian_code)
junior.guardian_code_status.extend(str(NUMBER['three']))
elif len(junior.guardian_code) < 3 and len(guardian_code) < 3:
print("2222222222")
junior.guardian_code.extend(guardian_code)
junior.guardian_code_status.extend(str(NUMBER['three']))
else:
@ -106,9 +104,6 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
guardian_data = Guardian.objects.filter(guardian_code=guardian_code[0]).last()
if guardian_data:
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior)
# print("junior.guardian_code.index(guardian_code)==>",junior.guardian_code.index(guardian_code),'===>',type(junior.guardian_code.index(guardian_code)))
print("junior.guardian_code==>", junior.guardian_code, '===>', type(junior.guardian_code))
junior_approval_mail.delay(user.email, user.first_name)
send_notification.delay(ASSOCIATE_REQUEST, junior.auth.id, JUNIOR, guardian_data.user.id, {})
@ -304,8 +299,8 @@ class AddJuniorSerializer(serializers.ModelSerializer):
referral_code_used=guardian_data.referral_code,
is_password_set=False, is_verified=True,
guardian_code_status=[str(NUMBER['two'])])
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior_data,
relationship=relationship)
JuniorGuardianRelationship.objects.create(guardian=guardian_data, junior=junior_data,
relationship=relationship)
total_junior = Junior.objects.all().count()
JuniorPoints.objects.create(junior=junior_data, position=total_junior)
"""Generate otp"""
@ -334,17 +329,10 @@ class RemoveJuniorSerializer(serializers.ModelSerializer):
guardian_code = self.context['guardian_code']
instance.is_invited = False
if instance.guardian_code and ('-' in instance.guardian_code):
print("1111111111111")
instance.guardian_code.remove('-')
print("instance.guardian_code==>",instance.guardian_code,'==>',type(instance.guardian_code),'===>',
len(instance.guardian_code))
print("instance.guardian_code_status==>", instance.guardian_code_status, '==>', type(instance.guardian_code_status), '===>',
len(instance.guardian_code_status))
index = instance.guardian_code.index(guardian_code)
print("index==>",index,'==>',type(index))
instance.guardian_code.remove(guardian_code)
data = instance.guardian_code_status.pop(index)
print("data==>", data, '==>', type(data))
instance.guardian_code_status.pop(index)
instance.save()
return instance
@ -463,7 +451,7 @@ class AddGuardianSerializer(serializers.ModelSerializer):
user_type=str(NUMBER['two']), expired_at=expiry_time,
is_verified=True)
UserNotification.objects.get_or_create(user=user)
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior_data,
JuniorGuardianRelationship.objects.create(guardian=guardian_data, junior=junior_data,
relationship=relationship)
"""Notification email"""
@ -523,16 +511,12 @@ class RemoveGuardianCodeSerializer(serializers.ModelSerializer):
guardian_code = self.context['guardian_code']
if guardian_code in instance.guardian_code:
if instance.guardian_code and ('-' in instance.guardian_code):
print("777777777777777")
instance.guardian_code.remove('-')
if instance.guardian_code_status and ('-' in instance.guardian_code_status):
print("666666666666666666666666")
instance.guardian_code_status.remove('-')
index = instance.guardian_code.index(guardian_code)
print("index===>",index,'===>',type(index))
instance.guardian_code.remove(guardian_code)
data = instance.guardian_code_status.pop(index)
print("data===>", data, '===>', type(data))
instance.guardian_code_status.pop(index)
else:
raise serializers.ValidationError({"error":ERROR_CODE['2082'],"code":"400", "status":"failed"})
instance.save()

43
junior/views.py
View File

@ -211,7 +211,6 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
junior = Junior.objects.filter(auth__email=self.request.data['email']).first()
guardian = Guardian.objects.filter(user=self.request.user).first()
if junior.guardian_code and ('-' in junior.guardian_code):
print("1111111111111")
junior.guardian_code.remove('-')
if not junior:
return none
@ -225,8 +224,10 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
return "Max"
junior.guardian_code_status = [str(NUMBER['two'])]
junior.save()
JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior,
relationship=str(self.request.data['relationship']))
jun_data, created = JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior)
if jun_data:
jun_data.relationship = str(self.request.data['relationship'])
jun_data.save()
return True
@ -740,24 +741,24 @@ class RemoveGuardianCodeAPIView(views.APIView):
permission_classes = [IsAuthenticated]
def put(self, request, format=None):
# try:
guardian_code = self.request.data.get("guardian_code")
junior_queryset = Junior.objects.filter(auth=self.request.user).last()
if junior_queryset:
# use RemoveGuardianCodeSerializer serializer
serializer = RemoveGuardianCodeSerializer(junior_queryset, context = {"guardian_code":guardian_code},
data=request.data, partial=True)
if serializer.is_valid():
# save serializer
serializer.save()
return custom_response(SUCCESS_CODE['3044'], response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
else:
# task in another state
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
# except Exception as e:
# error_detail = e.detail.get('error', None)
# return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
try:
guardian_code = self.request.data.get("guardian_code")
junior_queryset = Junior.objects.filter(auth=self.request.user).last()
if junior_queryset:
# use RemoveGuardianCodeSerializer serializer
serializer = RemoveGuardianCodeSerializer(junior_queryset, context = {"guardian_code":guardian_code},
data=request.data, partial=True)
if serializer.is_valid():
# save serializer
serializer.save()
return custom_response(SUCCESS_CODE['3044'], response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
else:
# task in another state
return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
error_detail = e.detail.get('error', None)
return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
class FAQViewSet(GenericViewSet, mixins.CreateModelMixin,