Fix slugs

JobDoesburg · JobDoesburg · commit 3fe3dc7f4c20 · 2025-07-20T23:45:25.000+02:00
diff --git a/landolfio/inventory/admin.py b/landolfio/inventory/admin.py
@@ -57,9 +57,9 @@ def get_queryset(self, request):
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == "property" and hasattr(self, "parent_obj"):
-            # Filter properties by the asset's category
+            # Filter properties that apply to the asset's category
             kwargs["queryset"] = AssetProperty.objects.filter(
-                category=self.parent_obj.category
+                categories=self.parent_obj.category
             )
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
 
@@ -669,18 +669,23 @@ def has_add_permission(self, request, obj=None):
 class AssetPropertyAdmin(admin.ModelAdmin):
     """Admin interface for managing asset properties."""
 
-    list_display = ["name", "category", "property_type", "unit", "order"]
+    list_display = ["name", "get_categories", "property_type", "unit", "order"]
     list_filter = [
-        "category",
+        "categories",
         "property_type",
     ]
-    search_fields = ["name", "category__name"]
-    ordering = ["category", "order", "name"]
+    search_fields = ["name", "categories__name"]
+    ordering = ["name", "order"]
+
+    def get_categories(self, obj):
+        return ", ".join([cat.name for cat in obj.categories.all()])
+
+    get_categories.short_description = _("Categories")
 
     fieldsets = (
         (
             _("Basic Information"),
-            {"fields": ("category", "name", "property_type", "order")},
+            {"fields": ("categories", "name", "property_type", "order")},
         ),
         (
             _("Type-Specific Settings"),
@@ -728,8 +733,8 @@ def get_queryset(self, request):
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == "property" and hasattr(request, "_asset_category"):
-            # Filter properties by category if we know the asset's category
+            # Filter properties that apply to the category if we know the asset's category
             kwargs["queryset"] = AssetProperty.objects.filter(
-                category=request._asset_category
+                categories=request._asset_category
             )
         return super().formfield_for_foreignkey(db_field, request, **kwargs)
diff --git a/landolfio/inventory/migrations/0007_alter_assetproperty_options_and_more.py b/landolfio/inventory/migrations/0007_alter_assetproperty_options_and_more.py
@@ -0,0 +1,51 @@
+# Generated by Django 5.1.6 on 2025-07-20 21:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("inventory", "0006_assetproperty_assetpropertyvalue"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="assetproperty",
+            options={
+                "ordering": ["name", "order"],
+                "verbose_name": "asset property",
+                "verbose_name_plural": "asset properties",
+            },
+        ),
+        migrations.AlterUniqueTogether(
+            name="assetproperty",
+            unique_together=set(),
+        ),
+        migrations.AddField(
+            model_name="assetproperty",
+            name="categories",
+            field=models.ManyToManyField(
+                help_text="Categories this property applies to",
+                related_name="properties",
+                to="inventory.category",
+                verbose_name="categories",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="assetproperty",
+            name="slug",
+            field=models.SlugField(
+                blank=True,
+                help_text="URL-friendly version of property name (e.g., 'color', 'weight')",
+                max_length=100,
+                null=True,
+                unique=True,
+                verbose_name="slug",
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="assetproperty",
+            name="category",
+        ),
+    ]
diff --git a/landolfio/inventory/migrations/0008_auto_20250720_2343.py b/landolfio/inventory/migrations/0008_auto_20250720_2343.py
@@ -0,0 +1,39 @@
+# Generated by Django 5.1.6 on 2025-07-20 21:43
+
+from django.db import migrations
+from django.utils.text import slugify
+
+
+def update_property_slugs(apps, schema_editor):
+    """Update existing property slugs to remove category prefixes."""
+    AssetProperty = apps.get_model("inventory", "AssetProperty")
+
+    for prop in AssetProperty.objects.all():
+        # Generate new slug from just the property name
+        new_slug = slugify(prop.name)
+
+        # Ensure uniqueness
+        counter = 1
+        original_slug = new_slug
+        while AssetProperty.objects.filter(slug=new_slug).exclude(id=prop.id).exists():
+            new_slug = f"{original_slug}-{counter}"
+            counter += 1
+
+        prop.slug = new_slug
+        prop.save()
+
+
+def reverse_update_property_slugs(apps, schema_editor):
+    """Reverse operation - not implemented as old slugs can't be reconstructed."""
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("inventory", "0007_alter_assetproperty_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(update_property_slugs, reverse_update_property_slugs),
+    ]
diff --git a/landolfio/inventory/models/asset_property.py b/landolfio/inventory/models/asset_property.py
@@ -13,14 +13,14 @@ class AssetPropertyType(models.TextChoices):
 
 class AssetProperty(models.Model):
     """
-    Defines a property that can be assigned to assets of a specific category.
+    Defines a property that can be assigned to assets of multiple categories.
     """
 
-    category = models.ForeignKey(
+    categories = models.ManyToManyField(
         "Category",
-        on_delete=models.CASCADE,
         related_name="properties",
-        verbose_name=_("category"),
+        verbose_name=_("categories"),
+        help_text=_("Categories this property applies to"),
     )
     name = models.CharField(
         max_length=100,
@@ -33,9 +33,7 @@ class AssetProperty(models.Model):
         blank=True,
         null=True,
         verbose_name=_("slug"),
-        help_text=_(
-            "URL-friendly version with category prefix (e.g., 'electronics-color', 'furniture-weight')"
-        ),
+        help_text=_("URL-friendly version of property name (e.g., 'color', 'weight')"),
     )
     property_type = models.CharField(
         max_length=20,
@@ -65,11 +63,13 @@ class AssetProperty(models.Model):
     class Meta:
         verbose_name = _("asset property")
         verbose_name_plural = _("asset properties")
-        unique_together = [("category", "name")]
-        ordering = ["category", "order", "name"]
+        ordering = ["name", "order"]
 
     def __str__(self):
-        return f"{self.category.name} - {self.name}"
+        category_names = ", ".join([cat.name for cat in self.categories.all()[:3]])
+        if self.categories.count() > 3:
+            category_names += "..."
+        return f"{self.name} ({category_names})"
 
     def clean(self):
         super().clean()
@@ -116,15 +116,9 @@ def get_dropdown_options(self):
         return []
 
     def _generate_slug(self):
-        """Generate a category-prefixed slug from the property name."""
-        if not self.category:
-            raise ValidationError(
-                {"category": _("Category is required to generate slug")}
-            )
-
-        category_slug = slugify(self.category.name_singular)
+        """Generate a slug from the property name."""
         property_slug = slugify(self.name)
-        return f"{category_slug}-{property_slug}"
+        return property_slug
 
     def save(self, *args, **kwargs):
         # Auto-generate slug if not provided
@@ -168,14 +162,10 @@ def __str__(self):
     def clean(self):
         super().clean()
 
-        # Validate that the property belongs to the asset's category
-        if self.asset.category != self.property.category:
+        # Validate that the property applies to the asset's category
+        if self.asset.category not in self.property.categories.all():
             raise ValidationError(
-                {
-                    "property": _(
-                        "Property must belong to the same category as the asset"
-                    )
-                }
+                {"property": _("Property must apply to the asset's category")}
             )
 
         # Validate value based on property type
diff --git a/landolfio/inventory_frontend/templates/list.html b/landolfio/inventory_frontend/templates/list.html
@@ -212,9 +212,7 @@
                             {% for property in all_properties %}
                                 <div class="mb-3">
                                     <div class="d-flex justify-content-between align-items-center">
-                                        <label class="form-label fw-bold small mb-0">{{ property.name }} 
-                                            <span class="text-muted">({{ property.category.name }})</span>
-                                        </label>
+                                        <label class="form-label fw-bold small mb-0">{{ property.name }}</label>
                                         <i class="fas fa-eye property-visibility-toggle property-eye-icon" 
                                            style="cursor: pointer; color: #6c757d; font-size: 0.8rem;"
                                            data-property-slug="{{ property.slug }}"
diff --git a/landolfio/inventory_frontend/views.py b/landolfio/inventory_frontend/views.py
@@ -136,8 +136,56 @@ def get_queryset(self):
         for property_filter in property_filters:
             queryset = queryset.filter(property_filter)
 
+        # Apply numeric range filters separately
+        queryset = self._apply_numeric_range_filters(queryset)
+
         return queryset.select_related("category", "location", "collection", "size")
 
+    def _apply_numeric_range_filters(self, queryset):
+        """Apply numeric range filters using proper numeric comparison."""
+        from django.db.models import DecimalField
+        from django.db.models.functions import Cast
+
+        for param_name, param_values in self.request.GET.lists():
+            if param_name.endswith(("_min", "_max")):
+                try:
+                    property_slug = param_name.replace("_min", "").replace("_max", "")
+                    property_obj = AssetProperty.objects.get(slug=property_slug)
+
+                    if property_obj.property_type == "number":
+                        range_type = "min" if param_name.endswith("_min") else "max"
+
+                        for param_value in param_values:
+                            if param_value.strip():
+                                numeric_value = float(param_value)
+
+                                # Apply range filter using Cast for proper numeric comparison
+                                if range_type == "min":
+                                    queryset = queryset.filter(
+                                        property_values__property=property_obj,
+                                        property_values__value__regex=r"^[0-9]+\.?[0-9]*$",
+                                    ).extra(
+                                        where=[
+                                            "CAST(inventory_assetpropertyvalue.value AS DECIMAL(10,2)) >= %s"
+                                        ],
+                                        params=[numeric_value],
+                                    )
+                                else:  # max
+                                    queryset = queryset.filter(
+                                        property_values__property=property_obj,
+                                        property_values__value__regex=r"^[0-9]+\.?[0-9]*$",
+                                    ).extra(
+                                        where=[
+                                            "CAST(inventory_assetpropertyvalue.value AS DECIMAL(10,2)) <= %s"
+                                        ],
+                                        params=[numeric_value],
+                                    )
+                                break
+                except (ValueError, TypeError, AssetProperty.DoesNotExist):
+                    continue
+
+        return queryset
+
     def _parse_property_parameters(self):
         """Parse property-related parameters from the request."""
         property_params = {}
@@ -210,13 +258,19 @@ def _build_numeric_filter(self, property_id, params):
         has_min = "min" in params
         has_max = "max" in params
 
-        if has_min or has_max:
-            return (
-                Q(property_values__property_id=property_id)
-                & Q(property_values__value__regex=r"^[0-9]+\.?[0-9]*$")
-                & ~Q(property_values__value="")
-            )
-        return None
+        if not (has_min or has_max):
+            return None
+
+        # Base filter for valid numeric values
+        base_filter = (
+            Q(property_values__property_id=property_id)
+            & Q(property_values__value__regex=r"^[0-9]+\.?[0-9]*$")
+            & ~Q(property_values__value="")
+        )
+
+        # For range filtering, we need to do post-processing since we store numeric values as strings
+        # We'll return the base filter and let the get_queryset method handle the range logic
+        return base_filter
 
     def _build_dropdown_filter(self, property_id, params):
         """Build filter for dropdown properties."""
@@ -247,8 +301,8 @@ def _get_property_filters(self):
 
     def _get_properties_with_current_values(self):
         """Get all properties with their current filter values attached."""
-        properties = AssetProperty.objects.select_related("category").order_by(
-            "category__name", "order", "name"
+        properties = AssetProperty.objects.prefetch_related("categories").order_by(
+            "name", "order"
         )
 
         for prop in properties:
@@ -481,7 +535,7 @@ def get_context_data(self, **kwargs):
 
         # Add asset properties
         category_properties = AssetProperty.objects.filter(
-            category=asset.category
+            categories=asset.category
         ).order_by("order", "name")
 
         # Get existing property values for this asset
@@ -600,7 +654,7 @@ def post(self, request, *args, **kwargs):
     def _update_asset_properties(self, asset, data):
         """Update asset property values from form data."""
         updated_properties = []
-        category_properties = AssetProperty.objects.filter(category=asset.category)
+        category_properties = AssetProperty.objects.filter(categories=asset.category)
 
         for prop in category_properties:
             field_name = f"property_{prop.slug}"
@@ -767,11 +821,11 @@ def get(self, request, *args, **kwargs):
         except AssetProperty.DoesNotExist:
             return JsonResponse([], safe=False)
 
-        # Get distinct values for this property from assets in the same category that match the query
+        # Get distinct values for this property from assets in categories that use this property
         values = (
             AssetPropertyValue.objects.filter(
                 property=property_obj,
-                asset__category=property_obj.category,  # Only from same category
+                asset__category__in=property_obj.categories.all(),  # Only from categories that use this property
                 value__icontains=query,
             )
             .values_list("value", flat=True)
