From 476e8d06a86ca7be8f96afd4fd7018babd54bb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=95=B4=EC=B0=AC=5BVertical=20Service=20Dev1=5D?=
 <cksgodl1@naver.com>
Date: Sun, 26 Nov 2023 01:53:27 +0900
Subject: [PATCH] =?UTF-8?q?Feat=20:=20Date=EC=A0=95=EB=B3=B4=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/convertor/AttendanceConvertor.kt      | 12 +++++++-----
 .../example/cmc_be/attendance/dto/AttendanceRes.kt   |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/example/cmc_be/attendance/convertor/AttendanceConvertor.kt b/src/main/kotlin/com/example/cmc_be/attendance/convertor/AttendanceConvertor.kt
index 48bbd64..31fbbb8 100644
--- a/src/main/kotlin/com/example/cmc_be/attendance/convertor/AttendanceConvertor.kt
+++ b/src/main/kotlin/com/example/cmc_be/attendance/convertor/AttendanceConvertor.kt
@@ -34,6 +34,7 @@ class AttendanceConverter {
                 firstHour = firstHour,
                 secondHour = secondHour,
                 isOffline = generationWeekInfo.isOffline,
+                date = generationWeekInfo.date,
                 enable = currentDate.isAfter(generationWeekInfo.date.minusDays(1L))
             )
         }
@@ -54,9 +55,9 @@ class AttendanceConverter {
         allGeneration: List<GenerationWeeksInfo>
     ) = allUsers.map { user ->
         val userAttandances = allAttendances.filter { it.user.id == user.id }
-        val attendances = allGeneration.map { generationInfo ->
+        val attendances = allGeneration.map { generationWeekInfo ->
             val userAllAttendanceData =
-                userAttandances.filter { it.generationWeeksInfo.week == generationInfo.week }
+                userAttandances.filter { it.generationWeeksInfo.week == generationWeekInfo.week }
             val firstHour =
                 (userAllAttendanceData.find { it.attendanceHour == AttendanceHour.FIRST_HOUR })?.attendanceCategory
                     ?: AttendanceCategory.ABSENT
@@ -64,11 +65,12 @@ class AttendanceConverter {
                 (userAllAttendanceData.find { it.attendanceHour == AttendanceHour.SECOND_HOUR })?.attendanceCategory
                     ?: AttendanceCategory.ABSENT
             AttendanceRes.AttendanceInfoDto(
-                week = generationInfo.week,
+                week = generationWeekInfo.week,
                 firstHour = firstHour,
                 secondHour = secondHour,
-                isOffline = generationInfo.isOffline,
-                enable = true
+                isOffline = generationWeekInfo.isOffline,
+                date = generationWeekInfo.date,
+                enable = true,
             )
         }
         AttendanceRes.AllAttendanceInfoDto(
diff --git a/src/main/kotlin/com/example/cmc_be/attendance/dto/AttendanceRes.kt b/src/main/kotlin/com/example/cmc_be/attendance/dto/AttendanceRes.kt
index 062db25..355c2f7 100644
--- a/src/main/kotlin/com/example/cmc_be/attendance/dto/AttendanceRes.kt
+++ b/src/main/kotlin/com/example/cmc_be/attendance/dto/AttendanceRes.kt
@@ -11,6 +11,7 @@ class AttendanceRes {
         val secondHour: AttendanceCategory,
         val isOffline: Boolean,
         val enable: Boolean,
+        val date: LocalDate
     )
 
     data class AttendanceCodeDto(