#639 Add Image model, update related code

BackEnd/administration/factories.py

@@ -35,5 +35,4 @@ class Meta:
     person_position = "Test person position"
     official_name = "Test official name"
     startup_idea = "Test startup idea"
-    banner_image = "Test_banner_image"
     is_deleted = False

BackEnd/administration/serializers.py

@@ -76,6 +76,18 @@ class AdminCompanyDetailSerializer(serializers.ModelSerializer):
         many=True, slug_field="name", read_only=True
     )
     regions = AdminRegionSerialaizer(many=True, read_only=True)
+    banner_image = serializers.ImageField(
+        source="banner.image_path", required=False
+    )
+    logo_image = serializers.ImageField(
+        source="logo.image_path", required=False
+    )
+    banner_approved_image = serializers.ImageField(
+        source="banner_approved.image_path", required=False
+    )
+    logo_approved_image = serializers.ImageField(
+        source="logo_approved.image_path", required=False
+    )
 
     class Meta:
         model = Profile
@@ -97,6 +109,13 @@ class Meta:
             "product_info",
             "address",
             "startup_idea",
+            "banner",
+            "logo",
+            "banner_approved",
+            "logo_approved",
             "banner_image",
+            "banner_approved_image",
+            "logo_image",
+            "logo_approved_image",
             "is_deleted",
         )

BackEnd/administration/tests/test_admin_profiles.py

@@ -108,7 +108,10 @@ def test_get_profile_id_authenticated(self):
             "product_info": "test product info",
             "address": "Test Country, Test City, St. Test, 1",
             "startup_idea": "Test startup idea",
-            "banner_image": "http://testserver/media/Test_banner_image",
+            "banner": None,
+            "logo": None,
+            "banner_approved": None,
+            "logo_approved": None,
             "is_deleted": False,
         }
         self.assertEqual(data, response.json())

BackEnd/images/factories.py

@@ -0,0 +1,18 @@
+import factory.fuzzy
+
+from .models import ProfileImage
+
+
+class ProfileimageFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = ProfileImage
+
+    uuid = factory.Faker("uuid4")
+    created_by = factory.SubFactory("authentication.factories.UserFactory")
+    image_type = factory.fuzzy.FuzzyChoice(
+        ProfileImage.IMAGE_TYPES, getter=lambda c: c[0]
+    )
+    content_type = "JPEG"
+    image_path = factory.django.ImageField(filename="test.jpeg")
+    is_approved = False
+    is_deleted = False

BackEnd/images/migrations/0001_initial.py

@@ -0,0 +1,55 @@
+# Generated by Django 4.2.3 on 2024-06-12 12:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import images.models
+import uuid
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ProfileImage",
+            fields=[
+                (
+                    "uuid",
+                    models.UUIDField(
+                        default=uuid.uuid4, primary_key=True, serialize=False
+                    ),
+                ),
+                ("created_at", models.DateField(auto_now_add=True)),
+                (
+                    "image_type",
+                    models.CharField(
+                        choices=[("banner", "banner"), ("logo", "logo")], max_length=10
+                    ),
+                ),
+                ("content_type", models.CharField(blank=True, max_length=5)),
+                (
+                    "image_path",
+                    models.ImageField(
+                        blank=True, upload_to=images.models.image_directory_path
+                    ),
+                ),
+                ("image_size", models.PositiveIntegerField(null=True)),
+                ("hash_md5", models.CharField(blank=True, max_length=32)),
+                ("is_approved", models.BooleanField(default=False)),
+                ("is_deleted", models.BooleanField(default=False)),
+                (
+                    "created_by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="created_images",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

BackEnd/images/migrations/0002_alter_profileimage_created_at_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.3 on 2024-06-19 12:51
+
+import django.core.validators
+from django.db import migrations, models
+import images.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("images", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="profileimage",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="profileimage",
+            name="image_path",
+            field=models.ImageField(
+                blank=True,
+                upload_to=images.models.image_directory_path,
+                validators=[
+                    django.core.validators.FileExtensionValidator(
+                        allowed_extensions=["jpeg", "png", "jpg"]
+                    )
+                ],
+            ),
+        ),
+    ]

BackEnd/images/models.py

@@ -0,0 +1,38 @@
+from uuid import uuid4
+from django.db import models
+from django.core.validators import FileExtensionValidator
+from authentication.models import CustomUser
+
+
+def image_directory_path(instance, filename):
+    return f"{instance.image_type}/{filename}"
+
+
+class ProfileImage(models.Model):
+
+    BANNER = "banner"
+    LOGO = "logo"
+
+    IMAGE_TYPES = (
+        (BANNER, "banner"),
+        (LOGO, "logo"),
+    )
+
+    uuid = models.UUIDField(primary_key=True, default=uuid4)
+    created_at = models.DateTimeField(auto_now_add=True)
+    created_by = models.ForeignKey(
+        CustomUser, on_delete=models.CASCADE, related_name="created_images"
+    )
+    image_type = models.CharField(max_length=10, choices=IMAGE_TYPES)
+    content_type = models.CharField(max_length=5, blank=True)
+    image_path = models.ImageField(
+        upload_to=image_directory_path,
+        validators=[
+            FileExtensionValidator(allowed_extensions=["jpeg", "png", "jpg"])
+        ],
+        blank=True,
+    )
+    image_size = models.PositiveIntegerField(null=True)
+    hash_md5 = models.CharField(max_length=32, blank=True)
+    is_approved = models.BooleanField(default=False)
+    is_deleted = models.BooleanField(default=False)

BackEnd/images/serializers.py

@@ -1,14 +1,45 @@
 from rest_framework import serializers
-from profiles.models import Profile
+from images.models import ProfileImage
 
-
-class BannerSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Profile
-        fields = ("banner_image",)
+from validation.validate_image import (
+    validate_banner_size,
+    validate_logo_size,
+)
 
 
-class LogoSerializer(serializers.ModelSerializer):
+class ImageSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Profile
-        fields = ("logo_image",)
+        model = ProfileImage
+        fields = (
+            "uuid",
+            "image_type",
+            "image_path",
+            "created_by",
+            "content_type",
+            "image_size",
+            "hash_md5",
+            "is_approved",
+            "is_deleted",
+            "created_at",
+        )
+        read_only_fields = (
+            "uuid",
+            "created_at",
+            "created_by",
+            "image_type",
+            "content_type",
+            "image_size",
+            "hash_md5",
+            "is_approved",
+            "is_deleted",
+        )
+
+    def validate(self, value):
+        image = value.get("image_path")
+        image_type = self.context.get("image_type")
+        if image:
+            if image_type == "banner":
+                validate_banner_size(image)
+            else:
+                validate_logo_size(image)
+        return value