Part Test refactor

docs/docs/settings/error_codes.md

@@ -234,7 +234,7 @@ See [Override global settings](../settings/global.md#override-global-settings) f
 #### INVE-I2
 **Issue with filtering serializer or decorator - Backend**
 
-An issue was detected with the application of a filtering serializer or decorator. This might lead to unexpected behaviour or performance issues. Therefore an issue is raised to make the developer aware of the possible issue. Look into the docstrings of enable_filter, FilterableSerializerField or FilterableSerializerMixin.
+An issue was detected with the application of a filtering serializer or decorator. This might lead to unexpected behaviour or performance issues. Therefore an issue is raised to make the developer aware of the possible issue. Look into the docstrings of OptionalField, FilterableSerializerField or FilterableSerializerMixin.
 
 This warning should only be raised during development and not in production, if you recently installed a plugin you might want to contact the plugin author.
 

src/backend/InvenTree/InvenTree/api_version.py

@@ -1,11 +1,16 @@
 """InvenTree API version information."""
 
 # InvenTree API version
-INVENTREE_API_VERSION = 479
+INVENTREE_API_VERSION = 480
+
 """Increment this API version number whenever there is a significant change to the API that any clients need to know about."""
 
 INVENTREE_API_TEXT = """
 
+v480 -> 2026-04-19 : https://github.com/inventree/InvenTree/pull/9928
+    - Refactor of "PartTestTemplate" models and API endpoints
+    - Add "PartTest" API endpoint
+
 v479 -> 2026-04-11 : https://github.com/inventree/InvenTree/pull/11723
     - POST /api//notifications/readall/ now requires a POST action
     - POST /api/admin/email/test/ - now returns a 200 on. a successful test

src/backend/InvenTree/part/admin.py

@@ -70,10 +70,17 @@ class PartRelatedAdmin(admin.ModelAdmin):
 class PartTestTemplateAdmin(admin.ModelAdmin):
     """Admin class for the PartTestTemplate model."""
 
-    list_display = ('part', 'test_name', 'required')
+    list_display = ['test_name']
     readonly_fields = ['key']
+    search_fields = ['test_name']
 
-    autocomplete_fields = ('part',)
+
+@admin.register(models.PartTest)
+class PartTestAdmin(admin.ModelAdmin):
+    """Admin class for the PartTest model."""
+
+    list_display = ('template', 'part', 'enabled', 'required')
+    autocomplete_fields = ('part', 'template')
 
 
 @admin.register(models.BomItem)

src/backend/InvenTree/part/api.py

@@ -58,6 +58,7 @@
     PartRelated,
     PartSellPriceBreak,
     PartStocktake,
+    PartTest,
     PartTestTemplate,
 )
 
@@ -396,29 +397,7 @@ class Meta:
         """Metaclass options for this filterset."""
 
         model = PartTestTemplate
-        fields = ['enabled', 'key', 'required', 'requires_attachment', 'requires_value']
-
-    part = rest_filters.ModelChoiceFilter(
-        queryset=Part.objects.filter(testable=True),
-        label='Part',
-        field_name='part',
-        method='filter_part',
-    )
-
-    def filter_part(self, queryset, name, part):
-        """Filter by the 'part' field.
-
-        Note: If the 'include_inherited' query parameter is set,
-        we also include any parts "above" the specified part.
-        """
-        include_inherited = str2bool(
-            self.request.query_params.get('include_inherited', True)
-        )
-
-        if include_inherited:
-            return queryset.filter(part__in=part.get_ancestors(include_self=True))
-        else:
-            return queryset.filter(part=part)
+        fields = ['key', 'requires_attachment', 'requires_value']
 
     has_results = rest_filters.BooleanFilter(
         label=_('Has Results'), method='filter_has_results'
@@ -471,6 +450,60 @@ class PartTestTemplateList(PartTestTemplateMixin, DataExportViewMixin, ListCreat
     ordering = 'test_name'
 
 
+class PartTestFilter(FilterSet):
+    """Custom filterset class for the PartTestList endpoint."""
+
+    class Meta:
+        """Metaclass options for this filterset."""
+
+        model = PartTest
+        fields = ['template', 'part', 'enabled', 'required']
+
+    for_part = rest_filters.ModelChoiceFilter(
+        queryset=Part.objects.all(), label=_('For Part'), method='filter_for_part'
+    )
+
+    def filter_for_part(self, queryset, name, part):
+        """Filter 'PartTest' instances which associate with the provided 'Part'.
+
+        This is functionally different from the 'part' filter,
+        as it returns any PartTest instances which are associated with the provided part,
+        either directly or indirectly via the part's ancestors or categories.
+
+        Additionally, the results return at most one PartTest instance per PartTestTemplate,
+        with the most specific match being returned.
+        """
+        return part.getPartTests(queryset=queryset)
+
+
+class PartTestMixin:
+    """Mixin class for the PartTest API endpoints."""
+
+    queryset = PartTest.objects.all()
+    serializer_class = part_serializers.PartTestSerializer
+
+    def get_queryset(self, *args, **kwargs):
+        """Return an annotated queryset for the PartTestDetail endpoints."""
+        queryset = super().get_queryset(*args, **kwargs)
+        queryset = queryset.prefetch_related('template', 'part', 'part__pricing_data')
+        return queryset
+
+
+class PartTestList(PartTestMixin, ListCreateAPI):
+    """List endpoint for the PartTest model."""
+
+    filterset_class = PartTestFilter
+    filter_backends = SEARCH_ORDER_FILTER
+
+    search_fields = ['template__test_name', 'template__description']
+
+    ordering_fields = ['template', 'part', 'enabled', 'required']
+
+
+class PartTestDetail(PartTestMixin, RetrieveUpdateDestroyAPI):
+    """Detail endpoint for the PartTest model."""
+
+
 class PartThumbs(ListAPI):
     """API endpoint for retrieving information on available Part thumbnails."""
 
@@ -1583,6 +1616,18 @@ class BomItemSubstituteDetail(RetrieveUpdateDestroyAPI):
             ),
         ]),
     ),
+    path(
+        'test/',
+        include([
+            path(
+                '<int:pk>/',
+                include([
+                    path('', PartTestDetail.as_view(), name='api-part-test-detail')
+                ]),
+            ),
+            path('', PartTestList.as_view(), name='api-part-test-list'),
+        ]),
+    ),
     # Base URL for part sale pricing
     path(
         'sale-price/',

src/backend/InvenTree/part/fixtures/test_templates.yaml

@@ -2,68 +2,114 @@
 - model: part.parttesttemplate
   pk: 1
   fields:
-    part: 10000
     test_name: Test strength of chair
     key: 'teststrengthofchair'
 
 - model: part.parttesttemplate
   pk: 2
   fields:
-    part: 10000
     test_name: Apply paint
     key: 'applypaint'
 
 - model: part.parttesttemplate
   pk: 3
   fields:
-    part: 10000
     test_name: Sew cushion
     key: 'sewcushion'
 
 - model: part.parttesttemplate
   pk: 4
   fields:
-    part: 10000
     test_name: Attach legs
     key: 'attachlegs'
 
 - model: part.parttesttemplate
   pk: 5
   fields:
-    part: 10000
     test_name: Record weight
     key: 'recordweight'
-    required: false
 
 # Add some tests for one of the variants
 - model: part.parttesttemplate
   pk: 6
   fields:
-    part: 10003
     test_name: Check chair is green
     key: 'checkchairisgreen'
-    required: true
 
 - model: part.parttesttemplate
   pk: 8
   fields:
-    part: 25
     test_name: 'Temperature Test'
     key: 'temperaturetest'
-    required: False
 
 - model: part.parttesttemplate
   pk: 9
   fields:
-    part: 25
     test_name: 'Settings Checksum'
     key: 'settingschecksum'
-    required: False
 
 - model: part.parttesttemplate
   pk: 10
   fields:
-    part: 25
     test_name: 'Firmware Version'
     key: 'firmwareversion'
+
+# Link parts to test templates
+- model: part.parttest
+  pk: 1
+  fields:
+    template: 1
+    part: 10000
+
+- model: part.parttest
+  pk: 2
+  fields:
+    template: 2
+    part: 10000
+
+- model: part.parttest
+  pk: 3
+  fields:
+    template: 3
+    part: 10000
+
+- model: part.parttest
+  pk: 4
+  fields:
+    template: 4
+    part: 10000
+
+- model: part.parttest
+  pk: 5
+  fields:
+    template: 5
+    part: 10000
+    required: false
+
+- model: part.parttest
+  pk: 6
+  fields:
+    template: 6
+    part: 10003
+    required: true
+
+- model: part.parttest
+  pk: 8
+  fields:
+    template: 8
+    part: 25
+    required: False
+
+- model: part.parttest
+  pk: 9
+  fields:
+    template: 9
+    part: 25
+    required: False
+
+- model: part.parttest
+  pk: 10
+  fields:
+    template: 10
+    part: 25
     required: False

src/backend/InvenTree/part/migrations/0148_parttest.py

@@ -0,0 +1,87 @@
+# Generated by Django 4.2.22 on 2025-07-01 13:32
+
+import InvenTree.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("part", "0147_remove_part_default_supplier"),
+    ]
+
+    operations = [
+        # Mark the 'part' field on the PartTestTemplate model as nullable
+        # Note that this field will be deleted in migration part.0150
+        migrations.AlterField(
+            model_name="parttesttemplate",
+            name="part",
+            field=models.ForeignKey(
+                blank=True,
+                limit_choices_to={"testable": True},
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="test_templates",
+                to="part.part",
+                verbose_name="Part",
+            ),
+        ),
+        migrations.CreateModel(
+            name="PartTest",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "part",
+                    models.ForeignKey(
+                        blank=True,
+                        help_text="Part to which this test applies",
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tests",
+                        to="part.part",
+                        verbose_name="Part",
+                    ),
+                ),
+                (
+                    "template",
+                    models.ForeignKey(
+                        help_text="Part test template to apply",
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tests",
+                        to="part.parttesttemplate",
+                        verbose_name="Test Template",
+                    ),
+                ),
+                (
+                    "enabled",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Is this test enabled for the associated part?",
+                        verbose_name="Enabled",
+                    ),
+                ),
+                (
+                    "required",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Is this test required to pass?",
+                        verbose_name="Required",
+                    ),
+                )
+            ],
+            options={
+                "verbose_name": "Part Test",
+                "unique_together": {("template", "part")},
+            },
+            bases=(InvenTree.models.PluginValidationMixin, models.Model),
+        ),
+    ]