Refactor Organization serializers to handle default values for critical and key assets, and update OrganizationViewSet to use OrganizationFilterSet for filtering.

Author: Maffooch

dojo/organization/api/serializers.py

@@ -51,7 +51,7 @@ def validate(self, data):
         if self.instance is not None and not data.get("role").is_owner:
             owners = (
                 Product_Type_Member.objects.filter(
-                    product_type=data.get("organization"), role__is_owner=True,
+                    product_type=data.get("organization", data.get("product_type")), role__is_owner=True,
                 )
                 .exclude(id=self.instance.id)
                 .count()
@@ -115,8 +115,8 @@ def validate(self, data):
 
 
 class OrganizationSerializer(serializers.ModelSerializer):
-    critical_asset = serializers.BooleanField(source="critical_product")
-    key_asset = serializers.BooleanField(source="key_product")
+    critical_asset = serializers.BooleanField(source="critical_product", default=False)
+    key_asset = serializers.BooleanField(source="key_product", default=False)
 
     class Meta:
         model = Product_Type

dojo/organization/api/views.py

@@ -17,6 +17,7 @@
 )
 from dojo.organization.api import serializers
 from dojo.organization.api.filters import (
+    OrganizationFilterSet,
     OrganizationGroupFilterSet,
     OrganizationMemberFilterSet,
 )
@@ -36,14 +37,7 @@ class OrganizationViewSet(
     serializer_class = serializers.OrganizationSerializer
     queryset = Product_Type.objects.none()
     filter_backends = (DjangoFilterBackend,)
-    filterset_fields = [
-        "id",
-        "name",
-        "critical_product",
-        "key_product",
-        "created",
-        "updated",
-    ]
+    filterset_class = OrganizationFilterSet
     permission_classes = (
         IsAuthenticated,
         permissions.UserHasProductTypePermission,
@@ -60,6 +54,9 @@ def perform_create(self, serializer):
         product_type_data = serializer.data
         product_type_data.pop("authorization_groups")
         product_type_data.pop("members")
+        # Manage custom fields separately with default fields of false
+        product_type_data["critical_product"] = product_type_data.pop("critical_asset", False)
+        product_type_data["key_product"] = product_type_data.pop("key_asset", False)
         member = Product_Type_Member()
         member.user = self.request.user
         member.product_type = Product_Type(**product_type_data)