weekly_10 병합

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

@@ -6,22 +6,23 @@
 import com.ordertogether.team14_be.member.application.dto.MemberInfoRequest;
 import com.ordertogether.team14_be.member.application.service.MemberService;
 import com.ordertogether.team14_be.member.persistence.entity.Member;
-import java.net.URI;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
 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.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
-@RestController
+@Controller
 @RequestMapping("/api/v1/auth")
 public class AuthController {
 
@@ -42,18 +43,39 @@ public AuthController(
 	}
 
 	@GetMapping("/login")
-	public ResponseEntity<ApiResponse<String>> getToken(@RequestHeader String authorizationCode) {
+	public ResponseEntity<ApiResponse<String>> getToken(
+			@RequestHeader("Authorization") String authorizationHeader,
+			HttpServletResponse httpServletResponse) {
+		String authorizationCode = authorizationHeader.replace("Bearer ", "");
+		System.out.println("인가코드:" + authorizationCode);
 		String userKakaoEmail = kakaoAuthService.getKakaoUserEmail(authorizationCode);
+		System.out.println("이메일:" + userKakaoEmail);
 		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(
-							URI.create(redirectPage + URLEncoder.encode(userKakaoEmail, StandardCharsets.UTF_8)))
-					.build();
+			String redirectUrl = redirectPage + userKakaoEmail;
+			try {
+				httpServletResponse.sendRedirect(redirectUrl);
+			} catch (IOException e) {
+				System.out.println(e.getMessage());
+			}
+			return ResponseEntity.ok().body(ApiResponse.with(HttpStatus.OK, "리다이렉트", redirectUrl));
 		}
 	}
 
@@ -63,13 +85,35 @@ public ResponseEntity<ApiResponse<String>> signUpMember(
 		String serviceToken =
 				authService.register(
 						email, memberInfoRequest.deliveryName(), memberInfoRequest.phoneNumber());
-		return ResponseEntity.ok(ApiResponse.with(HttpStatus.OK, "로그인 성공", serviceToken));
+
+		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));
 	}
 
-	@PostMapping("/signup")
-	public ResponseEntity<ApiResponse<String>> signUpMember(
-			@RequestParam String email, @RequestBody MemberInfoRequest memberInfoRequest) {
-		return authService.register(
-				email, memberInfoRequest.deliveryName(), memberInfoRequest.phoneNumber());
+	@PostMapping("/logout")
+	public void logout(HttpServletResponse response) {
+		ResponseCookie deleteCookie =
+				ResponseCookie.from("serviceToken", "")
+						.maxAge(0)
+						.httpOnly(true)
+						.secure(true)
+						.path("/")
+						.sameSite("Strict")
+						.build();
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add(HttpHeaders.SET_COOKIE, deleteCookie.toString());
 	}
 }

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/payment/domain/PaymentStatus.java

@@ -1,5 +1,6 @@
 package com.ordertogether.team14_be.payment.domain;
 
+import java.util.Arrays;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -21,4 +22,12 @@ public boolean isSuccess() {
 	public boolean isFail() {
 		return this == FAIL;
 	}
+
+	public static PaymentStatus fromString(String statusName) {
+		return Arrays.stream(PaymentStatus.values())
+				.filter(paymentStatus -> paymentStatus.name().equalsIgnoreCase(statusName))
+				.findFirst()
+				.orElseThrow(
+						() -> new IllegalArgumentException("%s 는 올바른 결제 상태가 아닙니다.".formatted(statusName)));
+	}
 }

src/main/java/com/ordertogether/team14_be/payment/persistence/jpa/repository/JpaPaymentOrderRepository.java

@@ -1,11 +1,13 @@
 package com.ordertogether.team14_be.payment.persistence.jpa.repository;
 
 import com.ordertogether.team14_be.payment.domain.PaymentOrder;
+import com.ordertogether.team14_be.payment.domain.PaymentStatus;
 import com.ordertogether.team14_be.payment.persistence.jpa.entity.PaymentOrderEntity;
 import com.ordertogether.team14_be.payment.persistence.jpa.entity.ProductEntity;
 import com.ordertogether.team14_be.payment.persistence.jpa.mapper.PaymentOrderMapper;
 import com.ordertogether.team14_be.payment.persistence.jpa.mapper.ProductMapper;
 import com.ordertogether.team14_be.payment.persistence.repository.PaymentOrderRepository;
+import com.ordertogether.team14_be.payment.web.dto.PaymentHistory;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -74,6 +76,11 @@ public BigDecimal getPaymentTotalAmount(String orderId) {
 						() -> new NoSuchElementException("주문 번호: %s 에 해당하는 주문이 존재하지 않습니다.".formatted(orderId)));
 	}
 
+	@Override
+	public List<PaymentHistory> getChargeHistory(Long memberId, PaymentStatus paymentStatus) {
+		return simpleJpaPaymentOrderRepository.getChargeHistory(memberId, paymentStatus);
+	}
+
 	private ProductEntity getProductEntity(PaymentOrder paymentOrder) {
 		return simpleJpaProductRepository
 				.findById(paymentOrder.getProductId())

src/main/java/com/ordertogether/team14_be/payment/persistence/jpa/repository/SimpleJpaPaymentOrderRepository.java

@@ -1,6 +1,8 @@
 package com.ordertogether.team14_be.payment.persistence.jpa.repository;
 
+import com.ordertogether.team14_be.payment.domain.PaymentStatus;
 import com.ordertogether.team14_be.payment.persistence.jpa.entity.PaymentOrderEntity;
+import com.ordertogether.team14_be.payment.web.dto.PaymentHistory;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
@@ -15,4 +17,12 @@ public interface SimpleJpaPaymentOrderRepository extends JpaRepository<PaymentOr
 	Optional<BigDecimal> getPaymentTotalAmount(String orderId);
 
 	List<PaymentOrderEntity> findByOrderId(String orderId);
+
+	@Query(
+			"SELECT new com.ordertogether.team14_be.payment.web.dto.PaymentHistory(poe.amount, poe.createdAt) FROM PaymentOrderEntity poe"
+					+ " WHERE poe.orderId IN "
+					+ "	(SELECT bpee.orderId "
+					+ "		FROM PaymentEventEntity bpee "
+					+ "		WHERE bpee.buyerId = :memberId AND bpee.paymentStatus = :paymentStatus) ")
+	List<PaymentHistory> getChargeHistory(Long memberId, PaymentStatus paymentStatus);
 }

src/main/java/com/ordertogether/team14_be/payment/persistence/repository/PaymentOrderRepository.java

@@ -1,6 +1,8 @@
 package com.ordertogether.team14_be.payment.persistence.repository;
 
 import com.ordertogether.team14_be.payment.domain.PaymentOrder;
+import com.ordertogether.team14_be.payment.domain.PaymentStatus;
+import com.ordertogether.team14_be.payment.web.dto.PaymentHistory;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
@@ -22,4 +24,6 @@ public interface PaymentOrderRepository {
 	 * @return 총 결제 금액
 	 */
 	BigDecimal getPaymentTotalAmount(String orderId);
+
+	List<PaymentHistory> getChargeHistory(Long memberId, PaymentStatus paymentStatus);
 }

src/main/java/com/ordertogether/team14_be/payment/service/PaymentHistoryService.java

@@ -0,0 +1,22 @@
+package com.ordertogether.team14_be.payment.service;
+
+import com.ordertogether.team14_be.payment.domain.PaymentStatus;
+import com.ordertogether.team14_be.payment.persistence.repository.PaymentOrderRepository;
+import com.ordertogether.team14_be.payment.web.dto.PaymentHistory;
+import com.ordertogether.team14_be.payment.web.response.PaymentHistoryResponse;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class PaymentHistoryService {
+
+	private final PaymentOrderRepository paymentOrderRepository;
+
+	public PaymentHistoryResponse getChargeHistory(Long memberId, PaymentStatus paymentStatus) {
+		List<PaymentHistory> histories =
+				paymentOrderRepository.getChargeHistory(memberId, paymentStatus);
+		return PaymentHistoryResponse.builder().histories(histories).build();
+	}
+}

src/main/java/com/ordertogether/team14_be/payment/web/controller/PaymentController.java

@@ -1,15 +1,22 @@
 package com.ordertogether.team14_be.payment.web.controller;
 
 import com.ordertogether.team14_be.common.web.response.ApiResponse;
+import com.ordertogether.team14_be.member.persistence.entity.Member;
+import com.ordertogether.team14_be.member.presentation.LoginMember;
+import com.ordertogether.team14_be.payment.domain.PaymentStatus;
 import com.ordertogether.team14_be.payment.service.PaymentConfirmService;
+import com.ordertogether.team14_be.payment.service.PaymentHistoryService;
 import com.ordertogether.team14_be.payment.service.PaymentPreparationService;
 import com.ordertogether.team14_be.payment.web.request.PaymentConfirmRequest;
+import com.ordertogether.team14_be.payment.web.request.PaymentHistoryRequest;
 import com.ordertogether.team14_be.payment.web.request.PaymentPrepareRequest;
 import com.ordertogether.team14_be.payment.web.response.PaymentConfirmationResponse;
+import com.ordertogether.team14_be.payment.web.response.PaymentHistoryResponse;
 import com.ordertogether.team14_be.payment.web.response.PaymentPrepareResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,12 +29,12 @@ public class PaymentController {
 
 	private final PaymentPreparationService paymentPreparationService;
 	private final PaymentConfirmService paymentConfirmService;
+	private final PaymentHistoryService paymentHistoryService;
 
 	@PostMapping
 	public ResponseEntity<ApiResponse<PaymentPrepareResponse>> preparePayment(
-			@RequestBody PaymentPrepareRequest request) {
-		// todo: 1L -> UserDetail.getUserId()
-		request.addBuyerId(1L);
+			@RequestBody PaymentPrepareRequest request, @LoginMember Member member) {
+		request.addBuyerId(member.getId());
 		PaymentPrepareResponse data = paymentPreparationService.prepare(request);
 
 		return ResponseEntity.ok(ApiResponse.with(HttpStatus.OK, "결제 정보를 저장하였습니다.", data));
@@ -43,4 +50,15 @@ public ResponseEntity<ApiResponse<PaymentConfirmationResponse>> confirmPayment(
 		}
 		return ResponseEntity.ok(ApiResponse.with(HttpStatus.OK, "결제가 완료되었습니다.", data));
 	}
+
+	@GetMapping("/history")
+	public ResponseEntity<ApiResponse<PaymentHistoryResponse>> getHistory(
+			@RequestBody PaymentHistoryRequest request, @LoginMember Member member) {
+		return ResponseEntity.ok(
+				ApiResponse.with(
+						HttpStatus.OK,
+						"포인트 사용 내역을 조회하였습니다.",
+						paymentHistoryService.getChargeHistory(
+								member.getId(), PaymentStatus.fromString(request.paymentStatus()))));
+	}
 }