Skip to content

Fix code generation to new features #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-clan merged 1 commit into from
Aug 31, 2024
Merged

Fix code generation to new features #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions backend/templates/py/api.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ router = APIRouter()
@router.get('/{pk}', summary='获取{{ table_simple_name_zh }}详情', dependencies=[DependsJwtAuth])
async def get_{{ table_name_en }}(pk: Annotated[int, Path(...)]) -> ResponseModel:
{{ table_name_en }} = await {{ table_name_en }}_service.get(pk=pk)
return await response_base.success(data={{ table_name_en }})
return response_base.success(data={{ table_name_en }})


@router.get(
Expand All @@ -33,7 +33,7 @@ async def get_{{ table_name_en }}(pk: Annotated[int, Path(...)]) -> ResponseMode
async def get_pagination_{{ table_name_en }}(db: CurrentSession) -> ResponseModel:
{{ table_name_en }}_select = await {{ table_name_en }}_service.get_select()
page_data = await paging_data(db, {{ table_name_en }}_select, Get{{ schema_name }}ListDetails)
return await response_base.success(data=page_data)
return response_base.success(data=page_data)


@router.post(
Expand All @@ -46,7 +46,7 @@ async def get_pagination_{{ table_name_en }}(db: CurrentSession) -> ResponseMode
)
async def create_{{ table_name_en }}(obj: Create{{ schema_name }}Param) -> ResponseModel:
await {{ table_name_en }}_service.create(obj=obj)
return await response_base.success()
return response_base.success()


@router.put(
Expand All @@ -61,7 +61,7 @@ async def update_{{ table_name_en }}(pk: Annotated[int, Path(...)], obj: Update{
count = await {{ table_name_en }}_service.update(pk=pk, obj=obj)
if count > 0:
return await response_base.success()
return await response_base.fail()
return response_base.fail()


@router.delete(
Expand All @@ -76,4 +76,4 @@ async def delete_{{ table_name_en }}(pk: Annotated[list[int], Query(...)]) -> Re
count = await {{ table_name_en }}_service.delete(pk=pk)
if count > 0:
return await response_base.success()
return await response_base.fail()
return response_base.fail()
5 changes: 2 additions & 3 deletions backend/templates/py/crud.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CRUD{{ table_name_class }}(CRUDPlus[{{ schema_name }}]):
:param pk:
:return:
"""
return await self.select_model_by_id(db, pk)
return await self.select_model(db, pk)

async def get_all(self, db: AsyncSession) -> Sequence[{{ table_name_class }}]:
"""
Expand Down Expand Up @@ -59,8 +59,7 @@ class CRUD{{ table_name_class }}(CRUDPlus[{{ schema_name }}]):
:param pk:
:return:
"""
{{ table_name_en }}s = await db.execute(delete(self.model).where(self.model.id.in_(pk)))
return {{ table_name_en }}s.rowcount
return await self.delete_model_by_column(db, allow_multiple=True, id__in=pk)


{{ table_name_en }}_dao: CRUD{{ table_name_class }} = CRUD{{ table_name_class }}({{ table_name_class }})