diff --git a/guardian/migrations/0005_alter_guardian_image.py b/guardian/migrations/0005_alter_guardian_image.py new file mode 100644 index 0000000..5899e64 --- /dev/null +++ b/guardian/migrations/0005_alter_guardian_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-06-29 06:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0004_guardian_image'), + ] + + operations = [ + migrations.AlterField( + model_name='guardian', + name='image', + field=models.ImageField(blank=True, default=None, null=True, upload_to=''), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index 0512ee4..9bb92eb 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -15,7 +15,7 @@ class Guardian(models.Model): 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) """Image info""" - image = models.ImageField(upload_to='images/', null=True, blank=True, default=None) + image = models.ImageField(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 1be4638..a7651b3 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -85,7 +85,7 @@ class CreateGuardianSerializer(serializers.ModelSerializer): phone_number = validated_data.pop('phone', None) guardian_data = Guardian.objects.filter(phone=phone_number) junior_data = Junior.objects.filter(phone=phone_number) - if guardian_data or junior_data: + if phone_number and (guardian_data or junior_data): raise serializers.ValidationError({"details": ERROR_CODE['2012']}) user = User.objects.filter(username=self.context['user']).last() if user: diff --git a/images/Screenshot_from_2023-06-28_14-22-20.png b/images/Screenshot_from_2023-06-28_14-22-20.png deleted file mode 100644 index 217186a..0000000 Binary files a/images/Screenshot_from_2023-06-28_14-22-20.png and /dev/null differ diff --git a/images/Screenshot_from_2023-06-28_15-16-09.png b/images/Screenshot_from_2023-06-28_15-16-09.png deleted file mode 100644 index e79b16a..0000000 Binary files a/images/Screenshot_from_2023-06-28_15-16-09.png and /dev/null differ diff --git a/images/Screenshot_from_2023-06-28_15-16-09_MkRvErJ.png b/images/Screenshot_from_2023-06-28_15-16-09_MkRvErJ.png deleted file mode 100644 index e79b16a..0000000 Binary files a/images/Screenshot_from_2023-06-28_15-16-09_MkRvErJ.png and /dev/null differ diff --git a/images/Screenshot_from_2023-06-28_15-16-09_o1it3PP.png b/images/Screenshot_from_2023-06-28_15-16-09_o1it3PP.png deleted file mode 100644 index e79b16a..0000000 Binary files a/images/Screenshot_from_2023-06-28_15-16-09_o1it3PP.png and /dev/null differ diff --git a/junior/migrations/0004_alter_junior_image.py b/junior/migrations/0004_alter_junior_image.py new file mode 100644 index 0000000..373436d --- /dev/null +++ b/junior/migrations/0004_alter_junior_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-06-29 06:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0003_junior_image'), + ] + + operations = [ + migrations.AlterField( + model_name='junior', + name='image', + field=models.ImageField(blank=True, default=None, null=True, upload_to=''), + ), + ] diff --git a/junior/models.py b/junior/models.py index 8d5660d..e7bf4cd 100644 --- a/junior/models.py +++ b/junior/models.py @@ -18,7 +18,7 @@ class Junior(models.Model): """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) - image = models.ImageField(upload_to='images/', null=True, blank=True, default=None) + image = models.ImageField(null=True, blank=True, default=None) """Codes""" junior_code = models.CharField(max_length=10, null=True, blank=True, default=None) guardian_code = ArrayField(models.CharField(max_length=10, null=True, blank=True, default=None),null=True) diff --git a/junior/serializers.py b/junior/serializers.py index 2128392..c05f2a8 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -60,9 +60,10 @@ class CreateJuniorSerializer(serializers.ModelSerializer): """Create junior profile""" image = validated_data.pop('image', None) phone_number = validated_data.pop('phone', None) + print("phone_number====>",phone_number,'==>',type(phone_number)) guardian_data = Guardian.objects.filter(phone=phone_number) junior_data = Junior.objects.filter(phone=phone_number) - if junior_data or guardian_data: + if phone_number and (junior_data or guardian_data): raise serializers.ValidationError({"details":ERROR_CODE['2012']}) user = User.objects.filter(username=self.context['user']).last() if user: