diff --git "a/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\352\265\220\354\210\230_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" "b/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\352\265\220\354\210\230_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" index 4488633..4e63856 100644 Binary files "a/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\352\265\220\354\210\230_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" and "b/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\352\265\220\354\210\230_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" differ diff --git "a/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\355\225\231\354\203\235_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" "b/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\355\225\231\354\203\235_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" index b66fec6..f9defc4 100644 Binary files "a/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\355\225\231\354\203\235_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" and "b/resources/excel/\354\227\260\352\265\254\353\205\274\353\254\270\354\236\221\355\222\210\354\213\234\354\212\244\355\205\234_\355\225\231\354\203\235_\354\235\274\352\264\204\353\223\261\353\241\235_\354\226\221\354\213\235.xlsx" differ diff --git a/src/modules/professors/dtos/professor.dto.ts b/src/modules/professors/dtos/professor.dto.ts index 46df1e5..25544eb 100644 --- a/src/modules/professors/dtos/professor.dto.ts +++ b/src/modules/professors/dtos/professor.dto.ts @@ -22,7 +22,7 @@ export class ProfessorDto { @ApiProperty({ description: "아이디" }) @Type(() => Number) id: number; - @ApiProperty({ description: "내선번호" }) + @ApiProperty({ description: "로그인 아이디" }) @Type(() => String) loginId: string; @ApiProperty({ description: "이름" }) @@ -43,7 +43,7 @@ export class ProfessorDto { converDtoToExcelRecord() { return { - 내선번호: this.loginId, + 로그인아이디: this.loginId, 이름: this.name, 이메일: this.email, 연락처: this.phone, diff --git a/src/modules/professors/dtos/professors-list-query.dto.ts b/src/modules/professors/dtos/professors-list-query.dto.ts index b0aee9a..6941fc9 100644 --- a/src/modules/professors/dtos/professors-list-query.dto.ts +++ b/src/modules/professors/dtos/professors-list-query.dto.ts @@ -5,7 +5,7 @@ import { PageQuery } from "src/common/dtos/pagination.dto"; export class ProfessorListPaginationQuery extends PageQuery { // 다중 상속이 안됨.... - @ApiProperty({ description: "아이디", required: false }) + @ApiProperty({ description: "로그인 아이디", required: false }) @IsOptional() @IsNotEmpty() @Type(() => String) @@ -39,7 +39,7 @@ export class ProfessorListPaginationQuery extends PageQuery { } export class ProfessorListQuery { - @ApiProperty({ description: "아이디", required: false }) + @ApiProperty({ description: "로그인 아이디", required: false }) @IsOptional() @IsNotEmpty() @Type(() => String) diff --git a/src/modules/professors/dtos/upload-professor.dto.ts b/src/modules/professors/dtos/upload-professor.dto.ts index 6982db4..94f2f59 100644 --- a/src/modules/professors/dtos/upload-professor.dto.ts +++ b/src/modules/professors/dtos/upload-professor.dto.ts @@ -5,7 +5,7 @@ import { IsKoreanPhoneNumber } from "src/common/decorators/is-kr-phone-number.de export class UploadProfessorDto { constructor(excelRecord) { - this.loginId = excelRecord["내선번호"].toString(); + this.loginId = excelRecord["로그인아이디"].toString(); this.name = excelRecord["이름"]; this.password = excelRecord["비밀번호"] ? excelRecord["비밀번호"].toString() : undefined; this.email = excelRecord["이메일"] ? excelRecord["이메일"].toString() : undefined; @@ -13,7 +13,7 @@ export class UploadProfessorDto { this.departmentName = excelRecord["학과"]; } - @ApiProperty({ description: "내선번호" }) + @ApiProperty({ description: "로그인 아이디" }) @Type(() => String) loginId: string; diff --git a/src/modules/students/students.service.ts b/src/modules/students/students.service.ts index 7491fe2..062a596 100644 --- a/src/modules/students/students.service.ts +++ b/src/modules/students/students.service.ts @@ -291,7 +291,7 @@ export class StudentsService { } } - // 교수들 내선번호 > Id로 변경 + // 교수들 로그인아이디 > Id로 변경 let advisor1Id: number, advisor2Id: number, committee1Id: number, @@ -299,42 +299,42 @@ export class StudentsService { headReviewerId: number; if (advisor1) { const foundProfessor = await this.prismaService.user.findUnique({ - where: { loginId: advisor1, type: UserType.PROFESSOR, deletedAt: null }, // 내선번호 사용 + where: { loginId: advisor1, type: UserType.PROFESSOR, deletedAt: null }, // 로그인 아이디 사용 }); if (!foundProfessor) - throw new BadRequestException(`${index + 2}행 : 교수 내선번호 ${advisor1}를 확인하십시오.`); + throw new BadRequestException(`${index + 2}행 : 교수 로그인 아이디 ${advisor1}를 확인하십시오.`); advisor1Id = foundProfessor.id; } if (advisor2) { const foundProfessor = await this.prismaService.user.findUnique({ - where: { loginId: advisor2, type: UserType.PROFESSOR, deletedAt: null }, // 내선번호 사용 + where: { loginId: advisor2, type: UserType.PROFESSOR, deletedAt: null }, // 로그인 아이디 사용 }); if (!foundProfessor) - throw new BadRequestException(`${index + 2}행 : 교수 내선번호 ${advisor2}를 확인하십시오.`); + throw new BadRequestException(`${index + 2}행 : 교수 로그인 아이디 ${advisor2}를 확인하십시오.`); advisor2Id = foundProfessor.id; } if (committee1) { const foundProfessor = await this.prismaService.user.findUnique({ - where: { loginId: committee1, type: UserType.PROFESSOR, deletedAt: null }, // 내선번호 사용 + where: { loginId: committee1, type: UserType.PROFESSOR, deletedAt: null }, // 로그인 아이디 사용 }); if (!foundProfessor) - throw new BadRequestException(`${index + 2}행 : 교수 내선번호 ${committee1}를 확인하십시오.`); + throw new BadRequestException(`${index + 2}행 : 교수 로그인 아이디 ${committee1}를 확인하십시오.`); committee1Id = foundProfessor.id; } if (committee2) { const foundProfessor = await this.prismaService.user.findUnique({ - where: { loginId: committee2, type: UserType.PROFESSOR, deletedAt: null }, // 내선번호 사용 + where: { loginId: committee2, type: UserType.PROFESSOR, deletedAt: null }, // 로그인 아이디 사용 }); if (!foundProfessor) - throw new BadRequestException(`${index + 2}행 : 교수 내선번호 ${committee2}를 확인하십시오.`); + throw new BadRequestException(`${index + 2}행 : 교수 로그인 아이디 ${committee2}를 확인하십시오.`); committee2Id = foundProfessor.id; } if (headReviewer) { const foundProfessor = await this.prismaService.user.findUnique({ - where: { loginId: headReviewer, type: UserType.PROFESSOR, deletedAt: null }, // 내선번호 사용 + where: { loginId: headReviewer, type: UserType.PROFESSOR, deletedAt: null }, // 로그인 아이디 사용 }); if (!foundProfessor) - throw new BadRequestException(`${index + 2}행 : 교수 내선번호 ${headReviewer}를 확인하십시오.`); + throw new BadRequestException(`${index + 2}행 : 교수 로그인 아이디 ${headReviewer}를 확인하십시오.`); headReviewerId = foundProfessor.id; }