Merge pull request #172 from IT-Cotato/develop

�[Release] V2.2024.10.08.01
IT-Cotato · Oct 7, 2024 · 5fcc0a4 · 5fcc0a4
2 parents 11debca + 6d165ec
commit 5fcc0a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceResponse.java b/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceResponse.java
@@ -1,6 +1,7 @@
 package org.cotato.csquiz.api.attendance.dto;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Builder;
 import org.cotato.csquiz.domain.attendance.enums.AttendanceOpenStatus;
 
@@ -9,7 +10,7 @@ public record AttendanceResponse(
         Long sessionId,
         Long attendanceId,
         String sessionTitle,
-        LocalDate sessionDate,
+        LocalDateTime sessionDateTime,
         AttendanceOpenStatus openStatus
 ) {
 }
diff --git a/src/main/java/org/cotato/csquiz/domain/attendance/service/AttendanceService.java b/src/main/java/org/cotato/csquiz/domain/attendance/service/AttendanceService.java
@@ -49,7 +49,7 @@ public AttendancesResponse findAttendancesByGenerationId(final Long generationId
                         .attendanceId(at.getId())
                         .sessionId(at.getSessionId())
                         .sessionTitle(sessionMap.get(at.getSessionId()).getTitle())
-                        .sessionDate(at.getAttendanceDeadLine().toLocalDate())
+                        .sessionDateTime(sessionMap.get(at.getSessionId()).getSessionDateTime())
                         .openStatus(AttendanceUtil.getAttendanceOpenStatus(sessionMap.get(at.getSessionId()).getSessionDateTime(), at, currentTime))
                         .build())
                 .toList();