feat: 가격 수정 기능

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

@@ -11,7 +11,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseCookie;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -46,9 +48,22 @@ public ResponseEntity<ApiResponse<String>> getToken(@RequestHeader String author
 		String userKakaoEmail = kakaoAuthService.getKakaoUserEmail(authorizationCode);
 		Optional<Member> existMember = memberService.findMemberByEmail(userKakaoEmail);
 		if (existMember.isPresent()) {
-			return ResponseEntity.ok(
-					ApiResponse.with(HttpStatus.OK, "로그인 성공", authService.getServiceToken(userKakaoEmail)));
+			String serviceToken = authService.getServiceToken(userKakaoEmail);
 
+			ResponseCookie cookie =
+					ResponseCookie.from("serviceToken", serviceToken)
+							.httpOnly(true)
+							.secure(true)
+							.path("/")
+							.sameSite("Strict")
+							.build();
+
+			HttpHeaders headers = new HttpHeaders();
+			headers.add(HttpHeaders.SET_COOKIE, cookie.toString());
+
+			return ResponseEntity.ok()
+					.headers(headers)
+					.body(ApiResponse.with(HttpStatus.OK, "로그인 성공", serviceToken));
 		} else {
 			return ResponseEntity.status(HttpStatus.FOUND)
 					.location(
@@ -63,13 +78,20 @@ public ResponseEntity<ApiResponse<String>> signUpMember(
 		String serviceToken =
 				authService.register(
 						email, memberInfoRequest.deliveryName(), memberInfoRequest.phoneNumber());
-		return ResponseEntity.ok(ApiResponse.with(HttpStatus.OK, "로그인 성공", serviceToken));
-	}
 
-	@PostMapping("/signup")
-	public ResponseEntity<ApiResponse<String>> signUpMember(
-			@RequestParam String email, @RequestBody MemberInfoRequest memberInfoRequest) {
-		return authService.register(
-				email, memberInfoRequest.deliveryName(), memberInfoRequest.phoneNumber());
+		ResponseCookie cookie =
+				ResponseCookie.from("serviceToken", serviceToken)
+						.httpOnly(true)
+						.secure(true)
+						.path("/")
+						.sameSite("Strict")
+						.build();
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add(HttpHeaders.SET_COOKIE, cookie.toString());
+
+		return ResponseEntity.ok()
+				.headers(headers)
+				.body(ApiResponse.with(HttpStatus.OK, "회원가입 성공", serviceToken));
 	}
 }

src/main/java/com/ordertogether/team14_be/member/application/service/MemberService.java

@@ -1,5 +1,6 @@
 package com.ordertogether.team14_be.member.application.service;
 
+import com.ordertogether.team14_be.auth.JwtUtil;
 import com.ordertogether.team14_be.member.application.dto.MemberInfoResponse;
 import com.ordertogether.team14_be.member.application.exception.NotFoundMember;
 import com.ordertogether.team14_be.member.persistence.MemberRepository;
@@ -36,25 +37,6 @@ public MemberInfoResponse findMemberInfo(Long memberId) {
 				.build();
 	}
 
-	@Transactional(readOnly = true)
-	public Long getMemberId(String email) {
-		return memberRepository
-				.findByEmail(email)
-				.map(Member::getId)
-				.orElseThrow(() -> new NoSuchElementException("Member with email " + email + " not found"));
-	}
-
-	@Transactional(readOnly = true)
-	public MemberInfoResponse findMemberInfo(Long memberId) {
-		Member member = findMember(memberId);
-
-		return MemberInfoResponse.builder()
-				.deliveryName(member.getDeliveryName())
-				.phoneNumber(member.getPhoneNumber())
-				.point(member.getPoint())
-				.build();
-	}
-
 	@Transactional
 	public MemberInfoResponse modifyMember(Long memberId, String deliveryName, String phoneNumber) {
 		Member member = findMember(memberId);

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, @ModelAttribute @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,23 @@
 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> findFirstBySpotAndMember(
+			Spot spot, Member member); // 한 스팟에 여러 멤버가 못들어가는지 확인하고 First빼야 함
+
+	List<OrderDetail> findAllBySpot(Spot spot);
+}