Merge pull request #397 from MySecondLanguage/fixed-variant-image-upload

Fixed variant image upload

Author: MySecondLanguage

nxtbn/admin_schema.py

@@ -3,6 +3,7 @@
 from nxtbn.cart.admin_query import AdminCartQuery
 from nxtbn.core.admin_mutation import CoreMutation
 from nxtbn.core.admin_queries import AdminCoreQuery
+from nxtbn.filemanager.admin_queries import ImageQuery
 from nxtbn.order.admin_mutation import AdminOrderMutation
 from nxtbn.payment.admin_queries import AdminPaymentQuery
 from nxtbn.product.admin_mutations import ProductMutation
@@ -15,7 +16,7 @@
 
 
 
-class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery, PurchaseQuery, AdminPaymentQuery):
+class Query(ProductQuery, AdminOrderQuery, AdminCoreQuery, WarehouseQuery, AdminCartQuery, UserAdminQuery, PurchaseQuery, AdminPaymentQuery, ImageQuery):
     pass
 
 class Mutation(AdminUserMutation, ProductMutation, CoreMutation, AdminOrderMutation):

nxtbn/filemanager/admin_queries.py

@@ -0,0 +1,20 @@
+from django.conf import settings
+import graphene
+from graphql import GraphQLError
+from graphene_django.filter import DjangoFilterConnectionField
+from nxtbn.filemanager.models import Image
+from nxtbn.filemanager.admin_types import ImageType
+
+
+class ImageQuery(graphene.ObjectType):
+    images = DjangoFilterConnectionField(ImageType)
+    image = graphene.Field(ImageType, id=graphene.ID(required=True))
+
+    def resolve_images(self, info, **kwargs):
+        return Image.objects.all().order_by('-created_at')
+    
+    def resolve_image(self, info, id):
+        try:
+            return Image.objects.get(id=id)
+        except Image.DoesNotExist:
+            return None

nxtbn/filemanager/admin_types.py

@@ -0,0 +1,32 @@
+from django.conf import settings
+import graphene
+from graphene_django import DjangoObjectType
+from graphene import relay
+from nxtbn.filemanager.models import Image
+
+
+class ImageType(DjangoObjectType):
+    db_id = graphene.Int(source='id')
+    image = graphene.String()
+    image_xs = graphene.String()
+
+    def resolve_image(self, info):
+        return self.get_image_url(info.context)
+    
+    def resolve_image_xs(self, info):
+        return self.get_image_xs_url(info.context)
+
+    class Meta:
+        model = Image
+        fields = (
+            'id',
+            'name',
+            'image',
+            'image_xs',
+            'created_at',
+            'last_modified',
+        )
+        interfaces = (relay.Node, )
+        filter_fields = {
+            'name': ['exact', 'icontains'],
+        }

nxtbn/filemanager/api/dashboard/serializers.py

@@ -1,21 +1,19 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
+from nxtbn import settings
 from nxtbn.filemanager.models import Image, Document
 
 
 from PIL import Image as PILImage
 from io import BytesIO
 from django.core.files.base import ContentFile
 
+
 class ImageSerializer(serializers.ModelSerializer):
     class Meta:
         model = Image
         fields = "__all__"
-        read_only_fields = (
-            "id",
-            "created_by",
-            "last_modified_by",
-        )
+        read_only_fields = ("id", "created_by", "last_modified_by")
 
     def create(self, validated_data):
         request = self.context["request"]
@@ -25,6 +23,7 @@ def create(self, validated_data):
         # Optimize the image before saving
         if "image" in validated_data:
             validated_data["image"] = self.optimize_image(validated_data["image"])
+            validated_data["image_xs"] = self.optimize_image(validated_data["image"], max_size_kb=1, format="png", max_dimension=50)
 
         return super().create(validated_data)
 
@@ -39,28 +38,38 @@ def update(self, instance, validated_data):
         return super().update(instance, validated_data)
 
     @staticmethod
-    def optimize_image(image_file, max_size_kb=200, format="WEBP"):
+    def optimize_image(image_file, max_size_kb=settings.IMAGE_COMPRESS_MAX, format="WEBP", max_dimension=800):
         """
         Optimize an image by resizing and converting it to the specified format while maintaining the aspect ratio.
         Ensures the image file size is below max_size_kb.
         """
         img = PILImage.open(image_file)
-        img = img.convert("RGB")  # Ensure compatibility for formats like PNG with alpha
+        img = img.convert("RGB")  # Convert to RGB for compatibility
+
+        # Adjust dimension based on image type (smaller for PNG to ensure < 2023 bytes)
+        if format.lower() == "png":
+            max_dimension = 64  # Reduce size for PNG to keep it small
 
-        # Resize the image to fit within a reasonable dimension (adjust if needed)
-        max_dimension = 800
         img.thumbnail((max_dimension, max_dimension), PILImage.Resampling.LANCZOS)
 
-        # Save the image to a buffer
+        # Use a buffer to store the optimized image
         buffer = BytesIO()
-        img.save(buffer, format=format, optimize=True, quality=85)
-        buffer.seek(0)
 
-        # Check if the image exceeds the maximum size, reduce quality iteratively
-        while buffer.tell() > max_size_kb * 1024:
-            buffer.seek(0)
-            img.save(buffer, format=format, optimize=True, quality=max(10, 85 - 10))
-            buffer.seek(0)
+        if format.lower() == "png":
+            # Reduce colors using quantization (important for PNG)
+            img = img.convert("P", palette=PILImage.ADAPTIVE, colors=32)  # Limit colors to 32
+            img.save(buffer, format="PNG", optimize=True)
+        else:
+            quality = 85
+            img.save(buffer, format=format, optimize=True, quality=quality)
+
+            # Reduce quality iteratively for WebP/JPEG if size is too large
+            while buffer.tell() > max_size_kb * 1024 and quality > 10:
+                quality -= 5
+                buffer = BytesIO()  # Reset buffer
+                img.save(buffer, format=format, optimize=True, quality=quality)
+
+        buffer.seek(0)
 
         # Return the new image as a ContentFile
         return ContentFile(buffer.read(), name=f"{image_file.name.split('.')[0]}.{format.lower()}")

nxtbn/filemanager/migrations/0003_image_image_sm.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2025-02-20 15:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("filemanager", "0002_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="image",
+            name="image_sm",
+            field=models.ImageField(blank=True, null=True, upload_to=""),
+        ),
+    ]

nxtbn/filemanager/migrations/0004_rename_image_sm_image_image_xs.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2025-02-20 16:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("filemanager", "0003_image_image_sm"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="image",
+            old_name="image_sm",
+            new_name="image_xs",
+        ),
+    ]

nxtbn/filemanager/models.py

@@ -9,8 +9,23 @@ class Image(AbstractBaseModel):
     last_modified_by = models.ForeignKey(User, on_delete=models.PROTECT, related_name='image_modified', null=True, blank=True)
     name = models.CharField(max_length=255)
     image = models.ImageField()
+    image_xs = models.ImageField(null=True, blank=True)
     image_alt_text = models.CharField(max_length=255)
 
+    def get_image_url(self,request):
+        if self.image:
+            return request.build_absolute_uri(self.image.url)
+        return None
+
+    def get_image_xs_url(self,request):
+        if self.image_xs:
+            return request.build_absolute_uri(self.image_xs.url)
+        
+        if self.image:
+            return request.build_absolute_uri(self.image.url)
+
+        return None
+
 
 class Document(AbstractBaseModel):
     created_by = models.ForeignKey(User, on_delete=models.PROTECT, related_name='document_created')

nxtbn/product/admin_types.py

@@ -12,12 +12,16 @@ class ProductVariantNonPaginatedType(DjangoObjectType):
     display_name = graphene.String()
     humanize_price = graphene.String()
     variant_thumbnail = graphene.String()
+    variant_thumbnail_xs = graphene.String()
 
     def resolve_humanize_price(self, info):
         return self.humanize_total_price()
 
     def resolve_variant_thumbnail(self, info):
         return self.variant_thumbnail(info.context)
+    
+    def resolve_variant_thumbnail_xs(self, info):
+        return self.variant_thumbnail_xs(info.context)
     class Meta:
         model = ProductVariant
         fields = (
@@ -46,12 +50,16 @@ class ProductGraphType(DjangoObjectType):
     db_id = graphene.Int(source="id")
     all_variants = graphene.List(ProductVariantNonPaginatedType)
     product_thumbnail = graphene.String()
+    product_thumbnail_xs = graphene.String()
 
     def resolve_all_variants(self, info):
         return self.variants.all()
 
     def resolve_product_thumbnail(self, info):
         return self.product_thumbnail(info.context)
+    
+    def resolve_product_thumbnail_xs(self, info):
+        return self.product_thumbnail_xs(info.context)
     class Meta:
         model = Product
         fields = (

nxtbn/product/api/dashboard/serializers.py

@@ -84,6 +84,7 @@ class ProductVariantSerializer(serializers.ModelSerializer):
     is_default_variant = serializers.SerializerMethodField()
     product_name = serializers.SerializerMethodField()
     price = serializers.SerializerMethodField()
+    image_details = ImageSerializer(read_only=True, source='image')
 
     class Meta:
         model = ProductVariant
@@ -104,6 +105,7 @@ class Meta:
             'track_inventory',
             'is_default_variant',
             'allow_backorder',
+            'image_details',
         )
 
     def get_is_default_variant(self, obj):
@@ -162,6 +164,7 @@ class VariantCreatePayloadSerializer(serializers.Serializer):
     is_default_variant = serializers.BooleanField(default=False)
     track_inventory = serializers.BooleanField(default=False)
     allow_backorder = serializers.BooleanField(default=False)
+    image = serializers.PrimaryKeyRelatedField(queryset=Image.objects.all(), required=False, allow_null=True)
     # def validate_sku(self, value):
     #     if ProductVariant.objects.filter(sku=value).exists():
     #         raise serializers.ValidationError("SKU already exists.")

nxtbn/product/models.py

@@ -221,7 +221,18 @@ def product_thumbnail(self, request):
             full_url = request.build_absolute_uri(image_url)
             return full_url
         return None
-
+    
+    def product_thumbnail_xs(self, request):
+        """
+        Returns the URL of the first image associated with the product. 
+        If no image is available, returns None.
+        """
+        first_image = self.images.first()  # Get the first image if it exists
+        if first_image and hasattr(first_image, 'image_xs') and first_image.image_xs:
+            image_url = first_image.image_xs.url
+            full_url = request.build_absolute_uri(image_url)
+            return full_url
+        return None
 
 
 
@@ -385,6 +396,24 @@ def variant_thumbnail(self, request):
                 full_url = request.build_absolute_uri(image_url)
                 return
         return None
+    
+    def variant_thumbnail_xs(self, request):
+        """
+        Returns the URL of the first image associated with the product variant. 
+        If no image is available, returns None.
+        """
+        if self.image and hasattr(self.image, 'image_xs') and self.image.image_xs:
+            image_url = self.image.image_xs.url
+            full_url = request.build_absolute_uri(image_url)
+            return full_url
+        
+        if self.product.images.exists():
+            first_image = self.product.images.first()
+            if first_image and hasattr(first_image, 'image_xs') and first_image.image_xs:
+                image_url = first_image.image_xs.url
+                full_url = request.build_absolute_uri(image_url)
+                return
+        return None
 
 
     def get_valid_stock(self): # stocks that available for sell