[#282] 대기열 기능 구현

backend/src/main/java/org/example/backend/domain/board/repository/querydsl/ProductBoardRepositoryCustomImpl.java

@@ -43,27 +43,25 @@ public ProductBoardRepositoryCustomImpl(EntityManager em) {
 
 	@Override
 	public Page<ProductBoard> search(String search, Pageable pageable) {
+		Predicate condition = getCondition(search);
 		JPQLQuery<ProductBoard> query = queryFactory
 			.selectFrom(qProductBoard)
 			.leftJoin(qProductBoard.category, qCategory).fetchJoin()
 			.leftJoin(qProductBoard.company, qCompany).fetchJoin()
 			.leftJoin(qProductBoard.products, qProduct).fetchJoin()
-			.where(getCondition(search));
+			.where(condition);
 
-		JPQLQuery<Long> countQuery = queryFactory
-			.select(qProductBoard.count())
-			.from(qProductBoard)
-			.where(getCondition(search));
+		int total = queryFactory.selectFrom(qProductBoard)
+			.where(condition)
+			.fetch().size();
 
 		List<ProductBoard> result = query
 			.orderBy(qProductBoard.idx.desc())
 			.offset(pageable.getOffset())
 			.limit(pageable.getPageSize())
 			.fetch();
 
-		long count = countQuery.fetch().size();
-
-		return new PageImpl<>(result, pageable, count);
+		return new PageImpl<>(result, pageable, total);
 	}
 
 	@Override

backend/src/main/java/org/example/backend/domain/board/service/ProductBoardQueueService.java

@@ -0,0 +1,21 @@
+package org.example.backend.domain.board.service;
+
+import java.time.LocalDateTime;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class ProductBoardQueueService {
+	private final RestTemplate restTemplate;
+
+	public Boolean createQueue(Long productBoardIdx, LocalDateTime endedAt) {
+		String url = "/queue/create?productBoardIdx=" + productBoardIdx + "&endedAt=" + endedAt;
+		ResponseEntity<Boolean> result = restTemplate.getForEntity(url, Boolean.class);
+		return result.getBody();
+	}
+}

backend/src/main/java/org/example/backend/domain/board/service/ProductBoardService.java

@@ -3,10 +3,8 @@
 import java.io.IOException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -20,7 +18,6 @@
 import org.example.backend.domain.board.product.repository.ProductRepository;
 import org.example.backend.domain.board.repository.ProductBoardRepository;
 import org.example.backend.domain.board.repository.ProductThumbnailImageRepository;
-import org.example.backend.domain.likes.model.entity.Likes;
 import org.example.backend.domain.likes.repository.LikesRepository;
 import org.example.backend.global.common.constants.BaseResponseStatus;
 import org.example.backend.global.common.constants.BoardStatus;
@@ -29,8 +26,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.SliceImpl;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,6 +39,7 @@
 @Service
 @RequiredArgsConstructor
 public class ProductBoardService {
+	private final ProductBoardQueueService productBoardQueueService;
 	private final ProductBoardRepository productBoardRepository;
 	private final ProductRepository productRepository;
 	private final ProductThumbnailImageRepository productThumbnailImageRepository;
@@ -118,6 +114,11 @@ public void create(Long companyIdx, ProductBoardDto.BoardCreateRequest boardCrea
 		ProductBoard savedProductBoard = saveProductBoard(companyIdx, boardCreateRequest, thumbnailUrls.get(0), productDetailUrl);
 		List<Product> savedProducts = saveProduct(boardCreateRequest, savedProductBoard);
 		List<ProductThumbnailImage> productThumbnailImages = saveProductThumbnailImage(boardCreateRequest, thumbnailUrls, savedProductBoard);
+
+		Boolean isCreated = productBoardQueueService.createQueue(savedProductBoard.getIdx(), savedProductBoard.getEndedAt());
+		if (!isCreated) {
+			throw new InvalidCustomException(BaseResponseStatus.PRODUCT_BOARD_QUEUE_CREATE_FAIL);
+		}
 	}
 
 	// 판매자 게시글 조회

backend/src/main/java/org/example/backend/domain/orders/service/OrderQueueService.java

@@ -0,0 +1,34 @@
+package org.example.backend.domain.orders.service;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class OrderQueueService {
+    private final RestTemplate restTemplate;
+
+    private final String QUEUE_URL = "/queue";
+
+    public void exitQueue(Long boardIdx, Long userIdx) {
+        // 요청 본문을 Map으로 생성
+        Map<String, Long> requestBody = new HashMap<>();
+        requestBody.put("boardIdx", boardIdx);
+        requestBody.put("userIdx", userIdx);
+
+        // RestTemplate으로 POST 요청 전송
+        ResponseEntity<String> response = restTemplate.postForEntity(QUEUE_URL + "/delete", requestBody, String.class);
+
+        if (response.getStatusCode().is2xxSuccessful()) {
+            log.info("[Order Exit Queue] Queue deletion successful");
+        } else {
+           log.info("[Order Exit Queue] Failed to delete queue token");
+        }
+    }
+}

backend/src/main/java/org/example/backend/domain/orders/service/OrderService.java

@@ -40,6 +40,7 @@ public class OrderService {
     private final int COMPANY_PAGE_SIZE = 5;
     private final int USER_PAGE_SIZE = 3;
     private final PaymentService paymentService;
+    private final OrderQueueService orderQueueService;
 
     private final OrdersRepository ordersRepository;
     private final OrderedProductRepository orderedProductRepository;
@@ -49,7 +50,7 @@ public class OrderService {
     @Transactional
     public OrderCreateResponse register(User user, OrderRegisterRequest request) {
 
-        validateOrder(request);
+        validateOrder(request, user.getIdx());
 
         Orders order = OrderRegisterRequest.toEntity(request.getBoardIdx(), user);
         ordersRepository.save(order);
@@ -66,20 +67,27 @@ public OrderCreateResponse register(User user, OrderRegisterRequest request) {
     }
 
 
-    public void validateOrder(OrderRegisterRequest order){
+    public void validateOrder(OrderRegisterRequest order, Long userIdx){
 
         ProductBoard board = productBoardRepository.findById(order.getBoardIdx())
-                .orElseThrow(() -> new InvalidCustomException(ORDER_FAIL_EVENT_NOT_FOUND));
+                .orElseThrow(() -> {
+                    orderQueueService.exitQueue(order.getBoardIdx(), userIdx);
+                    return new InvalidCustomException(ORDER_FAIL_EVENT_NOT_FOUND);
+                });
 
         if (board.getEndedAt().isBefore(LocalDateTime.now())) {
             throw new InvalidCustomException(ORDER_FAIL_EXPIRED_EVENT); // 이벤트가 끝났을 때
         }
 
         order.getOrderedProducts().forEach((product) -> {
             Product orderdProduct = productRepository.findByIdWithLock(product.getIdx())
-                    .orElseThrow(() -> new InvalidCustomException(ORDER_FAIL_PRODUCT_NOT_FOUND)); // 해당하는 상품을 찾을 수가 없을 때
+                    .orElseThrow(() -> {
+                        orderQueueService.exitQueue(order.getBoardIdx(), userIdx);
+                        return new InvalidCustomException(ORDER_FAIL_PRODUCT_NOT_FOUND); // 해당하는 상품을 찾을 수가 없을 때
+                    });
 
             if (product.getQuantity() > orderdProduct.getStock()) {
+                orderQueueService.exitQueue(order.getBoardIdx(), userIdx);
                 throw new InvalidCustomException(ORDER_CREATE_FAIL_LACK_STOCK); // 재고 수량 없을 때
             }
         });
@@ -105,15 +113,18 @@ public void complete(User user, OrderCompleteRequest request) {
             order.getUser().deductPoints(order.getUsedPoint());
             order.setStatus(OrderStatus.ORDER_COMPLETE);
             ordersRepository.save(order);
+            orderQueueService.exitQueue(order.getBoardIdx(), user.getIdx());
 
         } catch (IamportResponseException | IOException e) { // 해당하는 결제 정보를 찾지 못했을 때
             order.setStatus(OrderStatus.ORDER_FAIL);
             ordersRepository.save(order);
+            orderQueueService.exitQueue(order.getBoardIdx(), user.getIdx());
             throw new InvalidCustomException(ORDER_PAYMENT_FAIL);
 
         } catch (InvalidCustomException e) { // 결제 검증 중 발생한 예외 처리
             order.setStatus(OrderStatus.ORDER_FAIL);
             ordersRepository.save(order);
+            orderQueueService.exitQueue(order.getBoardIdx(), user.getIdx());
             throw e;
         }
     }
@@ -129,6 +140,7 @@ public void cancel(User user, Long idx) {
 
         if (order.getStatus() !=  OrderStatus.ORDER_COMPLETE) {
             ordersRepository.delete(order);
+            orderQueueService.exitQueue(order.getBoardIdx(), user.getIdx());
             return;
         }
 

backend/src/main/java/org/example/backend/domain/user/model/dto/UserDto.java

@@ -166,6 +166,7 @@ public Delivery toDeliveryEntity(User user){
     @AllArgsConstructor
     @Builder
     public static class UserDetailResponse{
+        private Long userIdx;
         private String name;
         private String email;
         private String address;

backend/src/main/java/org/example/backend/domain/user/model/entity/User.java

@@ -70,6 +70,7 @@ public void earnPoints(Long point) {
 
     public UserDto.UserDetailResponse toUserDetailResponse(){
         return UserDto.UserDetailResponse.builder()
+                .userIdx(this.idx)
                 .name(this.name)
                 .email(this.email)
                 .address(this.address)

backend/src/main/java/org/example/backend/global/aop/MethodExcutionTimer.java

@@ -0,0 +1,34 @@
+package org.example.backend.global.aop;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StopWatch;
+
+@Aspect
+@Component
+public class MethodExcutionTimer {
+	private static final Logger logger = LoggerFactory.getLogger(MethodExcutionTimer.class);
+
+	//특정 어노테이션이 달려있는 메소드들 만 하고 싶다. -> custom annotation 만듦
+	@Pointcut("@annotation(org.example.backend.global.common.annotation.Timer)")
+	private void timerPointcut(){
+	}
+
+	@Around("timerPointcut()")
+	public Object traceTIme(ProceedingJoinPoint joinPoint) throws Throwable {
+		StopWatch stopWatch = new StopWatch();
+
+		try {
+			stopWatch.start();
+			return joinPoint.proceed(); // 실제 객체의 메소드 실행
+		}finally {
+			stopWatch.stop();
+			logger.info("{} - 시간 - {}s", joinPoint.getSignature().toString(), stopWatch.getTotalTimeMillis());
+		}
+	}
+}

backend/src/main/java/org/example/backend/global/common/annotation/Timer.java

@@ -0,0 +1,11 @@
+package org.example.backend.global.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Timer {
+}

backend/src/main/java/org/example/backend/global/common/constants/BaseResponseStatus.java

@@ -125,6 +125,7 @@ public enum BaseResponseStatus {
     PRODUCT_BOARD_REMOVE_FAIL_START_TIME_PASSED(false, 4050, "상품게시글 삭제에 실패했습니다. 시작 시간이 이미 지나 게시글을 삭제할 수 없습니다."),
     PRODUCT_BOARD_LIST_FAIL(false, 4100, "상품게시글 조회에 실패했습니다."),
     PRODUCT_BOARD_DETAIL_FAIL(false, 4200, "상품 상세 조회에 실패했습니다."),
+    PRODUCT_BOARD_QUEUE_CREATE_FAIL(false, 4300, "대기열 생성에 실패했습니다."),
 
     // 관심 기능 5000
     LIKES_REGISTER_FAIL(false, 5000, "관심게시글 등록에 실패했습니다."),

backend/src/main/java/org/example/backend/global/infra/network/config/RestTemplateConfig.java

@@ -0,0 +1,20 @@
+package org.example.backend.global.infra.network.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+	@Value("${domain}")
+	private String domain;
+
+	@Bean
+	public RestTemplate restTemplate(RestTemplateBuilder builder) {
+		return builder
+			.rootUri(domain)
+			.build();
+	}
+}

backend/src/main/resources/application.yml

@@ -127,8 +127,7 @@ server:
     encoding:
       charset: UTF-8
       force: true
-    context-path: ${CONTEXT_PATH}
+#    context-path: ${CONTEXT_PATH}
 
-# ex. https://www.dealivery.com
 domain: ${DOMAIN}