Feat : Date정보 추가

Central-MakeUs · Nov 25, 2023 · 3926fc2 · 3926fc2
2 parents c26e5e7 + 476e8d0
commit 3926fc2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -34,6 +34,7 @@ class AttendanceConverter {
                 firstHour = firstHour,
                 secondHour = secondHour,
                 isOffline = generationWeekInfo.isOffline,
+                date = generationWeekInfo.date,
                 enable = currentDate.isAfter(generationWeekInfo.date.minusDays(1L))
             )
         }
@@ -54,21 +55,22 @@ 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
             val secondHour =
                 (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
@@ -11,6 +11,7 @@ class AttendanceRes {
         val secondHour: AttendanceCategory,
         val isOffline: Boolean,
         val enable: Boolean,
+        val date: LocalDate
     )
 
     data class AttendanceCodeDto(