diff --git a/src/main/java/konkuk/thip/common/util/DateUtil.java b/src/main/java/konkuk/thip/common/util/DateUtil.java index 4c05955a5..872c861e1 100644 --- a/src/main/java/konkuk/thip/common/util/DateUtil.java +++ b/src/main/java/konkuk/thip/common/util/DateUtil.java @@ -3,6 +3,7 @@ import org.springframework.stereotype.Component; import java.time.Duration; +import java.time.LocalDate; import java.time.LocalDateTime; @Component @@ -17,5 +18,28 @@ public String formatLastActivityTime(LocalDateTime createdAt) { if (hours < 24) return hours + "시간 전"; return (hours / 24) + "일 전"; } + + public static String formatAfterTime(LocalDate date) { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime dateTime = date.atStartOfDay(); + Duration d = Duration.between(now, dateTime); + + if (d.isNegative() || d.isZero()) { + return "??"; + } + + long days = d.toDays(); + if (days > 0) { + return days + "일 뒤 "; + } + + long hours = d.toHours(); + if (hours > 0) { + return hours + "시간 뒤 "; + } + + long minutes = d.toMinutes(); + return minutes + "분 뒤 "; + } } diff --git a/src/main/java/konkuk/thip/common/util/DateUtilsss.java b/src/main/java/konkuk/thip/common/util/DateUtilsss.java deleted file mode 100644 index e8d1a857e..000000000 --- a/src/main/java/konkuk/thip/common/util/DateUtilsss.java +++ /dev/null @@ -1,31 +0,0 @@ -package konkuk.thip.common.util; - -import java.time.Duration; -import java.time.LocalDate; -import java.time.LocalDateTime; - -public class DateUtilsss { - - public static String formatAfterTime(LocalDate date) { - LocalDateTime now = LocalDateTime.now(); - LocalDateTime dateTime = date.atStartOfDay(); - Duration d = Duration.between(now, dateTime); - - if (d.isNegative() || d.isZero()) { - return "??"; - } - - long days = d.toDays(); - if (days > 0) { - return days + "일 뒤 "; - } - - long hours = d.toHours(); - if (hours > 0) { - return hours + "시간 뒤 "; - } - - long minutes = d.toMinutes(); - return minutes + "분 뒤 "; - } -} diff --git a/src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryRepositoryImpl.java b/src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryRepositoryImpl.java index 72d9154d7..f4b89a0a0 100644 --- a/src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryRepositoryImpl.java +++ b/src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryRepositoryImpl.java @@ -8,7 +8,7 @@ import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import konkuk.thip.book.adapter.out.jpa.QBookJpaEntity; -import konkuk.thip.common.util.DateUtilsss; +import konkuk.thip.common.util.DateUtil; import konkuk.thip.room.adapter.in.web.response.RoomSearchResponse; import konkuk.thip.room.adapter.out.jpa.QRoomJpaEntity; import konkuk.thip.user.adapter.out.jpa.QUserRoomJpaEntity; @@ -96,7 +96,7 @@ public Page searchRoom(String keyword, Stri t.get(memberCountExpr).intValue(), t.get(room.recruitCount), // 모집마감일 까지 남은 시간 포맷 - DateUtilsss.formatAfterTime(t.get(room.startDate)), + DateUtil.formatAfterTime(t.get(room.startDate)), t.get(room.categoryJpaEntity.value) )) .toList();