fix: merge error (#686)

Author: ziyujiahao

backend/apps/datasource/api/datasource.py

@@ -28,8 +28,8 @@
 from ..crud.table import get_tables_by_ds_id
 from ..models.datasource import CoreDatasource, CreateDatasource, TableObj, CoreTable, CoreField, FieldObj, \
     TableSchemaResponse, ColumnSchemaResponse, PreviewResponse
-from sqlbot_xpack.audit.models.log_model import OperationType, OperationDetails, OperationModules
-from sqlbot_xpack.audit.schemas.logger_decorator import system_log, LogConfig
+from sqlbot_xpack.audit.models.log_model import OperationType, OperationModules
+from sqlbot_xpack.audit.schemas.logger_decorator import LogConfig, system_log
 
 router = APIRouter(tags=["Datasource"], prefix="/datasource")
 path = settings.EXCEL_PATH
@@ -71,12 +71,7 @@ def inner():
 
 
 @router.post("/add", response_model=CoreDatasource, summary=f"{PLACEHOLDER_PREFIX}ds_add")
-@system_log(LogConfig(
-    operation_type=OperationType.CREATE_DATASOURCE,
-    operation_detail=OperationDetails.CREATE_DATASOURCE_DETAILS,
-    module=OperationModules.DATASOURCE,
-    result_id_expr="id"
-))
+@system_log(LogConfig(operation_type=OperationType.CREATE, module=OperationModules.DATASOURCE, result_id_expr="id"))
 async def add(session: SessionDep, trans: Trans, user: CurrentUser, ds: CreateDatasource):
     def inner():
         return create_ds(session, trans, user, ds)
@@ -95,12 +90,8 @@ def inner():
 
 @router.post("/update", response_model=CoreDatasource, summary=f"{PLACEHOLDER_PREFIX}ds_update")
 @require_permissions(permission=SqlbotPermission(type='ds', keyExpression="ds.id"))
-@system_log(LogConfig(
-    operation_type=OperationType.UPDATE_DATASOURCE,
-    operation_detail=OperationDetails.UPDATE_DATASOURCE_DETAILS,
-    module=OperationModules.DATASOURCE,
-    resource_id_expr="ds.id"
-))
+@system_log(
+    LogConfig(operation_type=OperationType.UPDATE, module=OperationModules.DATASOURCE, resource_id_expr="ds.id"))
 async def update(session: SessionDep, trans: Trans, user: CurrentUser, ds: CoreDatasource):
     def inner():
         return update_ds(session, trans, user, ds)
@@ -110,13 +101,8 @@ def inner():
 
 @router.post("/delete/{id}/{name}", response_model=None, summary=f"{PLACEHOLDER_PREFIX}ds_delete")
 @require_permissions(permission=SqlbotPermission(type='ds', keyExpression="id"))
-@system_log(LogConfig(
-    operation_type=OperationType.DELETE_DATASOURCE,
-    operation_detail=OperationDetails.DELETE_DATASOURCE_DETAILS,
-    module=OperationModules.DATASOURCE,
-    resource_id_expr="id",
-    remark_expr="name"
-))
+@system_log(LogConfig(operation_type=OperationType.DELETE, module=OperationModules.DATASOURCE, resource_id_expr="id",
+                      ))
 async def delete(session: SessionDep, id: int = Path(..., description=f"{PLACEHOLDER_PREFIX}ds_id"), name: str = None):
     return delete_ds(session, id)