From d208e5252c7961e7420cfe4563240b735e01afb0 Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 27 Jun 2023 19:32:57 +0530 Subject: [PATCH] jira-13 update country name --- .../migrations/0003_guardian_country_name.py | 18 ++++++++++++++++++ guardian/models.py | 1 + guardian/serializers.py | 1 + junior/migrations/0002_junior_country_name.py | 18 ++++++++++++++++++ junior/models.py | 1 + junior/serializers.py | 1 + 6 files changed, 40 insertions(+) create mode 100644 guardian/migrations/0003_guardian_country_name.py create mode 100644 junior/migrations/0002_junior_country_name.py diff --git a/guardian/migrations/0003_guardian_country_name.py b/guardian/migrations/0003_guardian_country_name.py new file mode 100644 index 0000000..ea9858b --- /dev/null +++ b/guardian/migrations/0003_guardian_country_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-06-27 13:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0002_remove_guardian_junior_code'), + ] + + operations = [ + migrations.AddField( + model_name='guardian', + name='country_name', + field=models.CharField(blank=True, default=None, max_length=30, null=True), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index f135bae..d9228b7 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -13,6 +13,7 @@ class Guardian(models.Model): """Contact details""" country_code = models.IntegerField(blank=True, null=True) phone = models.CharField(max_length=31, null=True, blank=True, default=None) + country_name = models.CharField(max_length=30, null=True, blank=True, default=None) """Personal info""" family_name = models.CharField(max_length=50, null=True, blank=True, default=None) gender = models.CharField(choices=GENDERS, max_length=15, null=True, blank=True, default=None) diff --git a/guardian/serializers.py b/guardian/serializers.py index e2bd807..c4dcfca 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -99,6 +99,7 @@ class CreateGuardianSerializer(serializers.ModelSerializer): guardian.phone = validated_data.get('phone', guardian.phone) guardian.country_code = validated_data.get('country_code', guardian.country_code) guardian.passcode = validated_data.get('passcode', guardian.passcode) + guardian.country_name = validated_data.get('country_name', guardian.country_name) guardian.referral_code_used = validated_data.get('referral_code_used', guardian.referral_code_used) """Complete profile of the junior if below all data are filled""" complete_profile_field = all([guardian.phone, guardian.gender, guardian.family_name, diff --git a/junior/migrations/0002_junior_country_name.py b/junior/migrations/0002_junior_country_name.py new file mode 100644 index 0000000..0dd74bd --- /dev/null +++ b/junior/migrations/0002_junior_country_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-06-27 13:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='junior', + name='country_name', + field=models.CharField(blank=True, default=None, max_length=30, null=True), + ), + ] diff --git a/junior/models.py b/junior/models.py index 732bb66..b389e3a 100644 --- a/junior/models.py +++ b/junior/models.py @@ -14,6 +14,7 @@ class Junior(models.Model): """Contact details""" phone = models.CharField(max_length=31, null=True, blank=True, default=None) country_code = models.IntegerField(blank=True, null=True) + country_name = models.CharField(max_length=30, null=True, blank=True, default=None) """Personal info""" gender = models.CharField(max_length=10, choices=GENDERS, null=True, blank=True, default=None) dob = models.DateField(max_length=15, null=True, blank=True, default=None) diff --git a/junior/serializers.py b/junior/serializers.py index 5d6df77..54d6fac 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -72,6 +72,7 @@ class CreateJuniorSerializer(serializers.ModelSerializer): junior.guardian_code = validated_data.get('guardian_code', junior.guardian_code) junior.dob = validated_data.get('dob',junior.dob) junior.passcode = validated_data.get('passcode', junior.passcode) + junior.country_name = validated_data.get('country_name', junior.country_name) """Update country code and phone number""" junior.phone = validated_data.get('phone', junior.phone) junior.country_code = validated_data.get('country_code', junior.country_code)