feat(work_log): 알바 일정에 주소 및 카테고리 추가 가능

Author: codie0226

prisma/schema.prisma

@@ -165,7 +165,10 @@ model user_alba_schedule {
   repeat_days           String?                         @db.VarChar(10)
   hourly_wage           Int?
   memo                  String?                         @db.VarChar(256)
+  address               String?                         @db.Text
+  category              String?                         @db.Text
   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[]
 
   @@index([user_id], map: "FK_user_TO_alba_schedule")
 }
@@ -183,9 +186,11 @@ model user_work_log {
   income_log            income_log[]
   alba_posting          alba_posting?         @relation(fields: [alba_id], references: [alba_id], onDelete: Cascade, onUpdate: NoAction, map: "FK_posting_TO_work_log")
   user                  user                  @relation(fields: [user_id], references: [user_id], onDelete: Cascade, onUpdate: NoAction, map: "FK_user_TO_work_log")
+  user_alba_schedule    user_alba_schedule?   @relation(fields: [user_alba_schedule_id], references: [user_alba_schedule_id], onDelete: NoAction, onUpdate: NoAction, map: "user_work_log_user_alba_schedule_user_alba_schedule_id_fk")
 
   @@index([alba_id], map: "FK_posting_TO_work_log")
   @@index([user_id], map: "FK_user_TO_work_log")
+  @@index([user_alba_schedule_id], map: "user_work_log_user_alba_schedule_user_alba_schedule_id_fk")
 }
 
 model work_schedule {

src/DTO/schedule_dto.ts

@@ -25,6 +25,16 @@ export interface CreateScheduleRequestDto {
 
   /** 메모 (선택사항) */
   memo?: string;
+
+  /**
+   * 프론트측 요청으로 인한 근무지 및 카테고리 추가
+   * 카카오 API 정보 입력용
+   */
+  /**근무지 주소 (선택사항) */
+  address?: string;
+
+  /**근무 카테고리 (선택사항) */
+  category?: string;
 }
 
 /**
@@ -51,4 +61,7 @@ export interface ScheduleResponseDto {
 
   /** 메모 */
   memo: string;
+
+  address: string;
+  category: string;
 }

src/DTO/work_log_dto.ts

@@ -11,6 +11,8 @@ export interface TodayScheduleResponseDto {
   workHours: number; // 4
   hourlyWage: number; // 11000
   totalWage: number; // 44000
+  address: string;
+  category: string;
 }
 
 /**

src/repository/schedule_repository.ts

@@ -44,6 +44,8 @@ class ScheduleRepository {
       work_time: string;
       hourly_wage: number;
       memo?: string;
+      address?: string;
+      category?: string;
     },
     workLogData: {
       workDate: Date;
@@ -62,6 +64,8 @@ class ScheduleRepository {
           work_time: scheduleData.work_time,
           hourly_wage: scheduleData.hourly_wage,
           memo: scheduleData.memo || null,
+          address: scheduleData.address || null,
+          category: scheduleData.category || null,
           repeat_type: 'none',
         },
       });

src/repository/work_log_repository.ts

@@ -115,6 +115,10 @@ class WorkLogRepository {
           store_name: string | null;
         };
       } | null;
+      user_alba_schedule: {
+        address: string | null;
+        category: string | null;
+      } | null;
     }[]
   > {
     // KST 기준 오늘 날짜를 YYYY-MM-DD로 구한 뒤 UTC midnight 범위로 설정
@@ -142,6 +146,12 @@ class WorkLogRepository {
             },
           },
         },
+        user_alba_schedule: {
+          select: {
+            address: true,
+            category: true,
+          },
+        },
       },
     });
   }

src/service/schedule_service.ts

@@ -37,6 +37,8 @@ class ScheduleService {
       work_time: workTime,
       hourly_wage: data.hourlyWage,
       memo: data.memo,
+      address: data.address,
+      category: data.category,
     };
 
     const schedule = await ScheduleRepository.createScheduleWithWorkLog(scheduleData, workLogData);
@@ -50,6 +52,8 @@ class ScheduleService {
       hourlyWage: schedule.hourly_wage || 0,
       estimatedWage: estimatedWage,
       memo: schedule.memo || '',
+      address: schedule.address || '',
+      category: schedule.category || '',
     };
   }
 
@@ -65,10 +69,14 @@ class ScheduleService {
     const date = new Date(workDate + 'T00:00:00Z');
 
     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 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`);
+    const end = new Date(
+      workDate + `T${String(eh).padStart(2, '0')}:${String(em).padStart(2, '0')}:00+09:00`,
+    );
 
     // 야간 근무 (종료 시간이 시작 시간보다 이전)
     if (end <= start) {
@@ -88,11 +96,7 @@ class ScheduleService {
    * @param hourlyWage - 시급
    * @returns 예상 금액
    */
-  private calculateEstimatedWage(
-    startTime: string,
-    endTime: string,
-    hourlyWage: number,
-  ): number {
+  private calculateEstimatedWage(startTime: string, endTime: string, hourlyWage: number): number {
     // 시간 파싱 (HH:MM 형식)
     const [startHour, startMin] = startTime.split(':').map(Number);
     const [endHour, endMin] = endTime.split(':').map(Number);

src/service/work_log_service.ts

@@ -76,6 +76,14 @@ class WorkLogService {
         }
       }
 
+      let address = '';
+      let category = '';
+
+      if (log.user_alba_schedule) {
+        address = log.user_alba_schedule.address || '';
+        category = log.user_alba_schedule.category || '';
+      }
+
       const totalWage = Math.round(hourlyWage * workHours);
       const status = log.status || 'scheduled';
 
@@ -89,6 +97,8 @@ class WorkLogService {
         workHours,
         hourlyWage,
         totalWage,
+        address,
+        category,
       };
     });