Dev

.gitignore

@@ -96,3 +96,5 @@ _workspace
 id_rsa
 id_ed25519
 comatching-ec2
+/AGENTS.md
+

chat-service/build.gradle

@@ -1,4 +1,4 @@
-plugins {
+ plugins {
     id 'java'
     id 'org.springframework.boot'
     id 'io.spring.dependency-management'

common-module/src/main/java/com/comatching/common/dto/member/AdminGiftCardUserProfileDto.java

@@ -0,0 +1,9 @@
+package com.comatching.common.dto.member;
+
+public record AdminGiftCardUserProfileDto(
+    Long id,
+    String email,
+    String realName,
+    String nickname
+) {
+}

gateway-service/src/main/resources/application-aws.yml

@@ -48,7 +48,14 @@ spring:
             - id: user-service-protected
               uri: http://user-service:9000
               predicates:
-                - Path=/api/auth/signup/profile, /api/auth/logout, /api/auth/password/change, /api/auth/withdraw, /api/members/**
+                - Path=/api/auth/signup/profile, /api/auth/logout, /api/auth/password/change, /api/auth/withdraw, /api/members/**, /api/notices/**
+              filters:
+                - AuthorizationHeaderFilter
+
+            - id: admin-user-notice
+              uri: http://user-service:9000
+              predicates:
+                - Path=/api/v1/admin/users, /api/v1/admin/users/**, /api/v1/admin/notices, /api/v1/admin/notices/**
               filters:
                 - AuthorizationHeaderFilter
 

gateway-service/src/main/resources/application.yml

@@ -49,7 +49,7 @@ spring:
             - id: user-service-protected
               uri: http://localhost:9000
               predicates:
-                - Path=/api/auth/signup/profile, /api/auth/logout, /api/auth/password/change, /api/auth/withdraw, /api/members/**
+                - Path=/api/auth/signup/profile, /api/auth/logout, /api/auth/password/change, /api/auth/withdraw, /api/members/**, /api/notices/**
               filters:
                 - AuthorizationHeaderFilter
 
@@ -91,7 +91,7 @@ spring:
             - id: item-service
               uri: http://localhost:9006
               predicates:
-                - Path=/api/items/**, /api/v1/**
+                - Path=/api/items/**
               filters:
                 - AuthorizationHeaderFilter
 
@@ -101,6 +101,22 @@ spring:
                 - Path=/api/fcm/**
               filters:
                 - AuthorizationHeaderFilter
+
+            - id: admin-user-notice
+              uri: http://localhost:9000
+              predicates:
+                - Path=/api/v1/admin/users, /api/v1/admin/users/**, /api/v1/admin/notices, /api/v1/admin/notices/**
+              filters:
+                - AuthorizationHeaderFilter
+
+            - id: admin-payment-product-items
+              uri: http://localhost:9006
+              predicates:
+                - Path=/api/v1/admin/shop/**, /api/v1/admin/payment/**, /api/v1/admin/roulette/**
+              filters:
+                - AuthorizationHeaderFilter
+
+
           default-filters:
             - DedupeResponseHeader=Access-Control-Allow-Origin Access-Control-Allow-Credentials, RETAIN_FIRST
 
@@ -133,4 +149,4 @@ management:
         http.server.requests: true
         spring.kafka.listener: true
       slo:
-        http.server.requests: 50ms,100ms,200ms,500ms,1s,2s
+        http.server.requests: 50ms,100ms,200ms,500ms,1s,2s

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminInventoryAdjustmentService.java

@@ -5,11 +5,9 @@
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import com.comatching.common.annotation.DistributedLock;
 import com.comatching.common.exception.BusinessException;
-import com.comatching.common.exception.code.GeneralErrorCode;
 import com.comatching.item.domain.admin.dto.AdminInventoryAction;
 import com.comatching.item.domain.admin.dto.AdminInventoryUpdateRequest;
 import com.comatching.item.domain.item.entity.Item;
@@ -26,15 +24,13 @@
 public class AdminInventoryAdjustmentService {
 
 	private static final LocalDateTime NO_EXPIRATION = LocalDateTime.of(2099, 12, 31, 23, 59, 59);
-	private static final int MAX_REASON_LENGTH = 255;
 
 	private final ItemRepository itemRepository;
 	private final ItemHistoryService historyService;
 
+	// request 검증은 이 파이프라인의 첫 단계인 AdminInventoryDedupeService.reserveOrThrow에서 이미 끝난 상태로 호출된다
 	@DistributedLock(key = "item:inventory", identifier = "#memberId + ':' + #request.itemType()", leaseTime = 10L)
 	public void adjust(Long adminId, Long memberId, AdminInventoryUpdateRequest request) {
-		validateRequest(request);
-
 		if (request.action() == AdminInventoryAction.ADD) {
 			addInventory(memberId, request);
 			saveAdminHistory(adminId, memberId, request, request.quantity());
@@ -85,11 +81,4 @@ private void saveAdminHistory(Long adminId, Long memberId, AdminInventoryUpdateR
 			"관리자 조정(adminId=" + adminId + "): " + request.reason()
 		);
 	}
-
-	private void validateRequest(AdminInventoryUpdateRequest request) {
-		if (request == null || request.itemType() == null || request.action() == null || request.quantity() <= 0
-			|| !StringUtils.hasText(request.reason()) || request.reason().length() > MAX_REASON_LENGTH) {
-			throw new BusinessException(GeneralErrorCode.INVALID_INPUT_VALUE);
-		}
-	}
 }

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminInventoryDedupeService.java

@@ -5,10 +5,8 @@
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import com.comatching.common.exception.BusinessException;
-import com.comatching.common.exception.code.GeneralErrorCode;
 import com.comatching.item.domain.admin.dto.AdminInventoryUpdateRequest;
 import com.comatching.item.global.exception.ItemErrorCode;
 
@@ -19,13 +17,14 @@
 public class AdminInventoryDedupeService {
 
 	private static final long DEDUPE_TTL_SECONDS = 3L;
-	private static final int MAX_REASON_LENGTH = 255;
 	private static final String DEDUPE_KEY_PREFIX = "admin:inventory:dedupe";
 
 	private final RedissonClient redissonClient;
+	private final AdminInventoryRequestValidator requestValidator;
 
 	public void reserveOrThrow(Long memberId, AdminInventoryUpdateRequest request) {
-		validateRequest(request);
+		// 이 파이프라인의 첫 단계라 여기서만 검증한다 - adjust()는 항상 이 메서드 통과 후에만 호출된다
+		requestValidator.validate(request);
 
 		String key = String.join(":",
 			DEDUPE_KEY_PREFIX,
@@ -42,11 +41,4 @@ public void reserveOrThrow(Long memberId, AdminInventoryUpdateRequest request) {
 			throw new BusinessException(ItemErrorCode.DUPLICATE_ADMIN_INVENTORY_ADJUSTMENT);
 		}
 	}
-
-	private void validateRequest(AdminInventoryUpdateRequest request) {
-		if (request == null || request.itemType() == null || request.action() == null || request.quantity() <= 0
-			|| !StringUtils.hasText(request.reason()) || request.reason().length() > MAX_REASON_LENGTH) {
-			throw new BusinessException(GeneralErrorCode.INVALID_INPUT_VALUE);
-		}
-	}
 }

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminInventoryRequestValidator.java

@@ -0,0 +1,21 @@
+package com.comatching.item.domain.admin.service;
+
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import com.comatching.common.exception.BusinessException;
+import com.comatching.common.exception.code.GeneralErrorCode;
+import com.comatching.item.domain.admin.dto.AdminInventoryUpdateRequest;
+
+@Component
+public class AdminInventoryRequestValidator {
+
+	private static final int MAX_REASON_LENGTH = 255;
+
+	public void validate(AdminInventoryUpdateRequest request) {
+		if (request == null || request.itemType() == null || request.action() == null || request.quantity() <= 0
+			|| !StringUtils.hasText(request.reason()) || request.reason().length() > MAX_REASON_LENGTH) {
+			throw new BusinessException(GeneralErrorCode.INVALID_INPUT_VALUE);
+		}
+	}
+}

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminItemCommandService.java

@@ -0,0 +1,20 @@
+package com.comatching.item.domain.admin.service;
+
+import org.springframework.stereotype.Service;
+
+import com.comatching.item.domain.admin.dto.AdminInventoryUpdateRequest;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AdminItemCommandService {
+
+	private final AdminInventoryDedupeService adminInventoryDedupeService;
+	private final AdminInventoryAdjustmentService adminInventoryAdjustmentService;
+
+	public void adjustInventory(Long adminId, Long memberId, AdminInventoryUpdateRequest request) {
+		adminInventoryDedupeService.reserveOrThrow(memberId, request);
+		adminInventoryAdjustmentService.adjust(adminId, memberId, request);
+	}
+}

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminItemQueryService.java

@@ -0,0 +1,44 @@
+package com.comatching.item.domain.admin.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.comatching.common.domain.enums.ItemType;
+import com.comatching.item.domain.admin.dto.AdminInventoryCounts;
+import com.comatching.item.domain.item.repository.ItemRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class AdminItemQueryService {
+	private final ItemRepository itemRepository;
+
+	public Map<Long, AdminInventoryCounts> getInventoryCounts(List<Long> memberIds) {
+		if (memberIds == null || memberIds.isEmpty()) {
+			return Map.of();
+		}
+
+		Map<Long, long[]> countsByMemberId = new HashMap<>();
+		for (ItemRepository.MemberItemQuantity quantity : itemRepository.sumUsableQuantityByMemberIds(memberIds)) {
+			long[] counts = countsByMemberId.computeIfAbsent(quantity.getMemberId(), ignored -> new long[2]);
+			if (quantity.getItemType() == ItemType.MATCHING_TICKET) {
+				counts[0] = quantity.getQuantity();
+			}
+			if (quantity.getItemType() == ItemType.OPTION_TICKET) {
+				counts[1] = quantity.getQuantity();
+			}
+		}
+
+		Map<Long, AdminInventoryCounts> result = new HashMap<>();
+		countsByMemberId.forEach((memberId, counts) ->
+			result.put(memberId, new AdminInventoryCounts(counts[0], counts[1]))
+		);
+		return result;
+	}
+}

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminRouletteService.java

@@ -0,0 +1,14 @@
+package com.comatching.item.domain.admin.service;
+
+import java.util.List;
+
+import com.comatching.item.domain.roulette.dto.response.AdminGiftCardWinnerResponse;
+
+public interface AdminRouletteService {
+
+    /** 아직 지급되지 않은 상품권 당첨자와 관리자 확인용 회원 정보를 반환한다. */
+    List<AdminGiftCardWinnerResponse> getUnpaidGiftCardWinners();
+
+    /** 관리자가 실제 상품권 지급을 끝낸 당첨 이력을 지급 완료 상태로 변경한다. */
+    void markGiftCardAsGranted(Long historyId);
+}

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminRouletteServiceImpl.java

@@ -0,0 +1,92 @@
+package com.comatching.item.domain.admin.service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.comatching.common.dto.member.AdminGiftCardUserProfileDto;
+import com.comatching.common.exception.BusinessException;
+import com.comatching.common.exception.code.GeneralErrorCode;
+import com.comatching.item.domain.roulette.dto.response.AdminGiftCardWinnerResponse;
+import com.comatching.item.domain.roulette.entity.RouletteHistory;
+import com.comatching.item.domain.roulette.enums.RewardType;
+import com.comatching.item.domain.roulette.repository.RouletteHistoryRepository;
+import com.comatching.item.global.exception.ItemErrorCode;
+import com.comatching.item.infra.client.UserAdminClient;
+
+import feign.FeignException;
+import feign.codec.DecodeException;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AdminRouletteServiceImpl implements AdminRouletteService {
+
+    private final RouletteHistoryRepository rouletteHistoryRepository;
+    private final UserAdminClient userAdminClient;
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<AdminGiftCardWinnerResponse> getUnpaidGiftCardWinners() {
+        // rewardType이 GIFT_CARD이고 rewardGranted가 false인 이력만 최신순으로 가져온다.
+        List<RouletteHistory> histories = rouletteHistoryRepository
+            .findAllByReward_RewardTypeAndRewardGrantedFalseOrderByParticipatedAtDesc(RewardType.GIFT_CARD);
+
+        // 미지급 당첨자가 없으면 user-service를 호출하지 않고 빈 명단을 반환한다.
+        if (histories.isEmpty()) { return List.of(); }
+
+        // user-service에서 받은 회원 목록을 memberId로 찾을 수 있게 만들어 각 당첨 이력에 회원 정보를 붙인다.
+        Map<Long, AdminGiftCardUserProfileDto> usersById = getUsersByMemberId(histories);
+
+        // 가져온 유저 정보 당첨 정보와 매핑
+        return histories.stream()
+            .filter(history -> usersById.containsKey(history.getMemberId()))
+            .map(history -> AdminGiftCardWinnerResponse.from(
+                history,
+                usersById.get(history.getMemberId())
+            ))
+            .toList();
+    }
+
+    @Override
+    @Transactional
+    public void markGiftCardAsGranted(Long historyId) {
+        // 같은 당첨 이력에 대한 동시 요청을 직렬화해 지급 완료 상태가 중복 처리되지 않게 한다.
+        RouletteHistory history = rouletteHistoryRepository.findByIdWithRewardForUpdate(historyId)
+            .orElseThrow(() -> new BusinessException(GeneralErrorCode.NOT_FOUND));
+
+        // 예외처리
+        if (history.getReward().getRewardType() != RewardType.GIFT_CARD) {
+            // 일반 아이템, 풀세트, 꽝 이력은 상품권 지급 완료 대상으로 사용할 수 없다.
+            throw new BusinessException(GeneralErrorCode.INVALID_INPUT_VALUE);
+        }
+
+        // 미지급 상태일경우 지급처리 완료
+        if (!history.isRewardGranted()) {
+            history.markRewardAsGranted();
+        }
+    }
+
+    private Map<Long, AdminGiftCardUserProfileDto> getUsersByMemberId(List<RouletteHistory> histories) {
+        // 같은 회원이 여러 상품권에 당첨됐어도 user-service에는 회원 ID를 한 번만 전달한다.
+        List<Long> memberIds = histories.stream()
+            .map(RouletteHistory::getMemberId)
+            .distinct()
+            .toList();
+
+        try {
+            // 당첨자별 단건 호출을 피하고 현재 미지급 명단의 회원 정보를 한 번에 조회한다.
+            return userAdminClient.getUsersByIds(memberIds).stream()
+                .collect(Collectors.toMap(AdminGiftCardUserProfileDto::id, Function.identity()));
+        } catch (DecodeException ignored) {
+            throw new BusinessException(ItemErrorCode.USER_QUERY_FAILED);
+        } catch (FeignException ignored) {
+            throw new BusinessException(ItemErrorCode.USER_QUERY_FAILED);
+        }
+    }
+
+}

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminUserItemService.java

@@ -1,5 +1,9 @@
 package com.comatching.item.domain.admin.service;
 
+/*
+ * Temporarily disabled with the item-service admin user API.
+ *
+
 import org.springframework.data.domain.Pageable;
 
 import com.comatching.common.dto.response.PagingResponse;
@@ -15,3 +19,4 @@ public interface AdminUserItemService {
 
 	void updateUserInventory(Long adminId, Long memberId, AdminInventoryUpdateRequest request);
 }
+*/

item-service/src/main/java/com/comatching/item/domain/admin/service/AdminUserItemServiceImpl.java

@@ -1,5 +1,9 @@
 package com.comatching.item.domain.admin.service;
 
+/*
+ * Temporarily disabled with the item-service admin user API.
+ *
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -159,3 +163,4 @@ private List<String> toSortParams(Sort sort) {
 			.toList();
 	}
 }
+*/