jira-13 image upload changes

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=''),
+        ),
+    ]

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)

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:

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=''),
+        ),
+    ]

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)

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: