feat: 전화번호 및 학번 검색어 유형 추가 (#92)

khu-khlug · Jan 29, 2025 · b8f1723 · b8f1723
2 parents eee09df + 3941348
commit b8f1723
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/src/app/application/user/query/listUser/ListUserQuery.ts b/src/app/application/user/query/listUser/ListUserQuery.ts
@@ -6,7 +6,9 @@ import { Typeof } from '@khlug/util/types';
 
 export class ListUserQuery implements IQuery {
   readonly email: string | null;
+  readonly phone: string | null;
   readonly name: string | null;
+  readonly number: string | null;
   readonly college: string | null;
   readonly grade: number | null;
   readonly state: UserState | null;
@@ -15,7 +17,9 @@ export class ListUserQuery implements IQuery {
 
   constructor(params: Typeof<ListUserQuery>) {
     this.email = params.email;
+    this.phone = params.phone;
     this.name = params.name;
+    this.number = params.number;
     this.college = params.college;
     this.grade = params.grade;
     this.state = params.state;

diff --git a/src/app/application/user/query/listUser/ListUserQueryHandler.ts b/src/app/application/user/query/listUser/ListUserQueryHandler.ts
@@ -20,18 +20,27 @@ export class ListUserQueryHandler
   ) {}
 
   async execute(query: ListUserQuery): Promise<ListUserQueryResult> {
-    const { email, name, college, grade, state, limit, offset } = query;
+    const { email, phone, name, number, college, grade, state, limit, offset } =
+      query;
 
     const qb = this.userRepository.createQueryBuilder('user');
 
     if (email) {
       qb.andWhere('email LIKE ?', [`%${email}%`]);
     }
 
+    if (phone) {
+      qb.andWhere('phone LIKE ?', [`%${phone}%`]);
+    }
+
     if (name) {
       qb.andWhere('realname LIKE ?', [`%${name}%`]);
     }
 
+    if (number) {
+      qb.andWhere('number LIKE ?', [`%${number}%`]);
+    }
+
     if (college) {
       qb.andWhere('college LIKE ?', [`%${college}%`]);
     }

diff --git a/src/app/domain/user/model/Profile.ts b/src/app/domain/user/model/Profile.ts
@@ -29,6 +29,7 @@ export class Profile {
   @IsInt()
   readonly grade: number;
 
+  // TODO: 현재는 숫자 컬럼인데 문자열 컬럼으로 수정해야 함
   @Property({ type: 'int', name: 'number', nullable: true })
   @IsInt()
   @IsOptional()

diff --git a/src/app/interface/user/manager/UserManageController.ts b/src/app/interface/user/manager/UserManageController.ts
@@ -15,15 +15,17 @@ export class UserManageController {
   constructor(private readonly queryBus: QueryBus) {}
 
   @Get('/manager/users')
-  // @Auth([UserRole.MANAGER])
+  @Auth([UserRole.MANAGER])
   @ApiOperation({ summary: '회원 목록 조회' })
   @ApiResponse({ status: HttpStatus.OK, type: ListUserResponseDto })
   async listUser(
     @Query() dto: ListUserRequestDto,
   ): Promise<ListUserResponseDto> {
     const query = new ListUserQuery({
       email: dto.email,
+      phone: dto.phone,
       name: dto.name,
+      number: dto.number,
       college: dto.college,
       grade: dto.grade,
       state: dto.state,

diff --git a/src/app/interface/user/manager/dto/ListUserRequestDto.ts b/src/app/interface/user/manager/dto/ListUserRequestDto.ts
@@ -5,6 +5,7 @@ import {
   IsOptional,
   IsString,
   Length,
+  Matches,
   Max,
   Min,
 } from 'class-validator';
@@ -17,11 +18,22 @@ export class ListUserRequestDto {
   @Length(1, 255)
   email: string | null = null;
 
+  @IsOptional()
+  @IsString()
+  @Length(1, 20)
+  phone: string | null = null;
+
   @IsOptional()
   @IsString()
   @Length(1, 255)
   name: string | null = null;
 
+  @IsOptional()
+  @IsString()
+  @Length(1, 10)
+  @Matches(/^\d+$/)
+  number: string | null = null;
+
   @IsOptional()
   @IsString()
   @Length(1, 255)