From 75d0b12008ff4ca616d2ea11d6ca254b47f15d45 Mon Sep 17 00:00:00 2001 From: jain Date: Wed, 2 Aug 2023 16:26:20 +0530 Subject: [PATCH] changes in remove guardian code api --- guardian/serializers.py | 2 +- junior/models.py | 2 ++ junior/serializers.py | 2 +- junior/views.py | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/guardian/serializers.py b/guardian/serializers.py index 1509fdf..db465ad 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -345,7 +345,7 @@ class ApproveJuniorSerializer(serializers.ModelSerializer): """update guardian code""" instance = self.context['junior'] instance.guardian_code = [self.context['guardian_code']] - instance.is_invited = True + instance.guardian_code_approved = True instance.save() return instance diff --git a/junior/models.py b/junior/models.py index dc71c97..b18cbf5 100644 --- a/junior/models.py +++ b/junior/models.py @@ -71,6 +71,8 @@ class Junior(models.Model): passcode = models.IntegerField(null=True, blank=True, default=None) # junior is verified or not""" is_verified = models.BooleanField(default=False) + """guardian code is approved or not""" + guardian_code_approved = models.BooleanField(default=False) # Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) diff --git a/junior/serializers.py b/junior/serializers.py index 54332f0..316c1bf 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -246,7 +246,7 @@ class JuniorProfileSerializer(serializers.ModelSerializer): fields = ['id', 'email', 'first_name', 'last_name', 'country_name', 'country_code', 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', 'updated_at', 'notification_count', 'total_count', 'complete_field_count', 'signup_method', - 'is_invited', 'passcode'] + 'is_invited', 'passcode', 'guardian_code_approved'] class AddJuniorSerializer(serializers.ModelSerializer): """Add junior serializer""" diff --git a/junior/views.py b/junior/views.py index 14920ec..3f3cd5a 100644 --- a/junior/views.py +++ b/junior/views.py @@ -246,8 +246,7 @@ class RemoveJuniorAPIView(views.APIView): junior_id = self.request.GET.get('id') guardian = Guardian.objects.filter(user__email=self.request.user).last() # fetch junior query - junior_queryset = Junior.objects.filter(id=junior_id, guardian_code__icontains=str(guardian.guardian_code), - is_invited=True).last() + junior_queryset = Junior.objects.filter(id=junior_id, guardian_code__icontains=str(guardian.guardian_code)).last() if junior_queryset: # use RemoveJuniorSerializer serializer serializer = RemoveJuniorSerializer(junior_queryset, data=request.data, partial=True)