Merge pull request #398 from MySecondLanguage/optimized-query

Optimized query

Author: MySecondLanguage

nxtbn/filemanager/migrations/0005_alter_image_image_alter_image_image_xs.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2025-02-21 08:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("filemanager", "0004_rename_image_sm_image_image_xs"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="image",
+            name="image",
+            field=models.ImageField(upload_to="images/"),
+        ),
+        migrations.AlterField(
+            model_name="image",
+            name="image_xs",
+            field=models.ImageField(blank=True, null=True, upload_to="images/xs/"),
+        ),
+    ]

nxtbn/filemanager/models.py

@@ -8,8 +8,8 @@ class Image(AbstractBaseModel):
     created_by = models.ForeignKey(User, on_delete=models.PROTECT, related_name='image_created')
     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 = models.ImageField(upload_to='images/')
+    image_xs = models.ImageField(upload_to='images/xs/', null=True, blank=True)
     image_alt_text = models.CharField(max_length=255)
 
     def get_image_url(self,request):

nxtbn/order/__init__.py

@@ -147,13 +147,14 @@ class OrderStockReservationStatus(models.TextChoices):
     OrderReservationStatus is an enumeration of possible statuses for an order reservation.
 
     Attributes:
-        RESERVED: The stock has been reserved for the order.
-        RELEASED: The stock reservation has been released.
-        INSUFFICIENT_STOCK: The stock is insufficient to fulfill the order.
-        NOT_RESERVED: The stock has not been reserved for the order.
+        RESERVED: Stock has been reserved for the order.
+        RELEASED: Stock reservation has been released.
+        FAILED: Stock reservation has failed due to insufficient stock.
+        NOT_REQUIRED: Stock reservation is not required.
+        DISPATCHED: Stock has been dispatched for the order.
     """
     RESERVED = 'RESERVED', _('Reserved')
     RELEASED = 'RELEASED', _('Released') # Re-adjust stock after order is cancelled
     FAILED = 'FAILED', _('Failed') # If failed, that is mean stock is insufficient to fulfill the order, have to fixed it before proceed
-    NOT_RESERVED = 'NOT_RESERVED', _('Not Reserved') # DO NOTHING IF NOT RESERVED, NO NEED VALIDATION
+    NOT_REQUIRED = 'NOT_REQUIRED', _('Not Required') # DO NOTHING IF NOT REQUIRED, NO NEED VALIDATION
     DISPATCHED = 'DISPATCHED', _('Dispatched')

nxtbn/order/migrations/0040_alter_order_reservation_status.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.11 on 2025-02-21 09:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0039_alter_order_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="order",
+            name="reservation_status",
+            field=models.CharField(
+                choices=[
+                    ("RESERVED", "Reserved"),
+                    ("RELEASED", "Released"),
+                    ("FAILED", "Failed"),
+                    ("NOT_REQUIRED", "Not Required"),
+                    ("DISPATCHED", "Dispatched"),
+                ],
+                default="NOT_REQUIRED",
+                max_length=20,
+            ),
+        ),
+    ]

nxtbn/order/models.py

@@ -241,7 +241,7 @@ class Order(MonetaryMixin, AbstractBaseUUIDModel):
         help_text="Preferred payment method for this order. The actual payment method may differ when the order is initiated or paid."
     )
     reservation_status = models.CharField(
-        default=OrderStockReservationStatus.NOT_RESERVED,
+        default=OrderStockReservationStatus.NOT_REQUIRED,
         max_length=20,
         choices=OrderStockReservationStatus.choices
     )

nxtbn/product/admin_filters.py

@@ -18,12 +18,27 @@ class ProductFilter(filters.FilterSet):
     variant_alias = filters.CharFilter(field_name='variants__alias', lookup_expr='icontains')
     variant_sku = filters.CharFilter(field_name='variants__sku', lookup_expr='icontains')
     variant_name = filters.CharFilter(field_name='variants__name', lookup_expr='icontains')
-    title = filters.CharFilter(field_name='name', lookup_expr='icontains')
-
 
     class Meta:
         model = Product
-        fields = ('name', 'summary', 'description', 'category', 'category_name', 'supplier', 'brand','related_to', 'search', 'collection')
+        fields = (
+            'id',
+            'alias',
+            'name', 
+            'summary', 
+            'description', 
+            'category', 
+            'category_name', 
+            'supplier', 
+            'brand', 
+            'related_to', 
+            'search', 
+            'collection', 
+            'variant_id', 
+            'variant_alias', 
+            'variant_sku', 
+            'variant_name'
+        )
 
     def filter_search(self, queryset, name, value):
         """

nxtbn/product/models.py

@@ -232,6 +232,12 @@ def product_thumbnail_xs(self, request):
             image_url = first_image.image_xs.url
             full_url = request.build_absolute_uri(image_url)
             return full_url
+        
+        if first_image and hasattr(first_image, 'image') and first_image.image:
+            image_url = first_image.image.url
+            full_url = request.build_absolute_uri(image_url)
+            return full_url
+
         return None
 
 
@@ -394,7 +400,7 @@ def variant_thumbnail(self, request):
             if first_image and hasattr(first_image, 'image') and first_image.image:
                 image_url = first_image.image.url
                 full_url = request.build_absolute_uri(image_url)
-                return
+                return full_url
         return None
 
     def variant_thumbnail_xs(self, request):
@@ -409,10 +415,10 @@ def variant_thumbnail_xs(self, request):
 
         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
+            if first_image and hasattr(first_image, 'image') and first_image.image:
+                image_url = first_image.image.url
                 full_url = request.build_absolute_uri(image_url)
-                return
+                return full_url
         return None
 
 

nxtbn/warehouse/utils.py

@@ -106,7 +106,7 @@ def release_stock(order):
         return order
 
 def deduct_reservation_on_packed_for_dispatch(order):
-    if order.reservation_status == OrderStockReservationStatus.NOT_RESERVED: # As not reservable, nothing to do
+    if order.reservation_status == OrderStockReservationStatus.NOT_REQUIRED: # As not reservable, nothing to do
         return None
 
     if order.reservation_status == OrderStockReservationStatus.FAILED: