Merge pull request #203 from JA-yeong-eop-JA-moeu-JA/fix/#201-order

🐛 fix: createTeam 메서드에 orderId 매개변수 추가 및 Order 조회 로직 구현

Author: floreo1242

src/main/java/com/jajaja/domain/team/controller/TeamController.java

@@ -25,9 +25,9 @@ public class TeamController {
             summary = "팀 생성 API | by 지지/이지희",
             description = "‘팀 생성하기 버튼’을 통해 해당 상품의 팀을 생성합니다. 해당 유저는 만들어진 팀의 리더가 됩니다."
     )
-    @PostMapping("/{productId}")
-    public ApiResponse<TeamCreateResponseDto> createTeam(@Auth Long memberId, @PathVariable Long productId) {
-        TeamCreateResponseDto responseDto = teamCommandService.createTeam(memberId, productId);
+    @PostMapping
+    public ApiResponse<TeamCreateResponseDto> createTeam(@Auth Long memberId, @RequestParam Long productId, @RequestParam String orderId) {
+        TeamCreateResponseDto responseDto = teamCommandService.createTeam(memberId, productId, orderId);
         return ApiResponse.onSuccess(responseDto);
     }
 

src/main/java/com/jajaja/domain/team/service/TeamCommandService.java

@@ -3,7 +3,7 @@
 import com.jajaja.domain.team.dto.response.TeamCreateResponseDto;
 
 public interface TeamCommandService {
-    TeamCreateResponseDto createTeam(Long memberId, Long orderId);
+    TeamCreateResponseDto createTeam(Long memberId, Long productId, String orderId);
     void joinTeam(Long memberId, Long teamId);
     void joinTeamInCarts(Long memberId, Long productId);
 }

src/main/java/com/jajaja/domain/team/service/TeamCommandServiceImpl.java

@@ -1,6 +1,8 @@
 package com.jajaja.domain.team.service;
 
 import com.jajaja.domain.cart.entity.Cart;
+import com.jajaja.domain.order.entity.Order;
+import com.jajaja.domain.order.repository.OrderRepository;
 import com.jajaja.domain.product.entity.Product;
 import com.jajaja.domain.product.repository.ProductRepository;
 import com.jajaja.domain.team.dto.response.TeamCreateResponseDto;
@@ -27,18 +29,21 @@ public class TeamCommandServiceImpl implements TeamCommandService {
     private final ProductRepository productRepository;
     private final TeamRepository teamRepository;
     private final TeamCommonServiceImpl teamCommonService;
+    private final OrderRepository orderRepository;
 
     @Override
-    public TeamCreateResponseDto createTeam(Long memberId, Long productId) {
+    public TeamCreateResponseDto createTeam(Long memberId, Long productId, String orderId) {
         Member member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new BadRequestException(ErrorStatus.MEMBER_NOT_FOUND));
-
         Product product = productRepository.findById(productId)
                 .orElseThrow(() -> new BadRequestException(ErrorStatus.PRODUCT_NOT_FOUND));
+        Order order = orderRepository.findByOrderId(orderId)
+                .orElseThrow(() -> new BadRequestException(ErrorStatus.ORDER_NOT_FOUND));
 
         Team team = Team.builder()
                 .leader(member)
                 .product(product)
+                .order(order)
                 .status(TeamStatus.MATCHING)
                 .expireAt(LocalDateTime.now().plusMinutes(30))
                 .build();