Merge pull request #442 from depromeet/hotfix/441-duration

hotfix: 수영 시간 계산 시 초 단위로 계산
depromeet · Oct 10, 2024 · 98cdae1 · 98cdae1
2 parents c219cc1 + f7a7c8d
commit 98cdae1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/...resentation/src/main/java/com/depromeet/memory/dto/response/MemoryReadUpdateResponse.java b/...resentation/src/main/java/com/depromeet/memory/dto/response/MemoryReadUpdateResponse.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
@@ -170,10 +171,8 @@ private static MemoryDetailResponse getMemoryDetail(MemoryDetail memoryDetail) {
     }
 
     private static LocalTime getDuration(LocalTime startTime, LocalTime endTime) {
-        return LocalTime.of(
-                endTime.minusHours(startTime.getHour()).getHour(),
-                endTime.minusMinutes(startTime.getMinute()).getMinute(),
-                0);
+        Duration duration = Duration.between(startTime, endTime);
+        return LocalTime.of(0, 0).plusSeconds(duration.getSeconds());
     }
 
     private static List<ImageSimpleResponse> getImageSource(List<Image> images) {

diff --git a/module-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryResponse.java b/module-presentation/src/main/java/com/depromeet/memory/dto/response/MemoryResponse.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
@@ -188,10 +189,8 @@ private static MemoryDetailResponse getMemoryDetail(MemoryDetail memoryDetail) {
     }
 
     private static LocalTime getDuration(LocalTime startTime, LocalTime endTime) {
-        return LocalTime.of(
-                endTime.minusHours(startTime.getHour()).getHour(),
-                endTime.minusMinutes(startTime.getMinute()).getMinute(),
-                0);
+        Duration duration = Duration.between(startTime, endTime);
+        return LocalTime.of(0, 0).plusSeconds(duration.getSeconds());
     }
 
     private static List<ImageSimpleResponse> getImageSource(List<Image> images) {