From 75d74041dfdea1d5d05dcf1246e7f26ca3e8af58 Mon Sep 17 00:00:00 2001 From: Yerin Lee <91695537+lxxyxin@users.noreply.github.com> Date: Sat, 21 Sep 2024 01:00:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20isOngoing=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moimsubmission/service/MoimSubmissionQueryService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java b/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java index b0c0345..c1a2135 100644 --- a/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java +++ b/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java @@ -16,7 +16,6 @@ import com.pickple.server.global.exception.CustomException; import com.pickple.server.global.response.enums.ErrorCode; import com.pickple.server.global.util.DateTimeUtil; -import com.pickple.server.global.util.DateUtil; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -194,7 +193,6 @@ public boolean isMoimSubmissonApproved(Long moimId) { public boolean isOngoing(Long moimId) { Moim moim = moimRepository.findMoimByIdOrThrow(moimId); - int day = DateUtil.calculateCompletedDay(moim.getDateList().getDate()); - return day >= 0; + return moim.getMoimState().equals("ongoing"); } } From ec8ea5e53fb1a48b9b0dc5eafa8404d396a4b815 Mon Sep 17 00:00:00 2001 From: Yerin Lee <91695537+lxxyxin@users.noreply.github.com> Date: Sat, 21 Sep 2024 01:00:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore=20:=20=EB=B6=88=ED=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/pickple/server/global/util/DateUtil.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/pickple/server/global/util/DateUtil.java b/src/main/java/com/pickple/server/global/util/DateUtil.java index 7778804..00e3a58 100644 --- a/src/main/java/com/pickple/server/global/util/DateUtil.java +++ b/src/main/java/com/pickple/server/global/util/DateUtil.java @@ -12,12 +12,6 @@ public static int calculateDayOfDay(LocalDate date) { return dday; } - public static int calculateCompletedDay(LocalDate date) { - LocalDate today = LocalDate.now(); - int day = (int) ChronoUnit.DAYS.between(today, date); - return day; - } - public static String refineDate(LocalDate localDate) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd"); return localDate.format(formatter);