Skip to content

[Fix] 리뷰 목록 반환에서 시간 반환 수정 , closes #131 #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
E-hyeon merged 2 commits into from
Nov 2, 2025
Merged

[Fix] 리뷰 목록 반환에서 시간 반환 수정 , closes #131 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee28548
fix : 리뷰 목록에서 시간 반환 수정
E-hyeon Nov 2, 2025
d1553e1
fix : 혼잡도에서 시간 반환 수정
E-hyeon Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 2 additions & 33 deletions src/main/java/com/gongspot/project/domain/place/converter/PlaceConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public static PlaceResponseDTO.GetPlaceDTO toGetPlaceDTO(Place place, Double rat
.nickname(review.getUser().getNickname())
.profileImageUrl(review.getUser().getProfileImg())
.congestion(mapCongestionToString(review.getCongestion()))
.daytime(toRelativeDaytime(review.getDatetime()))
.datetime(toRelativeDateString(review.getDatetime()))
.daytime(review.getDatetime().format(DateTimeFormatter.ofPattern("M/d")))
.datetime(review.getDatetime().format(DateTimeFormatter.ofPattern("HH:mm")))
.build())
.toList();

Expand All @@ -43,37 +43,6 @@ public static PlaceResponseDTO.GetPlaceDTO toGetPlaceDTO(Place place, Double rat
.congestionList(congestionDTOS)
.build();
}
private static String toRelativeDaytime(LocalDateTime dateTime) {
long days = Duration.between(dateTime.toLocalDate().atStartOfDay(), LocalDateTime.now().toLocalDate().atStartOfDay()).toDays();

if (days == 0) return "오늘";
else if (days > 0 && days < 4) return days + "일 전";
else {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d");
return dateTime.format(formatter);
}
}

private static String toRelativeDateString(LocalDateTime dateTime) {
LocalDateTime now = LocalDateTime.now();

Duration duration = Duration.between(dateTime,now);

long minutes = duration.toMinutes();
long hours = duration.toHours();

if (minutes < 60) {
return minutes + "분 전";
} else if (hours < 2) {
return "1시간 전";
} else if (hours < 3) {
return "2시간 전";
} else if (hours < 4) {
return "3시간 전";
}else {
return dateTime.format(DateTimeFormatter.ofPattern("HH:mm"));
}
}

private static String mapCongestionToString(CongestionEnum congestion) {
if (congestion == null) {
Expand Down
36 changes: 3 additions & 33 deletions src/main/java/com/gongspot/project/domain/review/converter/ReviewConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static ReviewResponseDTO.GetReviewDTO toGetReviewDTO(Review review, List<
.userId(review.getUser().getId())
.nickname(review.getUser().getNickname())
.profileImageUrl(review.getUser().getProfileImg())
.datetime(review.getCreatedAt().format(DateTimeFormatter.ofPattern("yy.MM.dd")))
.datetime(review.getDatetime().format(DateTimeFormatter.ofPattern("yy.MM.dd")))
.rating(review.getRating())
.reviewImageUrl(imageUrls)
.content(review.getContent())
Expand All @@ -49,8 +49,8 @@ private static ReviewResponseDTO.CongestionItemDTO toCongestionItemDTO(Review re
.nickname(review.getUser().getNickname())
.profileImageUrl(review.getUser().getProfileImg())
.congestion(mapCongestionToString(review.getCongestion()))
.daytime(toRelativeDaytime(review.getDatetime()))
.datetime(toRelativeDateString(review.getDatetime()))
.daytime(review.getDatetime().format(DateTimeFormatter.ofPattern("M/d")))
.datetime(review.getDatetime().format(DateTimeFormatter.ofPattern("HH:mm")))
.paid(paidStatus)
.build();
}
Expand Down Expand Up @@ -202,37 +202,7 @@ private static String mapCongestionToString(CongestionEnum congestion) {
}
}

private static String toRelativeDaytime(LocalDateTime dateTime) {
long days = Duration.between(dateTime.toLocalDate().atStartOfDay(), LocalDateTime.now().toLocalDate().atStartOfDay()).toDays();

if (days == 0) return "오늘";
else if (days > 0 && days < 4) return days + "일 전";
else {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d");
return dateTime.format(formatter);
}
}

private static String toRelativeDateString(LocalDateTime dateTime) {
LocalDateTime now = LocalDateTime.now();

Duration duration = Duration.between(dateTime,now);

long minutes = duration.toMinutes();
long hours = duration.toHours();

if (minutes < 60) {
return minutes + "분 전";
} else if (hours < 2) {
return "1시간 전";
} else if (hours < 3) {
return "2시간 전";
} else if (hours < 4) {
return "3시간 전";
}else {
return dateTime.format(DateTimeFormatter.ofPattern("HH:mm"));
}
}
private static String toDateString(LocalDate dateTime) {
String dayOfWeek;
switch (dateTime.getDayOfWeek()) {
Expand Down