Merge pull request #226 from Make-A-Wish-Sopt/feature/jiyoung-225-dev…

…elop [FIX] 소원 조회 시 문구 수정
Make-A-Wish-Sopt · Jan 24, 2025 · d6b12de · d6b12de
2 parents 8356936 + 998fe63
commit d6b12de
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/com/sopterm/makeawish/common/message/ErrorMessage.java b/src/main/java/com/sopterm/makeawish/common/message/ErrorMessage.java
@@ -19,6 +19,7 @@ public enum ErrorMessage {
 	EXPIRED_BIRTHDAY_WISH("현재 생일 주간이 아닙니다."),
 	PAST_WISH("소원 링크 주간은 과거로 설정할 수 없습니다."),
 	INVALID_TERM("시작 일자는 종료 일자보다 미래일 수 없습니다."),
+	ACCESS_END_WISH("이미 종료된 소원이에요!"),
 
 	/** user **/
 	INVALID_USER("인증되지 않은 회원입니다."),

diff --git a/src/main/java/com/sopterm/makeawish/domain/wish/Wish.java b/src/main/java/com/sopterm/makeawish/domain/wish/Wish.java
@@ -12,6 +12,7 @@
 import lombok.val;
 
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -110,4 +111,9 @@ public void updateTerm(LocalDateTime startAt, LocalDateTime endAt) {
             this.endAt = endAt;
         }
     }
+
+    public int getRestStartDayFromNow() {
+        val now = LocalDateTime.now().toLocalDate().atStartOfDay();
+        return (int) ChronoUnit.DAYS.between(now, this.startAt);
+    }
 }
diff --git a/src/main/java/com/sopterm/makeawish/service/WishService.java b/src/main/java/com/sopterm/makeawish/service/WishService.java
@@ -69,8 +69,11 @@ public Long createWish(Long userId, WishRequestDTO requestDTO) {
 
 	public WishResponseDTO findWish(Long wishId) throws AccessDeniedException {
 		val wish = getWish(wishId);
-		if (!wish.getStatus(0).equals(WHILE)) {
-			throw new AccessDeniedException(INVALID_WISH.getMessage());
+		if (wish.getStatus(0).equals(BEFORE)) {
+			throw new AccessDeniedException("해당 소원은 " + wish.getRestStartDayFromNow() +"일 뒤부터 활성화돼요!");
+		}
+		if(wish.getStatus(0).equals(END)) {
+			throw  new AccessDeniedException(ACCESS_END_WISH.getMessage());
 		}
 		return WishResponseDTO.from(wish);
 	}