Merge pull request #827 from calumbell/826/ruleset-filtering

[BUGFIX] Fixed filtering on `/v2/rulesets`

Author: augustjohnson

api_v2/migrations/0067_alter_rule_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.1 on 2025-11-03 11:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0066_alter_classfeature_feature_type'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='rule',
+            options={'ordering': ['index']},
+        ),
+    ]

api_v2/models/rule.py

@@ -39,4 +39,4 @@ class Rule(HasName, HasDescription, FromDocument):
   )
 
   class Meta:
-    ordering = ['key']
+    ordering = ['index']

api_v2/views/rule.py

@@ -18,19 +18,29 @@ class Meta:
         }
 
 class RuleViewSet(viewsets.ReadOnlyModelViewSet):
-  queryset = models.Rule.objects.all()
-  serializer_class = serializers.RuleSerializer
-  filterset_class = RuleFilterSet
+    queryset = models.Rule.objects.all()
+    serializer_class = serializers.RuleSerializer
+    filterset_class = RuleFilterSet
 
+class RuleSetFilterSet(FilterSet):
+    class Meta:
+        model = models.RuleSet
+        fields = {
+            'key': ['in', 'exact'],
+            'name': ['exact', 'contains'],
+            'document__key': ['in', 'exact'],
+            'document__gamesystem__key': ['in', 'exact'],
+        }
 
 class RuleSetViewSet(EagerLoadingMixin, viewsets.ReadOnlyModelViewSet):
-  queryset = models.RuleSet.objects.all()
-  serializer_class = serializers.RuleSetSerializer
-
-  select_related_fields = []
-  prefetch_related_fields = [
-    'document',
-    'document__gamesystem',
-    'document__publisher',
-    'rules',
-  ]
+    queryset = models.RuleSet.objects.all()
+    serializer_class = serializers.RuleSetSerializer
+    filterset_class = RuleSetFilterSet
+
+    select_related_fields = []
+    prefetch_related_fields = [
+      'document',
+      'document__gamesystem',
+      'document__publisher',
+      'rules',
+    ]