Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 7 additions & 13 deletions template/nest-next/src/permission/dto/remove-permission.dto.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { I18nTranslations } from '@app/shared';
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsNumber } from 'class-validator';
import { IsNotEmpty, IsString } from 'class-validator';
import { i18nValidationMessage } from 'nestjs-i18n';
import type { PermissionId } from '../permission.entry';

Expand All @@ -9,18 +9,12 @@ export class RemovePermissionRequest {
@IsNotEmpty({
message: i18nValidationMessage<I18nTranslations>('validation.NOT_EMPTY'),
})
@IsNumber(
{},
{
message: i18nValidationMessage<I18nTranslations>(
'validation.TYPE_ERROR',
{
type: 'string',
property: 'id',
},
),
},
)
@IsString({
message: i18nValidationMessage<I18nTranslations>('validation.TYPE_ERROR', {
type: 'string',
property: 'id',
}),
})
id: PermissionId;
}

Expand Down
16 changes: 11 additions & 5 deletions template/nest-next/src/permission/permission.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ import {
ApiParam,
ApiQuery,
} from '@nestjs/swagger';
import { RemovePermissionResponse } from './dto/remove-permission.dto';
import type { PermissionId } from './permission.entry';
import {
RemovePermissionRequest,
RemovePermissionResponse,
} from './dto/remove-permission.dto';

@Controller('permission')
export class PermissionController {
Expand All @@ -49,7 +51,7 @@ export class PermissionController {
@ApiOperation({ summary: '分页查询权限' })
@ApiQuery({ name: 'page', description: '页码, 必须是一个正整数' })
@ApiQuery({ name: 'limit', description: '页大小, 必须是一个正整数' })
@ApiQuery({ name: 'name', description: '模糊查找条件' })
@ApiQuery({ name: 'name', description: '模糊查找条件', required: false })
@Get()
findAllPermission(
@Query('page', new DefaultValuePipe('1'), ParseIntPipe) page: number,
Expand All @@ -60,10 +62,14 @@ export class PermissionController {
}

@ApiOperation({ summary: '删除权限字段' })
@ApiParam({ name: 'id', description: '你想删除的权限字段的数据库主键' })
@ApiParam({
name: 'id',
description: '你想删除的权限字段的数据库主键',
type: String,
})
@ApiOkResponse({ type: RemovePermissionResponse })
@Delete(':id')
remove(@Param('id', ParseIntPipe) id: PermissionId) {
remove(@Param() { id }: RemovePermissionRequest) {
return this.permissionService.remove(id);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ export class GetAllPermissionQueryHandler implements IQueryHandler<GetAllPermiss
) {}
async execute(query: GetAllPermissionQuery): Promise<GetPermissionResponse> {
const [items, total] = await this.permissionRepo.findAndCount(
{
name: { $like: `%${query.name}%` },
},
query.name
? {
name: { $like: query.name },
}
: {},
{
offset: (query.page - 1) * query.size,
limit: query.size,
Expand Down