From 2c0cb5b6e6636d0da1f4badd523147ba0a097727 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Fri, 18 Apr 2025 19:10:45 +0800 Subject: [PATCH] feat: update module and tool delete APIs to use DefaultResultSerializer for responses --- apps/modules/api/module.py | 6 ++++-- apps/modules/views/module.py | 4 ++-- apps/tools/api/tool.py | 6 ++++-- apps/tools/views/tool.py | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/modules/api/module.py b/apps/modules/api/module.py index a910e35bf..aa8b12afc 100644 --- a/apps/modules/api/module.py +++ b/apps/modules/api/module.py @@ -3,7 +3,7 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import OpenApiParameter from common.mixins.api_mixin import APIMixin -from common.result import ResultSerializer +from common.result import ResultSerializer, DefaultResultSerializer from modules.models.module import ModuleCreateRequest, ModuleEditRequest from modules.serializers.module import ModuleSerializer @@ -84,7 +84,9 @@ class ModuleEditAPI(ModuleReadAPI): class ModuleDeleteAPI(ModuleReadAPI): - pass + @staticmethod + def get_response(): + return DefaultResultSerializer class ModuleTreeReadAPI(APIMixin): diff --git a/apps/modules/views/module.py b/apps/modules/views/module.py index 276f4367d..d7329c04c 100644 --- a/apps/modules/views/module.py +++ b/apps/modules/views/module.py @@ -6,7 +6,7 @@ from rest_framework.views import APIView from common.auth import TokenAuth from common.auth.authentication import has_permissions from common.constants.permission_constants import Permission, Group, Operate -from common.result import result, DefaultResultSerializer +from common.result import result from modules.api.module import ModuleCreateAPI, ModuleEditAPI, ModuleReadAPI, ModuleTreeReadAPI, ModuleDeleteAPI from modules.serializers.module import ModuleSerializer, ModuleTreeSerializer @@ -65,7 +65,7 @@ class ModuleView(APIView): description=_('Delete module'), operation_id=_('Delete module'), parameters=ModuleDeleteAPI.get_parameters(), - responses=DefaultResultSerializer, + responses=ModuleDeleteAPI.get_response(), tags=[_('Module')]) @has_permissions(lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.DELETE, resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}")) diff --git a/apps/tools/api/tool.py b/apps/tools/api/tool.py index 4046669ef..183d63deb 100644 --- a/apps/tools/api/tool.py +++ b/apps/tools/api/tool.py @@ -3,7 +3,7 @@ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import OpenApiParameter from common.mixins.api_mixin import APIMixin -from common.result import ResultSerializer +from common.result import ResultSerializer, DefaultResultSerializer from tools.serializers.tool import ToolModelSerializer, ToolCreateRequest @@ -67,7 +67,9 @@ class ToolEditAPI(ToolReadAPI): class ToolDeleteAPI(ToolReadAPI): - pass + @staticmethod + def get_response(): + return DefaultResultSerializer class ToolTreeReadAPI(APIMixin): diff --git a/apps/tools/views/tool.py b/apps/tools/views/tool.py index b0a201bb9..a34667faa 100644 --- a/apps/tools/views/tool.py +++ b/apps/tools/views/tool.py @@ -6,7 +6,7 @@ from rest_framework.views import APIView from common.auth import TokenAuth from common.auth.authentication import has_permissions from common.constants.permission_constants import PermissionConstants -from common.result import result, DefaultResultSerializer +from common.result import result from tools.api.tool import ToolCreateAPI, ToolEditAPI, ToolReadAPI, ToolDeleteAPI, ToolTreeReadAPI from tools.serializers.tool import ToolSerializer, ToolTreeSerializer @@ -60,7 +60,7 @@ class ToolView(APIView): description=_('Delete tool'), operation_id=_('Delete tool'), parameters=ToolDeleteAPI.get_parameters(), - responses=DefaultResultSerializer, + responses=ToolDeleteAPI.get_response(), tags=[_('Tool')]) @has_permissions(PermissionConstants.TOOL_DELETE.get_workspace_permission()) def delete(self, request: Request, workspace_id: str, tool_id: str):