perf(api): filter_fields被filterset_fields取代

https://django-filter.readthedocs.io/en/stable/guide/migration.html

apps/perms/api/application/application_permission.py

@@ -12,8 +12,8 @@ class ApplicationPermissionViewSet(BasePermissionViewSet):
     """
     model = ApplicationPermission
     serializer_class = serializers.ApplicationPermissionSerializer
-    filter_fields = ['name', 'category', 'type']
-    search_fields = filter_fields
+    filterset_fields = ['name', 'category', 'type']
+    search_fields = filterset_fields
     custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [
         'application_id', 'application'
     ]

apps/perms/api/application/application_permission_relation.py

@@ -37,7 +37,7 @@ class ApplicationPermissionUserRelationViewSet(RelationMixin):
     serializer_class = serializers.ApplicationPermissionUserRelationSerializer
     m2m_field = models.ApplicationPermission.users.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', "user", "applicationpermission",
     ]
     search_fields = ("user__name", "user__username", "applicationpermission__name")
@@ -52,7 +52,7 @@ class ApplicationPermissionUserGroupRelationViewSet(RelationMixin):
     serializer_class = serializers.ApplicationPermissionUserGroupRelationSerializer
     m2m_field = models.ApplicationPermission.user_groups.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', "usergroup", "applicationpermission"
     ]
     search_fields = ["usergroup__name", "applicationpermission__name"]
@@ -67,7 +67,7 @@ class ApplicationPermissionApplicationRelationViewSet(RelationMixin):
     serializer_class = serializers.ApplicationPermissionApplicationRelationSerializer
     m2m_field = models.ApplicationPermission.applications.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', 'application', 'applicationpermission',
     ]
     search_fields = ["id", "application__name", "applicationpermission__name"]
@@ -82,7 +82,7 @@ class ApplicationPermissionSystemUserRelationViewSet(RelationMixin):
     serializer_class = serializers.ApplicationPermissionSystemUserRelationSerializer
     m2m_field = models.ApplicationPermission.system_users.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', 'systemuser', 'applicationpermission',
     ]
     search_fields = [
@@ -103,8 +103,8 @@ class ApplicationPermissionAllApplicationListApi(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.ApplicationPermissionAllApplicationSerializer
     only_fields = serializers.ApplicationPermissionAllApplicationSerializer.Meta.only_fields
-    filter_fields = ('name',)
-    search_fields = filter_fields
+    filterset_fields = ('name',)
+    search_fields = filterset_fields
 
     def get_queryset(self):
         pk = self.kwargs.get('pk')
@@ -118,8 +118,8 @@ class ApplicationPermissionAllUserListApi(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.ApplicationPermissionAllUserSerializer
     only_fields = serializers.ApplicationPermissionAllUserSerializer.Meta.only_fields
-    filter_fields = ('username', 'name')
-    search_fields = filter_fields
+    filterset_fields = ('username', 'name')
+    search_fields = filterset_fields
 
     def get_queryset(self):
         pk = self.kwargs.get('pk')

apps/perms/api/application/user_group_permission.py

@@ -21,7 +21,7 @@ class UserGroupGrantedApplicationsApi(CommonApiMixin, ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.ApplicationGrantedSerializer
     only_fields = serializers.ApplicationGrantedSerializer.Meta.only_fields
-    filter_fields = ['id', 'name', 'category', 'type', 'comment']
+    filterset_fields = ['id', 'name', 'category', 'type', 'comment']
     search_fields = ['name', 'comment']
 
     def get_queryset(self):

apps/perms/api/application/user_permission/user_permission_applications.py

@@ -25,7 +25,7 @@ __all__ = [
 class AllGrantedApplicationsMixin(CommonApiMixin, ListAPIView):
     only_fields = serializers.ApplicationGrantedSerializer.Meta.only_fields
     serializer_class = serializers.ApplicationGrantedSerializer
-    filter_fields = ['id', 'name', 'category', 'type', 'comment']
+    filterset_fields = ['id', 'name', 'category', 'type', 'comment']
     search_fields = ['name', 'comment']
     user: None
 

apps/perms/api/asset/asset_permission.py

@@ -21,7 +21,7 @@ class AssetPermissionViewSet(BasePermissionViewSet):
     """
     model = AssetPermission
     serializer_class = serializers.AssetPermissionSerializer
-    filter_fields = ['name']
+    filterset_fields = ['name']
     custom_filter_fields = BasePermissionViewSet.custom_filter_fields + [
         'node_id', 'node', 'asset_id', 'hostname', 'ip'
     ]

apps/perms/api/asset/asset_permission_relation.py

@@ -36,7 +36,7 @@ class AssetPermissionUserRelationViewSet(RelationMixin):
     serializer_class = serializers.AssetPermissionUserRelationSerializer
     m2m_field = models.AssetPermission.users.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', "user", "assetpermission",
     ]
     search_fields = ("user__name", "user__username", "assetpermission__name")
@@ -51,8 +51,8 @@ class AssetPermissionUserRelationViewSet(RelationMixin):
 class AssetPermissionAllUserListApi(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionAllUserSerializer
-    filter_fields = ("username", "name")
-    search_fields = filter_fields
+    filterset_fields = ("username", "name")
+    search_fields = filterset_fields
 
     def get_queryset(self):
         pk = self.kwargs.get("pk")
@@ -67,7 +67,7 @@ class AssetPermissionUserGroupRelationViewSet(RelationMixin):
     serializer_class = serializers.AssetPermissionUserGroupRelationSerializer
     m2m_field = models.AssetPermission.user_groups.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', "usergroup", "assetpermission"
     ]
     search_fields = ["usergroup__name", "assetpermission__name"]
@@ -83,7 +83,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
     serializer_class = serializers.AssetPermissionAssetRelationSerializer
     m2m_field = models.AssetPermission.assets.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', 'asset', 'assetpermission',
     ]
     search_fields = ["id", "asset__hostname", "asset__ip", "assetpermission__name"]
@@ -98,8 +98,8 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
 class AssetPermissionAllAssetListApi(generics.ListAPIView):
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.AssetPermissionAllAssetSerializer
-    filter_fields = ("hostname", "ip")
-    search_fields = filter_fields
+    filterset_fields = ("hostname", "ip")
+    search_fields = filterset_fields
 
     def get_queryset(self):
         pk = self.kwargs.get("pk")
@@ -119,7 +119,7 @@ class AssetPermissionNodeRelationViewSet(RelationMixin):
     serializer_class = serializers.AssetPermissionNodeRelationSerializer
     m2m_field = models.AssetPermission.nodes.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', 'node', 'assetpermission',
     ]
     search_fields = ["node__value", "assetpermission__name"]
@@ -135,7 +135,7 @@ class AssetPermissionSystemUserRelationViewSet(RelationMixin):
     serializer_class = serializers.AssetPermissionSystemUserRelationSerializer
     m2m_field = models.AssetPermission.system_users.field
     permission_classes = (IsOrgAdmin,)
-    filter_fields = [
+    filterset_fields = [
         'id', 'systemuser', 'assetpermission',
     ]
     search_fields = [

apps/perms/api/asset/user_group_permission.py

@@ -35,7 +35,7 @@ class UserGroupGrantedAssetsApi(ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.AssetGrantedSerializer
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
 
     def get_queryset(self):
@@ -68,7 +68,7 @@ class UserGroupGrantedNodeAssetsApi(ListAPIView):
     permission_classes = (IsOrgAdminOrAppUser,)
     serializer_class = serializers.AssetGrantedSerializer
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
 
     def get_queryset(self):

apps/perms/api/asset/user_permission/user_permission_assets.py

@@ -27,7 +27,7 @@ class UserDirectGrantedAssetsApi(ListAPIView):
     """
     serializer_class = serializers.AssetGrantedSerializer
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
 
     def get_queryset(self):
@@ -43,7 +43,7 @@ class UserDirectGrantedAssetsApi(ListAPIView):
 class UserFavoriteGrantedAssetsApi(ListAPIView):
     serializer_class = serializers.AssetGrantedSerializer
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
 
     def get_queryset(self):
@@ -101,7 +101,7 @@ class MyUngroupAssetsAsTreeApi(ForUserMixin, AssetsAsTreeMixin, UserDirectGrante
 class UserAllGrantedAssetsApi(ForAdminMixin, ListAPIView):
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
     serializer_class = serializers.AssetGrantedSerializer
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
 
     def get_queryset(self):
@@ -123,7 +123,7 @@ class MyAllAssetsAsTreeApi(ForUserMixin, AssetsAsTreeMixin, UserAllGrantedAssets
 class UserGrantedNodeAssetsApi(UserNodeGrantStatusDispatchMixin, ListAPIView):
     serializer_class = serializers.AssetGrantedSerializer
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
-    filter_fields = ['hostname', 'ip', 'id', 'comment']
+    filterset_fields = ['hostname', 'ip', 'id', 'comment']
     search_fields = ['hostname', 'ip', 'comment']
     pagination_class = GrantedAssetLimitOffsetPagination
     pagination_node: Node