Merge pull request #59 from SWEET-DEVELOPERS/feature/#58-product

[fix] 2030 상품 API response에 토너먼트 시작 시간 추가
SWEET-DEVELOPERS · Jan 13, 2024 · 0f72743 · 0f72743
2 parents 7375ab7 + 8dbcbfd
commit 0f72743
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 18 deletions.
diff --git a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftController.java
@@ -6,7 +6,6 @@
 import org.sopt.sweet.domain.gift.dto.request.TournamentScoreRequestDto;
 import org.sopt.sweet.domain.gift.dto.response.*;
 import org.sopt.sweet.domain.gift.service.GiftService;
-import org.sopt.sweet.domain.room.entity.Room;
 import org.sopt.sweet.global.common.SuccessResponse;
 import org.sopt.sweet.global.config.auth.UserId;
 import org.springframework.http.ResponseEntity;
@@ -35,14 +34,14 @@ public ResponseEntity<SuccessResponse<?>> getMyGift(@UserId Long userId, @Reques
         return SuccessResponse.ok(myGiftsResponseDto);
     }
 
-    @DeleteMapping ("/my/{giftId}")
+    @DeleteMapping("/my/{giftId}")
     public ResponseEntity<SuccessResponse<?>> deleteMyGift(@UserId Long userId, @PathVariable Long giftId) {
         giftService.deleteMyGift(userId, giftId);
         return SuccessResponse.ok(null);
     }
 
     @GetMapping("/tonermant/{roomId}")
-    public ResponseEntity<SuccessResponse<?>> getTournamentGiftList(@UserId Long userId,@PathVariable Long roomId) {
+    public ResponseEntity<SuccessResponse<?>> getTournamentGiftList(@UserId Long userId, @PathVariable Long roomId) {
         List<TournamentListsResponseDto> tournamentGiftList = giftService.getTournamentGiftList(roomId);
         return SuccessResponse.ok(tournamentGiftList);
     }
@@ -78,9 +77,4 @@ public ResponseEntity<SuccessResponse<?>> getFriendGift(@UserId Long userId, @Pa
     }
 
 
-
-
-
-
-
 }
diff --git a/src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java b/src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java
@@ -54,7 +54,4 @@ public void setScore(int score) {
         this.score = score;
     }
 
-
-
-
 }
diff --git a/src/main/java/org/sopt/sweet/domain/product/controller/ProductApi.java b/src/main/java/org/sopt/sweet/domain/product/controller/ProductApi.java
@@ -32,6 +32,11 @@ ResponseEntity<SuccessResponse<?>> getHotGift(
                     description = "authorization token에서 얻은 userId, 임의입력하면 대체됩니다.",
                     required = true,
                     example = "12345"
-            ) @UserId Long userId
+            ) @UserId Long userId,
+            @Parameter(
+                    description = "선물방 id",
+                    required = true,
+                    example = "1"
+            ) @PathVariable Long roomId
     );
 }
diff --git a/src/main/java/org/sopt/sweet/domain/product/controller/ProductController.java b/src/main/java/org/sopt/sweet/domain/product/controller/ProductController.java
@@ -7,6 +7,7 @@
 import org.sopt.sweet.global.config.auth.UserId;
 import org.springframework.http.ResponseEntity;
 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;
 
@@ -17,9 +18,9 @@ public class ProductController implements ProductApi {
 
     private final ProductService productService;
 
-    @GetMapping("/hot")
-    public ResponseEntity<SuccessResponse<?>> getHotGift(@UserId Long userId) {
-        final HotProductsResponseDto hotProductsResponseDto = productService.getHotGift(userId);
+    @GetMapping("/hot/{roomId}")
+    public ResponseEntity<SuccessResponse<?>> getHotGift(@UserId Long userId, @PathVariable Long roomId) {
+        final HotProductsResponseDto hotProductsResponseDto = productService.getHotGift(userId, roomId);
         return SuccessResponse.ok(hotProductsResponseDto);
     }
 }
diff --git a/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java b/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java
@@ -2,14 +2,18 @@
 
 import lombok.Builder;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Builder
 public record HotProductsResponseDto(
+        LocalDateTime tournamentStartDate,
         List<HotProductDto> hotProductDtoList
 ) {
-    public static HotProductsResponseDto of(List<HotProductDto> hotProductDtoList){
+    public static HotProductsResponseDto of(LocalDateTime tournamentStartDate,
+                                            List<HotProductDto> hotProductDtoList){
         return HotProductsResponseDto.builder()
+                .tournamentStartDate(tournamentStartDate)
                 .hotProductDtoList(hotProductDtoList)
                 .build();
     }

diff --git a/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java b/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java
@@ -8,7 +8,9 @@
 import org.sopt.sweet.domain.product.dto.response.HotProductsResponseDto;
 import org.sopt.sweet.domain.product.entity.Product;
 import org.sopt.sweet.domain.product.repository.ProductRepository;
+import org.sopt.sweet.domain.room.entity.Room;
 import org.sopt.sweet.domain.room.repository.RoomMemberRepository;
+import org.sopt.sweet.domain.room.repository.RoomRepository;
 import org.sopt.sweet.global.error.exception.EntityNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +19,7 @@
 import java.util.stream.Collectors;
 
 import static org.sopt.sweet.global.error.ErrorCode.MEMBER_NOT_FOUND;
+import static org.sopt.sweet.global.error.ErrorCode.ROOM_NOT_FOUND;
 
 @RequiredArgsConstructor
 @Service
@@ -25,19 +28,26 @@ public class ProductService {
 
     private final MemberRepository memberRepository;
     private final ProductRepository productRepository;
+    private final RoomRepository roomRepository;
 
-    public HotProductsResponseDto getHotGift(Long memberId){
+    public HotProductsResponseDto getHotGift(Long memberId, Long roomId){
         Member member = findMemberByIdOrThrow(memberId);
+        Room room = findRoomByIdOrThrow(roomId);
         List<Product> allProducts = productRepository.findAll();
         List<HotProductDto> hotProductDtoList = mapToHotProductDtoList(allProducts);
-        return HotProductsResponseDto.of(hotProductDtoList);
+        return HotProductsResponseDto.of(room.getTournamentStartDate(), hotProductDtoList);
     }
 
     private Member findMemberByIdOrThrow(Long memberId) {
         return memberRepository.findById(memberId)
                 .orElseThrow(() -> new EntityNotFoundException(MEMBER_NOT_FOUND));
     }
 
+    private Room findRoomByIdOrThrow(Long roomId) {
+        return roomRepository.findById(roomId)
+                .orElseThrow(() -> new EntityNotFoundException(ROOM_NOT_FOUND));
+    }
+
     private List<HotProductDto> mapToHotProductDtoList(List<Product> products) {
         return products.stream()
                 .map(product -> HotProductDto.of(