changes in complete profile field

base/constants.py

@@ -6,6 +6,55 @@ import os
 # GOOGLE_URL used for interact with google server to verify user existence.
 #GOOGLE_URL = "https://www.googleapis.com/plus/v1/"
 
+NUMBER = {
+    'point_zero': 0.0,
+    'zero': 0,
+    'one': 1,
+    'two': 2,
+    'three': 3,
+    'four': 4,
+    'five': 5,
+    'six': 6,
+    'seven': 7,
+    'eight': 8,
+    'nine': 9,
+    'ten': 10,
+    'eleven': 11,
+    'twelve': 12,
+    'thirteen': 13,
+    'fourteen': 14,
+    'fifteen': 15,
+    'sixteen': 16,
+    'seventeen': 17,
+    'eighteen': 18,
+    'nineteen': 19,
+    'twenty_four': 24,
+    'twenty_one': 21,
+    'twenty_two': 22,
+    'twenty_five': 25,
+    'thirty': 30,
+    'thirty_five': 35,
+    'thirty_six': 36,
+    'forty': 40,
+    'fifty': 50,
+    'fifty_nine': 59,
+    'sixty': 60,
+    'seventy_five': 75,
+    'eighty': 80,
+    'ninty_five': 95,
+    'ninty_six': 96,
+    'ninety_nine': 99,
+    'hundred': 100,
+    'one_one_nine': 119,
+    'one_twenty': 120,
+    'four_zero_four': 404,
+    'five_hundred': 500,
+    'minus_one': -1,
+    'point_three': 0.3,
+    'point_seven': 0.7
+}
+
+
 
 # Super Admin string constant for 'role'
 SUPER_ADMIN = "Super Admin"

guardian/serializers.py

@@ -12,6 +12,7 @@ from account.models import UserProfile, UserEmailOtp, UserNotification
 from account.serializers import JuniorSerializer
 from junior.serializers import JuniorDetailSerializer
 from base.messages import ERROR_CODE, SUCCESS_CODE
+from base.constants import NUMBER
 from .utils import upload_image_to_alibaba
 from junior.models import Junior, JuniorPoints
 class UserSerializer(serializers.ModelSerializer):
@@ -117,9 +118,9 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
             guardian.referral_code_used = validated_data.get('referral_code_used', guardian.referral_code_used)
             guardian.image = validated_data.get('image', guardian.image)
             """Complete profile of the junior if below all data are filled"""
-            complete_profile_field = all([guardian.phone, guardian.gender, guardian.country_name,
+            complete_profile_field = all([guardian.gender, guardian.country_name,
-                                          guardian.dob, guardian.country_code, user.first_name, user.last_name,
+                                          guardian.dob, user.first_name,
-                                          user.email, guardian.image])
+                                          guardian.image])
             guardian.is_complete_profile = False
             if complete_profile_field:
                 guardian.is_complete_profile = True
@@ -224,12 +225,12 @@ class GuardianProfileSerializer(serializers.ModelSerializer):
 
     def get_total_count(self, obj):
         """total fields count"""
-        return 9
+        return NUMBER['five']
 
     def get_complete_field_count(self, obj):
         """total filled fields count"""
-        total_field_list = [obj.user.first_name, obj.user.last_name, obj.user.email, obj.country_name, obj.country_code,
+        total_field_list = [obj.user.first_name, obj.country_name,
-                            obj.phone, obj.gender, obj.dob, obj.image]
+                            obj.gender, obj.dob, obj.image]
         total_complete_field = [data for data in total_field_list if data != '' and  data is not None]
         return len(total_complete_field)
 

junior/serializers.py

@@ -12,7 +12,7 @@ from account.utils import send_otp_email
 from junior.models import Junior, JuniorPoints
 from guardian.tasks import generate_otp
 from base.messages import ERROR_CODE, SUCCESS_CODE
-from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED
+from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, NUMBER
 from guardian.models import Guardian, JuniorTask
 from account.models import UserEmailOtp
 from junior.utils import junior_notification_email, junior_approval_mail
@@ -98,9 +98,8 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
             junior.referral_code_used = validated_data.get('referral_code_used', junior.referral_code_used)
             junior.image = validated_data.get('image', junior.image)
             """Complete profile of the junior if below all data are filled"""
-            complete_profile_field = all([junior.phone, junior.gender, junior.country_name, junior.image,
+            complete_profile_field = all([junior.gender, junior.country_name, junior.image,
-                                          junior.dob, junior.country_code, user.first_name, user.last_name,
+                                          junior.dob, user.first_name])
-                                          user.email])
             junior.is_complete_profile = False
             if complete_profile_field:
                 junior.is_complete_profile = True
@@ -231,12 +230,12 @@ class JuniorProfileSerializer(serializers.ModelSerializer):
 
     def get_total_count(self, obj):
         """total fields count"""
-        return 9
+        return NUMBER['five']
 
     def get_complete_field_count(self, obj):
         """total filled fields count"""
-        field_list = [obj.auth.first_name, obj.auth.last_name, obj.auth.email, obj.country_name, obj.country_code,
+        field_list = [obj.auth.first_name, obj.country_name,
-                      obj.phone, obj.gender, obj.dob, obj.image]
+                      obj.gender, obj.dob, obj.image]
         complete_field = [data for data in field_list if data is not None and data != '']
         return len(complete_field)
     class Meta(object):