diff --git a/backend/plugin/code_generator/templates/python/api.jinja b/backend/plugin/code_generator/templates/python/api.jinja index 6f7e37c8..920e7279 100644 --- a/backend/plugin/code_generator/templates/python/api.jinja +++ b/backend/plugin/code_generator/templates/python/api.jinja @@ -2,13 +2,13 @@ from typing import Annotated from fastapi import APIRouter, Depends, Path, Query -from backend.app.{{ app_name }}.schema.{{ table_name }} import ( +from backend.app.{{ app_name }}.schema.{{ filename }} import ( Create{{ schema_name }}Param, Delete{{ schema_name }}Param, Get{{ schema_name }}Detail, Update{{ schema_name }}Param, ) -from backend.app.{{ app_name }}.service.{{ table_name }}_service import {{ table_name }}_service +from backend.app.{{ app_name }}.service.{{ filename }}_service import {{ table_name }}_service from backend.common.pagination import DependsPagination, PageData from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base from backend.common.security.jwt import DependsJwtAuth diff --git a/backend/plugin/code_generator/templates/python/crud.jinja b/backend/plugin/code_generator/templates/python/crud.jinja index 620796a2..416ddd2d 100644 --- a/backend/plugin/code_generator/templates/python/crud.jinja +++ b/backend/plugin/code_generator/templates/python/crud.jinja @@ -5,7 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy_crud_plus import CRUDPlus from backend.app.{{ app_name }}.model import {{ class_name }} -from backend.app.{{ app_name }}.schema.{{ table_name }} import Create{{ schema_name }}Param, Update{{ schema_name }}Param +from backend.app.{{ app_name }}.schema.{{ filename }} import Create{{ schema_name }}Param, Update{{ schema_name }}Param class CRUD{{ class_name }}(CRUDPlus[{{ class_name }}]): diff --git a/backend/plugin/code_generator/templates/python/service.jinja b/backend/plugin/code_generator/templates/python/service.jinja index 920b7499..ffef55fd 100644 --- a/backend/plugin/code_generator/templates/python/service.jinja +++ b/backend/plugin/code_generator/templates/python/service.jinja @@ -2,9 +2,9 @@ from typing import Any, Sequence from sqlalchemy.ext.asyncio import AsyncSession -from backend.app.{{ app_name }}.crud.crud_{{ table_name }} import {{ table_name }}_dao +from backend.app.{{ app_name }}.crud.crud_{{ filename }} import {{ table_name }}_dao from backend.app.{{ app_name }}.model import {{ class_name }} -from backend.app.{{ app_name }}.schema.{{ table_name }} import Create{{ schema_name }}Param, Delete{{ schema_name }}Param, Update{{ schema_name }}Param +from backend.app.{{ app_name }}.schema.{{ filename }} import Create{{ schema_name }}Param, Delete{{ schema_name }}Param, Update{{ schema_name }}Param from backend.common.exception import errors from backend.common.pagination import paging_data diff --git a/backend/plugin/code_generator/utils/gen_template.py b/backend/plugin/code_generator/utils/gen_template.py index f032b8d8..1f81ea50 100644 --- a/backend/plugin/code_generator/utils/gen_template.py +++ b/backend/plugin/code_generator/utils/gen_template.py @@ -67,6 +67,7 @@ class GenTemplate: app_name = business.app_name table_name = business.table_name class_name = business.class_name or to_pascal(table_name) + filename = business.filename return { f'{app_name}/__init__.py': self.init_content, @@ -74,8 +75,7 @@ class GenTemplate: f'{app_name}/api/{business.api_version}/__init__.py': self.init_content, f'{app_name}/crud/__init__.py': self.init_content, f'{app_name}/model/__init__.py': ( - f'{self.init_content}' - f'from backend.app.{app_name}.model.{table_name} import {class_name} as {class_name}\n' + f'{self.init_content}from backend.app.{app_name}.model.{filename} import {class_name} as {class_name}\n' ), f'{app_name}/schema/__init__.py': self.init_content, f'{app_name}/service/__init__.py': self.init_content, @@ -97,6 +97,7 @@ class GenTemplate: 'table_comment': business.table_comment, 'class_name': business.class_name, 'schema_name': business.schema_name, + 'filename': business.filename, 'datetime_mixin': business.datetime_mixin, 'permission': business.table_name.replace('_', ':'), 'database_type': settings.DATABASE_TYPE,