refactor:근무지명, 색갈 유저 알바스케줄에 추가

Author: s0-yeon

prisma/schema.prisma

@@ -167,6 +167,8 @@ model user_alba_schedule {
   memo                  String?                         @db.VarChar(256)
   address               String?                         @db.Text
   category              String?                         @db.Text
+  workplace_name        String?                         @db.VarChar(100)
+  workplace_color       String?                         @db.VarChar(7)
   user                  user                            @relation(fields: [user_id], references: [user_id], onDelete: Cascade, onUpdate: NoAction, map: "FK_user_TO_alba_schedule")
   user_work_log         user_work_log[]
 

src/DTO/user_alba_schedule_dto.ts

@@ -5,6 +5,8 @@ export interface CreateManualScheduleBody {
   workplace?: string;
   work_date?: string;
   work_time?: string;
+  workplace_name?: string;
+  workplace_color?: string;
   day_of_week?: user_alba_schedule_day_of_week; // 실제 enum 타입으로 바꿔도 됨
   repeat_type?: user_alba_schedule_repeat_type; // 실제 enum 타입으로 바꿔도 됨
   repeat_days?: string | null;
@@ -16,6 +18,8 @@ export interface UserAlbaScheduleItemDTO {
   workplace?: string;
   work_date?: string;
   work_time?: string;
+  workplace_name?: string;
+  workplace_color?: string;
   day_of_week?: user_alba_schedule_day_of_week; // 실제 enum 타입으로 바꿔도 됨
   repeat_type?: user_alba_schedule_repeat_type; // 실제 enum 타입으로 바꿔도 됨
   repeat_days?: string | null;
@@ -27,6 +31,8 @@ export interface UpdateManualScheduleBody {
   workplace?: string;
   work_date?: string;
   work_time?: string;
+  workplace_name?: string;
+  workplace_color?: string;
   day_of_week?: user_alba_schedule_day_of_week; // 실제 enum 타입으로 바꿔도 됨
   repeat_type?: user_alba_schedule_repeat_type; // 실제 enum 타입으로 바꿔도 됨
   repeat_days?: string | null;

src/controller/user_alba_schedule_controller.ts

@@ -81,35 +81,35 @@ export class UserAlbaScheduleController extends Controller {
   /**
    * 내 유저 알바 스케줄 단건 조회(상세)
    */
-  @Security('jwt')
-  @Get('{userAlbaScheduleId}')
-  @SuccessResponse(200, '유저 알바 스케줄 단건 조회 성공')
-  @Response<TsoaFailResponse<any>>(401, 'Unauthorized', {
-    resultType: 'FAIL' as any,
-    error: { errorCode: 'EC401', errorMessage: '인증이 필요합니다.', data: null },
-    success: null,
-  })
-  @Response<TsoaFailResponse<any>>(404, 'Not Found', {
-    resultType: 'FAIL' as any,
-    error: { errorCode: 'EC404', errorMessage: '스케줄을 찾을 수 없습니다.', data: null },
-    success: null,
-  })
-  @Response<TsoaFailResponse<any>>(500, 'Internal Server Error', {
-    resultType: 'FAIL' as any,
-    error: { errorCode: 'EC500', errorMessage: '서버 오류가 발생했습니다.', data: null },
-    success: null,
-  })
-  public async getMySchedule(
-    @Request() req: ExpressRequest,
-    @Path() userAlbaScheduleId: string,
-  ): Promise<TsoaSuccessResponse<any>> {
-    const userUuid = (req as any).user?.id as string;
+  // @Security('jwt')
+  // @Get('{userAlbaScheduleId}')
+  // @SuccessResponse(200, '유저 알바 스케줄 단건 조회 성공')
+  // @Response<TsoaFailResponse<any>>(401, 'Unauthorized', {
+  //   resultType: 'FAIL' as any,
+  //   error: { errorCode: 'EC401', errorMessage: '인증이 필요합니다.', data: null },
+  //   success: null,
+  // })
+  // @Response<TsoaFailResponse<any>>(404, 'Not Found', {
+  //   resultType: 'FAIL' as any,
+  //   error: { errorCode: 'EC404', errorMessage: '스케줄을 찾을 수 없습니다.', data: null },
+  //   success: null,
+  // })
+  // @Response<TsoaFailResponse<any>>(500, 'Internal Server Error', {
+  //   resultType: 'FAIL' as any,
+  //   error: { errorCode: 'EC500', errorMessage: '서버 오류가 발생했습니다.', data: null },
+  //   success: null,
+  // })
+  // public async getMySchedule(
+  //   @Request() req: ExpressRequest,
+  //   @Path() userAlbaScheduleId: string,
+  // ): Promise<TsoaSuccessResponse<any>> {
+  //   const userUuid = (req as any).user?.id as string;
 
-    const schedule = await userAlbaScheduleService.getMyScheduleById(userUuid, userAlbaScheduleId);
+  //   //const schedule = await userAlbaScheduleService.getMyScheduleById(userUuid, userAlbaScheduleId);
 
-    this.setStatus(200);
-    return new TsoaSuccessResponse(schedule);
-  }
+  //   this.setStatus(200);
+  //  // return new TsoaSuccessResponse(schedule);
+  // }
 
 
 

src/repository/user_alba_schedule_repository.ts

@@ -9,6 +9,8 @@ export interface CreateUserAlbaScheduleRepoInput {
   workplace?: string;
   work_date?: string;
   work_time?: string;
+  workplace_name?: string;
+  workplace_color?: string;
 
   day_of_week?: user_alba_schedule_day_of_week;
   repeat_type?: user_alba_schedule_repeat_type;
@@ -52,6 +54,8 @@ export class UserAlbaScheduleRepository {
       select: {
         user_alba_schedule_id: true,
         workplace: true,
+        workplace_name: true,
+        workplace_color: true,
         work_date: true,
         work_time: true,
         day_of_week: true,
@@ -68,6 +72,8 @@ export class UserAlbaScheduleRepository {
         user_id: uuidToBin(userId),
 
         workplace: input.workplace ?? null,
+        workplace_name: input.workplace_name ?? null, 
+        workplace_color: input.workplace_color ?? null,
         work_date: input.work_date ?? null,
         work_time: input.work_time ?? null,
 
@@ -109,6 +115,8 @@ export class UserAlbaScheduleRepository {
         data: {
           user_id: userIdBin,
           workplace: input.workplace ?? null,
+          workplace_name: input.workplace_name ?? null,
+          workplace_color: input.workplace_color ?? null,
           work_date: input.work_date ?? null,
           work_time: input.work_time ?? null,
           day_of_week: input.day_of_week ?? null,
@@ -169,6 +177,8 @@ export class UserAlbaScheduleRepository {
       data: {
         workplace: body.workplace,
         work_date: body.work_date,
+        workplace_name: body.workplace_name, // ✅ [CHANGED]
+        workplace_color: body.workplace_color,
         work_time: body.work_time,
 
         day_of_week: body.day_of_week,

src/service/user_alba_schedule_service.ts

@@ -151,6 +151,8 @@ export async function listMySchedules(userId: string, q: { month?: string }) {
   const schedules = rows.map((s: any) => ({
     user_alba_schedule_id: binToUuid(s.user_alba_schedule_id),
     workplace: s.workplace ?? null,
+    workplace_name: s.workplace_name ?? null,
+    workplace_color: s.workplace_color ?? null,
     work_date: s.work_date ?? null,
     work_time: s.work_time ?? null,
     day_of_week: s.day_of_week ?? null,
@@ -164,22 +166,24 @@ export async function listMySchedules(userId: string, q: { month?: string }) {
 }
 
 /** 단건 조회 */
-export async function getMyScheduleById(userId: string, scheduleId: string) {
-  const s = await scheduleRepo.findDetailByIdAndUserId(userId, scheduleId);
-  if (!s) throw new CustomError('EC404', 404, '스케줄을 찾을 수 없습니다.', null);
-
-  return {
-    user_alba_schedule_id: binToUuid(s.user_alba_schedule_id as unknown as Uint8Array),
-    workplace: s.workplace ?? null,
-    work_date: s.work_date ?? null,
-    work_time: s.work_time ?? null,
-    day_of_week: s.day_of_week ?? null,
-    repeat_type: s.repeat_type ?? null,
-    repeat_days: s.repeat_days ?? null,
-    hourly_wage: s.hourly_wage ?? null,
-    memo: s.memo ?? null,
-  };
-}
+// export async function getMyScheduleById(userId: string, scheduleId: string) {
+//   const s = await scheduleRepo.findDetailByIdAndUserId(userId, scheduleId);
+//   if (!s) throw new CustomError('EC404', 404, '스케줄을 찾을 수 없습니다.', null);
+
+//   return {
+//     user_alba_schedule_id: binToUuid(s.user_alba_schedule_id as unknown as Uint8Array),
+//     workplace: s.workplace ?? null,
+//     work_date: s.work_date ?? null,
+//     work_time: s.work_time ?? null,
+//     workplace_name: s.workplace_name ?? null,
+//     workplace_color: s.workplace_color ?? null,
+//     day_of_week: s.day_of_week ?? null,
+//     repeat_type: s.repeat_type ?? null,
+//     repeat_days: s.repeat_days ?? null,
+//     hourly_wage: s.hourly_wage ?? null,
+//     memo: s.memo ?? null,
+//   };
+// }
 
 // 유저 수동 입력 스케줄 생성
 export async function createManual(
@@ -190,6 +194,8 @@ export async function createManual(
 
   const scheduleInput = {
     workplace: body.workplace,
+    workplace_name: body.workplace_name,
+    workplace_color: body.workplace_color,
     work_date: body.work_date,
     work_time: body.work_time,
     day_of_week: body.day_of_week,