diff --git a/apps/api/src/member/dto/attendance-response.dto.ts b/apps/api/src/member/dto/attendance-response.dto.ts index 5fc43740..0d97a8b1 100644 --- a/apps/api/src/member/dto/attendance-response.dto.ts +++ b/apps/api/src/member/dto/attendance-response.dto.ts @@ -14,14 +14,15 @@ class AttendanceInfo { export class AttendanceResponseDto { @ApiProperty() - id: number; + memberId: number; @ApiProperty({ type: AttendanceInfo, isArray: true }) attendances: AttendanceInfo[]; static of(memberId: number, attendances: Attendance[]): AttendanceResponseDto { return { - id: memberId, + memberId: memberId, attendances: attendances.map(attendance => ({ + attendanceId: attendance.id, date: this.formatDate(attendance.startTime), startTime: this.formatTime(attendance.startTime), endTime: this.formatTime(attendance.endTime), diff --git a/docker-compose.yml b/docker-compose.yml index 1a2388ba..f2bba439 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,8 @@ services: - DB_USERNAME=${DB_USERNAME} - DB_PASSWORD=${DB_PASSWORD} - DB_NAME=${DB_NAME} + env_file: + - .env media: container_name: media-camon