일정 기반 정산 상태 리스트 조회 시 표기 오류 수정

Author: s0-yeon

src/controller/user_alba_schedule_controller.ts

@@ -12,7 +12,7 @@ import {
   Security,
   Query,
   Path,
-  Get
+  Get,
 } from 'tsoa';
 import { Request as ExpressRequest } from 'express';
 import { TsoaSuccessResponse, TsoaFailResponse } from '../config/response_interface';
@@ -26,22 +26,10 @@ export interface CreateScheduleSuccess {
   user_alba_schedule_id: string;
 }
 
-// export interface UpdateScheduleSuccess {
-//   resultType: 'SUCCESS';
-//   SuccessMessage: '유저 알바 스케줄 수정 성공';
-//   user_alba_schedule_id: string;
-// }
-
-// export interface DeleteScheduleSuccess {
-
-//   user_alba_schedule_id: string;
-// }
-
 @Route('user/alba/schedule')
 @Tags('User Alba Schedule')
 export class UserAlbaScheduleController extends Controller {
-
-   /**
+  /**
    * 내 유저 알바 스케줄 목록 조회 (커서/사이즈 없음)
    * 예) /user/alba/schedule?month=2026-02
    */
@@ -69,50 +57,15 @@ export class UserAlbaScheduleController extends Controller {
   ): Promise<TsoaSuccessResponse<any>> {
     const userUuid = (req as any).user?.id as string;
 
-    console.log("token userId =", userUuid);
-    console.log("month =", month);
+    console.log('token userId =', userUuid);
+    console.log('month =', month);
 
     const data = await userAlbaScheduleService.listMySchedules(userUuid, { month });
 
     this.setStatus(200);
     return new TsoaSuccessResponse(data);
   }
 
-  /**
-   * 내 유저 알바 스케줄 단건 조회(상세)
-   */
-  // @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);
-
-  //   this.setStatus(200);
-  //  // return new TsoaSuccessResponse(schedule);
-  // }
-
-
-
   /*
    * 유저 알바 스케줄 등록 API
    * @param request - Express 요청 객체
@@ -156,9 +109,9 @@ export class UserAlbaScheduleController extends Controller {
     void body;
 
     this.setStatus(201);
-  return new TsoaSuccessResponse({
-    user_alba_schedule_id: id,
-  });
+    return new TsoaSuccessResponse({
+      user_alba_schedule_id: id,
+    });
   }
 
   ////// // 유저 알바 정보 기반 //////

src/repository/settlement_status_list_repository.ts

@@ -77,17 +77,25 @@ export class SettlementStatusListRepository {
             },
           },
         },
+        // ✅ 추가: "유저 알바 일정"에서 채울 정보
+        user_alba_schedule: {
+          select: {
+            workplace_name: true,
+            hourly_wage: true,
+          },
+        },
       },
     });
 
     const hasNext = logs.length > take;
     const pageLogs = hasNext ? logs.slice(0, take) : logs;
 
     const items = pageLogs.map((log) => {
-      const storeName = log.alba_posting?.store?.store_name ?? '';
+      const storeName =
+        log.alba_posting?.store?.store_name ?? log.user_alba_schedule?.workplace_name ?? '';
       const workMinutes = log.work_minutes ?? 0;
 
-      const hourlyRate = log.alba_posting?.hourly_rate ?? 0;
+      const hourlyRate = log.alba_posting?.hourly_rate ?? log.user_alba_schedule?.hourly_wage ?? 0;
       // work_minutes*hourly_rate/60
       const expectedIncome = Math.floor((hourlyRate * workMinutes) / 60);
 

src/service/user_alba_schedule_service.ts

@@ -16,7 +16,6 @@ type RepeatBody = Pick<CreateManualScheduleBody, 'repeat_type' | 'repeat_days'>;
 
 const YM = /^\d{4}-(0[1-9]|1[0-2])$/;
 
-
 function toDateString(d: Date): string {
   // DB Date -> "YYYY-MM-DD"
   const y = d.getFullYear();
@@ -165,26 +164,6 @@ export async function listMySchedules(userId: string, q: { month?: string }) {
   return { schedules };
 }
 
-/** 단건 조회 */
-// 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(
   userId: string,