Merge pull request #57 from Jinacker/feat/ALBA_56

Jinacker · web-flow · commit 04c21be38e13 · 2026-02-12T20:17:02.000+09:00
[FIX] (홈화면) 빠른 알바 일정 추가 후 홈 오늘 근무 리스트 미노출 문제 해결
diff --git a/src/repository/schedule_repository.ts b/src/repository/schedule_repository.ts
@@ -32,6 +32,57 @@ class ScheduleRepository {
     });
   }
 
+  /**
+   * 일정 생성 + work_log 동시 생성 (트랜잭션)
+   * 홈 리스트에 노출되도록 user_work_log도 함께 생성
+   */
+  async createScheduleWithWorkLog(
+    scheduleData: {
+      user_id: Uint8Array;
+      workplace: string;
+      work_date: string;
+      work_time: string;
+      hourly_wage: number;
+      memo?: string;
+    },
+    workLogData: {
+      workDate: Date;
+      startTime: Date | null;
+      endTime: Date | null;
+      workMinutes: number | null;
+    },
+  ) {
+    return await prisma.$transaction(async (tx) => {
+      // 1. 일정 생성
+      const schedule = await tx.user_alba_schedule.create({
+        data: {
+          user_id: scheduleData.user_id as Uint8Array<ArrayBuffer>,
+          workplace: scheduleData.workplace,
+          work_date: scheduleData.work_date,
+          work_time: scheduleData.work_time,
+          hourly_wage: scheduleData.hourly_wage,
+          memo: scheduleData.memo || null,
+          repeat_type: 'none',
+        },
+      });
+
+      // 2. work_log 생성 (schedule_id 연결)
+      await tx.user_work_log.create({
+        data: {
+          user_id: scheduleData.user_id as Uint8Array<ArrayBuffer>,
+          user_alba_schedule_id: schedule.user_alba_schedule_id,
+          work_date: workLogData.workDate,
+          start_time: workLogData.startTime,
+          end_time: workLogData.endTime,
+          work_minutes: workLogData.workMinutes,
+          status: 'scheduled',
+        },
+      });
+
+      return schedule;
+    });
+  }
+
   /**
    * 일정 ID로 일정 조회
    * @param scheduleId - 일정 ID (Binary UUID)
diff --git a/src/repository/user_alba_schedule_repository.ts b/src/repository/user_alba_schedule_repository.ts
@@ -44,6 +44,53 @@ export class UserAlbaScheduleRepository {
     return created.user_alba_schedule_id;
   }
 
+  /**
+   * 스케줄 생성 + work_log 동시 생성 (트랜잭션)
+   * 수동 일정 생성 시 홈 리스트에 노출되도록 user_work_log도 함께 생성
+   */
+  public async createWithWorkLog(
+    userId: string,
+    input: CreateUserAlbaScheduleRepoInput,
+    workLogData: { workDate: Date; startTime: Date | null; endTime: Date | null; workMinutes: number | null },
+  ): Promise<Uint8Array> {
+    const userIdBin = uuidToBin(userId);
+
+    const schedule = await prisma.$transaction(async (tx) => {
+      // 1. 일정 생성
+      const created = await tx.user_alba_schedule.create({
+        data: {
+          user_id: userIdBin,
+          workplace: input.workplace ?? null,
+          work_date: input.work_date ?? null,
+          work_time: input.work_time ?? null,
+          day_of_week: input.day_of_week ?? null,
+          repeat_type: input.repeat_type ?? null,
+          repeat_days: input.repeat_days ?? null,
+          hourly_wage: input.hourly_wage ?? null,
+          memo: input.memo ?? null,
+        },
+        select: { user_alba_schedule_id: true },
+      });
+
+      // 2. work_log 생성 (schedule_id 연결)
+      await tx.user_work_log.create({
+        data: {
+          user_id: userIdBin,
+          user_alba_schedule_id: created.user_alba_schedule_id,
+          work_date: workLogData.workDate,
+          start_time: workLogData.startTime,
+          end_time: workLogData.endTime,
+          work_minutes: workLogData.workMinutes,
+          status: 'scheduled',
+        },
+      });
+
+      return created;
+    });
+
+    return schedule.user_alba_schedule_id;
+  }
+
   public async updateByIdAndUserId(
     userId: string,
     scheduleId: string,
diff --git a/src/repository/work_log_repository.ts b/src/repository/work_log_repository.ts
@@ -102,7 +102,8 @@ class WorkLogRepository {
     {
       user_work_log_id: Uint8Array;
       user_id: Uint8Array;
-      alba_id: Uint8Array;
+      alba_id: Uint8Array | null;
+      user_alba_schedule_id: Uint8Array | null;
       work_date: Date | null;
       start_time: Date | null;
       end_time: Date | null;
@@ -113,7 +114,7 @@ class WorkLogRepository {
         store: {
           store_name: string | null;
         };
-      };
+      } | null;
     }[]
   > {
     // 날짜 범위 설정 (해당 날짜의 00:00:00 ~ 23:59:59)
diff --git a/src/service/schedule_service.ts b/src/service/schedule_service.ts
@@ -26,17 +26,22 @@ class ScheduleService {
       data.hourlyWage,
     );
 
-    // 3. 데이터베이스에 일정 저장
-    const schedule = await ScheduleRepository.createSchedule({
+    // 3. work_log용 시간 데이터 파싱
+    const workLogData = this.parseWorkLogData(data.workDate, data.startTime, data.endTime);
+
+    // 4. 데이터베이스에 일정 + work_log 저장 (트랜잭션)
+    const scheduleData = {
       user_id: userId,
       workplace: data.workplace,
       work_date: data.workDate,
       work_time: workTime,
       hourly_wage: data.hourlyWage,
       memo: data.memo,
-    });
+    };
 
-    // 4. DTO 형식으로 반환
+    const schedule = await ScheduleRepository.createScheduleWithWorkLog(scheduleData, workLogData);
+
+    // 5. DTO 형식으로 반환
     return {
       scheduleId: this.bufferToUuid(schedule.user_alba_schedule_id),
       workplace: schedule.workplace || '',
@@ -48,6 +53,33 @@ class ScheduleService {
     };
   }
 
+  /**
+   * 일정 데이터를 work_log용 Date 객체로 변환
+   */
+  private parseWorkLogData(
+    workDate: string,
+    startTime: string,
+    endTime: string,
+  ): { workDate: Date; startTime: Date | null; endTime: Date | null; workMinutes: number | null } {
+    // KST(+09:00) 오프셋을 명시하여 Prisma UTC 변환 시 날짜가 밀리지 않도록 처리
+    const date = new Date(workDate + 'T00:00:00+09:00');
+
+    const [sh, sm] = startTime.split(':').map(Number);
+    const start = new Date(workDate + `T${String(sh).padStart(2, '0')}:${String(sm).padStart(2, '0')}:00+09:00`);
+
+    const [eh, em] = endTime.split(':').map(Number);
+    const end = new Date(workDate + `T${String(eh).padStart(2, '0')}:${String(em).padStart(2, '0')}:00+09:00`);
+
+    // 야간 근무 (종료 시간이 시작 시간보다 이전)
+    if (end <= start) {
+      end.setDate(end.getDate() + 1);
+    }
+
+    const workMinutes = Math.round((end.getTime() - start.getTime()) / 60000);
+
+    return { workDate: date, startTime: start, endTime: end, workMinutes };
+  }
+
   /**
    * 예상 금액 계산
    * 시작 시간과 종료 시간을 기반으로 근무 시간을 계산하고 시급을 곱함
diff --git a/src/service/user_alba_schedule_service.ts b/src/service/user_alba_schedule_service.ts
@@ -45,14 +45,50 @@ function validateManual(body: CreateManualScheduleBody) {
   }
 }
 
+/**
+ * work_time("09:00-18:00")과 work_date("2026-02-10")를 파싱하여
+ * user_work_log에 필요한 Date 객체를 생성
+ */
+function parseScheduleToWorkLogData(workDate?: string, workTime?: string) {
+  if (!workDate) return null;
+
+  // KST(+09:00) 오프셋을 명시하여 Prisma UTC 변환 시 날짜가 밀리지 않도록 처리
+  const date = new Date(workDate + 'T00:00:00+09:00');
+
+  let startTime: Date | null = null;
+  let endTime: Date | null = null;
+  let workMinutes: number | null = null;
+
+  if (workTime) {
+    const [startStr, endStr] = workTime.split('-');
+    if (startStr) {
+      const [sh, sm] = startStr.split(':').map(Number);
+      startTime = new Date(workDate + `T${String(sh).padStart(2, '0')}:${String(sm).padStart(2, '0')}:00+09:00`);
+    }
+    if (endStr) {
+      const [eh, em] = endStr.split(':').map(Number);
+      endTime = new Date(workDate + `T${String(eh).padStart(2, '0')}:${String(em).padStart(2, '0')}:00+09:00`);
+      // 야간 근무 (종료 시간이 시작 시간보다 이전)
+      if (endTime <= startTime!) {
+        endTime.setDate(endTime.getDate() + 1);
+      }
+    }
+    if (startTime && endTime) {
+      workMinutes = Math.round((endTime.getTime() - startTime.getTime()) / 60000);
+    }
+  }
+
+  return { workDate: date, startTime, endTime, workMinutes };
+}
+
 // 유저 수동 입력 스케줄 생성
 export async function createManual(
   userId: string,
   body: CreateManualScheduleBody,
 ): Promise<string> {
   validateManual(body);
 
-  const idBin = await scheduleRepo.create(userId, {
+  const scheduleInput = {
     workplace: body.workplace,
     work_date: body.work_date,
     work_time: body.work_time,
@@ -61,7 +97,17 @@ export async function createManual(
     repeat_days: body.repeat_days,
     hourly_wage: body.hourly_wage,
     memo: body.memo,
-  });
+  };
+
+  // work_date가 있으면 work_log도 함께 생성 (홈 리스트 노출용)
+  const workLogData = parseScheduleToWorkLogData(body.work_date, body.work_time);
+
+  let idBin: Uint8Array;
+  if (workLogData) {
+    idBin = await scheduleRepo.createWithWorkLog(userId, scheduleInput, workLogData);
+  } else {
+    idBin = await scheduleRepo.create(userId, scheduleInput);
+  }
 
   return binToUuid(idBin);
 }
diff --git a/src/service/work_log_service.ts b/src/service/work_log_service.ts
@@ -1,4 +1,5 @@
 import WorkLogRepository from '../repository/work_log_repository';
+import prisma from '../config/prisma';
 import {
   TodayScheduleResponseDto,
   TodayWorkListResponseDto,
@@ -35,6 +36,22 @@ class WorkLogService {
     // Repository에서 오늘 날짜의 work_log 가져오기
     const workLogs = await WorkLogRepository.findWorkLogsByDate(userId, today);
 
+    // alba_posting이 없는 work_log의 schedule 정보를 일괄 조회
+    const scheduleIds = workLogs
+      .filter((log) => !log.alba_posting && log.user_alba_schedule_id)
+      .map((log) => log.user_alba_schedule_id as Uint8Array<ArrayBuffer>);
+
+    const scheduleMap = new Map<string, { workplace: string | null; hourly_wage: number | null }>();
+    if (scheduleIds.length > 0) {
+      const schedules = await prisma.user_alba_schedule.findMany({
+        where: { user_alba_schedule_id: { in: scheduleIds } },
+        select: { user_alba_schedule_id: true, workplace: true, hourly_wage: true },
+      });
+      for (const s of schedules) {
+        scheduleMap.set(Buffer.from(s.user_alba_schedule_id).toString('hex'), s);
+      }
+    }
+
     // DTO 형식으로 변환
     const scheduleDtos: TodayScheduleResponseDto[] = workLogs.map((log) => {
       const { startTime, endTime, workHours } = this.parseWorkLogTime(
@@ -43,15 +60,30 @@ class WorkLogService {
         log.work_minutes,
       );
 
-      const hourlyWage = log.alba_posting.hourly_rate || 0;
+      // alba_posting이 있으면 사용, 없으면 schedule에서 fallback
+      let workplace = '';
+      let hourlyWage = 0;
+
+      if (log.alba_posting) {
+        workplace = log.alba_posting.store.store_name || '';
+        hourlyWage = log.alba_posting.hourly_rate || 0;
+      } else if (log.user_alba_schedule_id) {
+        const key = Buffer.from(log.user_alba_schedule_id).toString('hex');
+        const schedule = scheduleMap.get(key);
+        if (schedule) {
+          workplace = schedule.workplace || '';
+          hourlyWage = schedule.hourly_wage || 0;
+        }
+      }
+
       const totalWage = Math.round(hourlyWage * workHours);
       const status = log.status || 'scheduled';
 
       return {
         workLogId: bufferToUuid(log.user_work_log_id),
         status,
         statusLabel: STATUS_LABELS[status] || '알 수 없음',
-        workplace: log.alba_posting.store.store_name || '',
+        workplace,
         startTime,
         endTime,
         workHours,
