notice pathvariablde 추가

team-yello · Jan 29, 2024 · 55ef205 · 55ef205
1 parent f03c405
commit 55ef205
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/com/yello/server/domain/notice/controller/NoticeController.java b/src/main/java/com/yello/server/domain/notice/controller/NoticeController.java
@@ -2,13 +2,15 @@
 
 
 import com.yello.server.domain.notice.dto.NoticeDataResponse;
+import com.yello.server.domain.notice.entity.NoticeType;
 import com.yello.server.domain.notice.service.NoticeService;
 import com.yello.server.domain.user.entity.User;
 import com.yello.server.global.common.annotation.AccessTokenUser;
 import com.yello.server.global.common.dto.BaseResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,9 +23,9 @@ public class NoticeController {
 
     private final NoticeService noticeService;
 
-    @GetMapping("/notice")
-    public BaseResponse<NoticeDataResponse> findNotice(@AccessTokenUser User user) {
-        val data = noticeService.findNotice(user.getId());
+    @GetMapping("/notice/{tag}")
+    public BaseResponse<NoticeDataResponse> findNotice(@AccessTokenUser User user, @PathVariable NoticeType tag) {
+        val data = noticeService.findNotice(user.getId(), tag);
         return BaseResponse.success(READ_NOTICE_SUCCESS, data);
     }
 }
diff --git a/src/main/java/com/yello/server/domain/notice/service/NoticeService.java b/src/main/java/com/yello/server/domain/notice/service/NoticeService.java
@@ -23,13 +23,13 @@ public class NoticeService {
     private final NoticeRepository noticeRepository;
     private final UserRepository userRepository;
 
-    public NoticeDataResponse findNotice(Long userId) {
+    public NoticeDataResponse findNotice(Long userId, NoticeType tag) {
         ZoneId zoneId = ZoneId.of("Asia/Seoul");
         ZonedDateTime now = ZonedDateTime.now(zoneId);
         userRepository.findById(userId);
         Notice noticeData =
             noticeRepository.findTopNotice().orElseGet(
-                () -> Notice.builder().imageUrl("").redirectUrl("").title("").tag(NoticeType.NOTICE).endDate(now)
+                () -> Notice.builder().imageUrl("").redirectUrl("").title("").tag(tag).endDate(now)
                     .startDate(now).isAvailable(false).build());
         return NoticeDataResponse.of(noticeData,
             compareNowAndEndData(noticeData.getEndDate()) && noticeData.getIsAvailable());

diff --git a/src/test/java/com/yello/server/domain/notice/medium/NoticeControllerTest.java b/src/test/java/com/yello/server/domain/notice/medium/NoticeControllerTest.java
@@ -15,6 +15,7 @@
 import com.yello.server.domain.notice.controller.NoticeController;
 import com.yello.server.domain.notice.dto.NoticeDataResponse;
 import com.yello.server.domain.notice.entity.Notice;
+import com.yello.server.domain.notice.entity.NoticeType;
 import com.yello.server.domain.notice.service.NoticeService;
 import com.yello.server.domain.purchase.controller.PurchaseController;
 import com.yello.server.domain.user.entity.User;
@@ -81,8 +82,8 @@ void init() {
     void 공지_조회하기_검증에_성공합니다() throws Exception {
         // given
         final NoticeDataResponse noticeDataResponse = NoticeDataResponse.of(notice, true);
-
-        given(noticeService.findNotice(anyLong()))
+        NoticeType tag = NoticeType.NOTICE;
+        given(noticeService.findNotice(anyLong(), tag))
             .willReturn(noticeDataResponse);
 
         // when

diff --git a/src/test/java/com/yello/server/domain/notice/small/NoticeServiceTest.java b/src/test/java/com/yello/server/domain/notice/small/NoticeServiceTest.java
@@ -9,6 +9,7 @@
 import com.yello.server.domain.notice.FakeNoticeRepository;
 import com.yello.server.domain.notice.dto.NoticeDataResponse;
 import com.yello.server.domain.notice.entity.Notice;
+import com.yello.server.domain.notice.entity.NoticeType;
 import com.yello.server.domain.notice.repository.NoticeRepository;
 import com.yello.server.domain.notice.service.NoticeService;
 import com.yello.server.domain.purchase.FakePurchaseRepository;
@@ -74,9 +75,10 @@ void init() {
     void 공지_조회에_성공합니다() {
         // given
         final Long userId = 1L;
+        final NoticeType tag = NoticeType.NOTICE;
 
         // when
-        final NoticeDataResponse notice = noticeService.findNotice(userId);
+        final NoticeDataResponse notice = noticeService.findNotice(userId, tag);
 
         // then
         assertThat(notice.isAvailable()).isTrue();