Merge pull request #83 from ajy9851/feat/58/get-my-orders

feat: 가격 수정 기능

build.gradle

@@ -43,7 +43,7 @@ dependencies {
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${swagger_version}"
     implementation 'org.mapstruct:mapstruct:1.5.5.Final'
     implementation 'ch.hsr:geohash:1.4.0'
-
+    implementation 'net.nurigo:sdk:4.3.0'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
     annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
 

src/main/java/com/ordertogether/team14_be/auth/presentation/AuthController.java

@@ -84,7 +84,6 @@ public ResponseEntity<ApiResponse<String>> signUpMember(
 		String serviceToken =
 				kakaoAuthService.register(
 						email, memberInfoRequest.deliveryName(), memberInfoRequest.phoneNumber());
-
 		ResponseCookie cookie =
 				ResponseCookie.from("serviceToken", serviceToken)
 						.httpOnly(true)

src/main/java/com/ordertogether/team14_be/order/details/controller/OrderDetailController.java

@@ -1,13 +1,25 @@
 package com.ordertogether.team14_be.order.details.controller;
 
-import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailRequestDto;
-import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailResponseDto;
+import com.ordertogether.team14_be.member.persistence.entity.Member;
+import com.ordertogether.team14_be.member.presentation.LoginMember;
+import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailReq;
+import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetCreatorOrderInfoRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetOrdersInfoReq;
+import com.ordertogether.team14_be.order.details.dto.get.GetOrdersInfoRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetParticipantOrderInfoRes;
+import com.ordertogether.team14_be.order.details.dto.update.UpdateOrderPriceReq;
 import com.ordertogether.team14_be.order.details.service.OrderDetailService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -19,10 +31,36 @@ public class OrderDetailController {
 
 	// 주문 생성
 	@PostMapping
-	public ResponseEntity<CreateOrderDetailResponseDto> createOrderDetail(
-			@RequestBody CreateOrderDetailRequestDto createOrderDetailRequestDto) {
-		CreateOrderDetailResponseDto createOrderDetailResponseDto =
-				orderDetailService.createOrderDetail(createOrderDetailRequestDto);
-		return ResponseEntity.ok(createOrderDetailResponseDto);
+	public ResponseEntity<CreateOrderDetailRes> createOrderDetail(
+			@RequestBody CreateOrderDetailReq createOrderDetailReq) {
+		CreateOrderDetailRes createOrderDetailRes =
+				orderDetailService.createOrderDetail(createOrderDetailReq);
+		return ResponseEntity.ok(createOrderDetailRes);
+	}
+
+	@GetMapping
+	public ResponseEntity<GetOrdersInfoRes> getOrdersInfo(
+			@LoginMember Member member, @ModelAttribute @Valid GetOrdersInfoReq dto) {
+		return ResponseEntity.ok(orderDetailService.getOrdersInfo(member, dto));
+	}
+
+	@GetMapping("/participant")
+	public ResponseEntity<GetParticipantOrderInfoRes> getParticipantOrderInfo(
+			@LoginMember Member member, @RequestParam(name = "spot-id") Long spotId) {
+		return ResponseEntity.ok(orderDetailService.getParticipantOrderInfo(member, spotId));
+	}
+
+	@GetMapping("/creator")
+	public ResponseEntity<GetCreatorOrderInfoRes> getCreatorOrderInfo(
+			@LoginMember Member member, @RequestParam(name = "spot-id") Long spotId) {
+		return ResponseEntity.ok(orderDetailService.getCreatorOrderInfo(member, spotId));
+	}
+
+	// 가격 수정
+	@PutMapping("/price")
+	public ResponseEntity<Void> updateOrderPrice(
+		@LoginMember Member member, @RequestBody @Valid UpdateOrderPriceReq dto) {
+		orderDetailService.updateOrderPrice(member, dto);
+		return ResponseEntity.ok().build();
 	}
 }

src/main/java/com/ordertogether/team14_be/order/details/dto/create/CreateOrderDetailRequestDto.java → src/main/java/com/ordertogether/team14_be/order/details/dto/create/CreateOrderDetailReq.java

@@ -9,7 +9,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
-public class CreateOrderDetailRequestDto {
+public class CreateOrderDetailReq {
 	private int price;
 	private boolean isPayed;
 	private Long participantId; // 참여자 아이디

src/main/java/com/ordertogether/team14_be/order/details/dto/create/CreateOrderDetailResponseDto.java → src/main/java/com/ordertogether/team14_be/order/details/dto/create/CreateOrderDetailRes.java

@@ -9,7 +9,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
-public class CreateOrderDetailResponseDto {
+public class CreateOrderDetailRes {
 	private Long id;
 	private int price;
 	private boolean isPayed;

src/main/java/com/ordertogether/team14_be/order/details/dto/get/GetCreatorOrderInfoRes.java

@@ -0,0 +1,11 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+import java.util.List;
+
+public record GetCreatorOrderInfoRes(
+		String category,
+		String storeName,
+		int minimumOrderAmount,
+		String pickUpLocation,
+		String deliveryStatus,
+		List<MemberBriefInfo> memberInfo) {}

src/main/java/com/ordertogether/team14_be/order/details/dto/get/GetOrdersInfoReq.java

@@ -0,0 +1,7 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+import java.util.List;
+
+public record GetOrdersInfoReq(
+		Integer page, Integer size, List<String> sort // 첫 번째 - 정렬할 필드명(DB 기준), 두 번째 - 정렬 순서(desc, asc)
+		) {}

src/main/java/com/ordertogether/team14_be/order/details/dto/get/GetOrdersInfoRes.java

@@ -0,0 +1,5 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+import java.util.List;
+
+public record GetOrdersInfoRes(int totalPages, long totalElements, List<OrderInfo> ordersInfo) {}

src/main/java/com/ordertogether/team14_be/order/details/dto/get/GetParticipantOrderInfoRes.java

@@ -0,0 +1,9 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+public record GetParticipantOrderInfoRes(
+		String category,
+		String storeName,
+		int minimumOrderAmount,
+		String pickUpLocation,
+		String deliveryStatus,
+		int price) {}

src/main/java/com/ordertogether/team14_be/order/details/dto/get/MemberBriefInfo.java

@@ -0,0 +1,3 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+public record MemberBriefInfo(long memberId, String deliveryName, int price, boolean isPayed) {}

src/main/java/com/ordertogether/team14_be/order/details/dto/get/OrderInfo.java

@@ -0,0 +1,27 @@
+package com.ordertogether.team14_be.order.details.dto.get;
+
+import com.ordertogether.team14_be.order.details.entity.OrderDetail;
+import com.ordertogether.team14_be.spot.entity.Spot;
+
+public record OrderInfo(
+		Long id,
+		String category,
+		String storeName,
+		int minimumOrderAmount,
+		String pickUpLocation,
+		String deliveryStatus,
+		int price,
+		boolean isCreator) {
+
+	public OrderInfo(Long memberId, OrderDetail order, Spot spot) {
+		this(
+				order.getId(),
+				spot.getCategory().toString(),
+				spot.getStoreName(),
+				spot.getMinimumOrderAmount(),
+				spot.getPickUpLocation(),
+				spot.getDeliveryStatus(),
+				order.getPrice(),
+				spot.getMember().getId().equals(memberId));
+	}
+}

src/main/java/com/ordertogether/team14_be/order/details/dto/update/UpdateOrderPriceReq.java

@@ -0,0 +1,5 @@
+package com.ordertogether.team14_be.order.details.dto.update;
+
+public record UpdateOrderPriceReq(Long orderId, int price) {
+
+}

src/main/java/com/ordertogether/team14_be/order/details/entity/OrderDetail.java

@@ -41,4 +41,8 @@ public class OrderDetail extends BaseTimeEntity {
 	private int price;
 
 	private boolean isPayed;
+
+	public void updatePrice(int price) {
+		this.price = price;
+	}
 }

src/main/java/com/ordertogether/team14_be/order/details/repository/OrderDetailRepository.java

@@ -1,8 +1,22 @@
 package com.ordertogether.team14_be.order.details.repository;
 
+import com.ordertogether.team14_be.member.persistence.entity.Member;
 import com.ordertogether.team14_be.order.details.entity.OrderDetail;
+import com.ordertogether.team14_be.spot.entity.Spot;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface OrderDetailRepository extends JpaRepository<OrderDetail, Long> {}
+public interface OrderDetailRepository extends JpaRepository<OrderDetail, Long> {
+	@EntityGraph(attributePaths = {"spot"})
+	Page<OrderDetail> findAllByMember(Member member, Pageable pageable);
+
+	Optional<OrderDetail> findBySpotAndMember(Spot spot, Member member);
+
+	List<OrderDetail> findAllBySpot(Spot spot);
+}

src/main/java/com/ordertogether/team14_be/order/details/service/OrderDetailService.java

@@ -2,53 +2,160 @@
 
 import com.ordertogether.team14_be.member.persistence.MemberRepository;
 import com.ordertogether.team14_be.member.persistence.entity.Member;
-import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailRequestDto;
-import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailResponseDto;
+import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailReq;
+import com.ordertogether.team14_be.order.details.dto.create.CreateOrderDetailRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetCreatorOrderInfoRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetOrdersInfoReq;
+import com.ordertogether.team14_be.order.details.dto.get.GetOrdersInfoRes;
+import com.ordertogether.team14_be.order.details.dto.get.GetParticipantOrderInfoRes;
+import com.ordertogether.team14_be.order.details.dto.get.MemberBriefInfo;
+import com.ordertogether.team14_be.order.details.dto.get.OrderInfo;
+import com.ordertogether.team14_be.order.details.dto.update.UpdateOrderPriceReq;
 import com.ordertogether.team14_be.order.details.entity.OrderDetail;
 import com.ordertogether.team14_be.order.details.repository.OrderDetailRepository;
-import com.ordertogether.team14_be.spot.dto.servicedto.SpotDto;
+import com.ordertogether.team14_be.spot.entity.Spot;
+import com.ordertogether.team14_be.spot.repository.SimpleSpotRepository;
 import com.ordertogether.team14_be.spot.repository.SpotRepository;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 public class OrderDetailService {
-
+	private final SimpleSpotRepository simpleSpotRepository;
 	private final OrderDetailRepository orderDetailRepository;
 	private final MemberRepository memberRepository;
 	private final SpotRepository spotRepository;
 
 	// 주문 상세 정보 생성 메서드
-	public CreateOrderDetailResponseDto createOrderDetail(
-			CreateOrderDetailRequestDto createOrderDetailRequestDto) {
+	@Transactional
+	public CreateOrderDetailRes createOrderDetail(CreateOrderDetailReq createOrderDetailReq) {
 
 		// 참여자 본인 정보 설정
 		Member member =
 				memberRepository
-						.findById(createOrderDetailRequestDto.getParticipantId())
+						.findById(createOrderDetailReq.getParticipantId())
 						.orElseThrow(() -> new IllegalArgumentException("참여자 정보가 없습니다."));
 
-		// 스팟 정보 설정
-		SpotDto spot =
-				spotRepository.findByIdAndIsDeletedFalse(createOrderDetailRequestDto.getSpotId());
+		// 스팟 정보 설정 - spotMapper가 아직 구현되지 않아서 Simple사용
+		// SpotDto spotDto =
+		// spotRepository.findByIdAndIsDeletedFalse(createOrderDetailRequestDto.getSpotId());
+		Spot spot =
+				simpleSpotRepository
+						.findById(createOrderDetailReq.getSpotId())
+						.orElseThrow(() -> new IllegalArgumentException("스팟 정보가 없습니다."));
 
 		OrderDetail orderDetail =
 				OrderDetail.builder()
 						.member(member)
-						//						.spot(spot)
-						.price(createOrderDetailRequestDto.getPrice())
-						.isPayed(createOrderDetailRequestDto.isPayed())
+						.spot(spot)
+						.price(createOrderDetailReq.getPrice())
+						.isPayed(createOrderDetailReq.isPayed())
 						.build();
 
 		OrderDetail savedOrderDetail = orderDetailRepository.save(orderDetail);
 
-		return CreateOrderDetailResponseDto.builder()
+		return CreateOrderDetailRes.builder()
 				.id(savedOrderDetail.getId())
 				.price(savedOrderDetail.getPrice())
 				.isPayed(savedOrderDetail.isPayed())
 				.participantName(savedOrderDetail.getMember().getDeliveryName())
 				.spotName(spot.getStoreName())
 				.build();
 	}
+
+	@Transactional(readOnly = true)
+	public GetOrdersInfoRes getOrdersInfo(Member member, GetOrdersInfoReq dto) {
+		Page<OrderDetail> orderDetails =
+				orderDetailRepository.findAllByMember(
+						member,
+						PageRequest.of(
+								dto.page(),
+								dto.size(),
+								dto.sort() == null ? Sort.unsorted() : Sort.by(dto.sort().get(1))));
+
+		return new GetOrdersInfoRes(
+				orderDetails.getTotalPages(),
+				orderDetails.getTotalElements(),
+				orderDetails.getContent().stream()
+						.map(order -> new OrderInfo(member.getId(), order, order.getSpot()))
+						.toList());
+	}
+
+	@Transactional(readOnly = true)
+	public GetParticipantOrderInfoRes getParticipantOrderInfo(Member member, Long spotId) {
+		Spot spot =
+				simpleSpotRepository
+						.findById(spotId)
+						.orElseThrow(() -> new IllegalArgumentException("스팟 정보가 없습니다."));
+		Member creator = spot.getMember();
+
+		if (member.getId().equals(creator.getId()))
+			throw new IllegalArgumentException("방장입니다.(참여자만 사용 가능)");
+
+		OrderDetail orderDetail =
+				orderDetailRepository
+						.findBySpotAndMember(spot, member)
+						.orElseThrow(() -> new IllegalArgumentException("주문 정보가 없습니다."));
+
+		return new GetParticipantOrderInfoRes(
+				spot.getCategory().toString(),
+				spot.getStoreName(),
+				spot.getMinimumOrderAmount(),
+				spot.getPickUpLocation(),
+				spot.getDeliveryStatus(),
+				orderDetail.getPrice());
+	}
+
+	@Transactional(readOnly = true)
+	public GetCreatorOrderInfoRes getCreatorOrderInfo(Member member, Long spotId) {
+		Spot spot =
+				simpleSpotRepository
+						.findById(spotId)
+						.orElseThrow(() -> new IllegalArgumentException("스팟 정보가 없습니다."));
+		Member creator = spot.getMember();
+
+		if (!member.getId().equals(creator.getId()))
+			throw new IllegalArgumentException("참여자입니다.(방장만 사용 가능)");
+
+		List<OrderDetail> orders = orderDetailRepository.findAllBySpot(spot);
+
+		return new GetCreatorOrderInfoRes(
+				spot.getCategory().toString(),
+				spot.getStoreName(),
+				spot.getMinimumOrderAmount(),
+				spot.getPickUpLocation(),
+				spot.getDeliveryStatus(),
+				orders.stream()
+						.map(
+								order -> {
+									Member participant = order.getMember();
+									return new MemberBriefInfo(
+											participant.getId(),
+											participant.getDeliveryName(),
+											order.getPrice(),
+											order.isPayed());
+								})
+						.toList()); // memberInfo
+	}
+
+	@Transactional
+	public void updateOrderPrice(Member member, UpdateOrderPriceReq dto) {
+		OrderDetail orderDetail =
+				orderDetailRepository
+						.findById(dto.orderId())
+						.orElseThrow(() -> new IllegalArgumentException("주문 정보를 찾을 수 없습니다."));
+
+		if (!orderDetail.getMember().getId().equals(member.getId())) {
+			throw new IllegalArgumentException("주문의 참여자가 아닙니다.");
+		}
+
+		orderDetail.updatePrice(dto.price());
+		orderDetailRepository.save(orderDetail);
+	}
 }