Refactor/jira kan 67 지갑 거래내역 관리 new

build.gradle

@@ -48,6 +48,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'             // JUnit 플랫폼 런처 (테스트 실행 환경 제공)
     testImplementation "org.testcontainers:testcontainers:1.19.2"            // Docker 기반 통합 테스트 지원 (Testcontainers 기본 라이브러리)
     testImplementation "org.testcontainers:junit-jupiter:1.19.2"             // JUnit 5(Testcontainers 연동) 지원
+    testImplementation 'org.testcontainers:postgresql:1.19.2'
 
     // 데이터베이스
     runtimeOnly 'com.h2database:h2'                                          // 인메모리 데이터베이스a H2 (테스트 및 개발 환경용)
@@ -67,6 +68,11 @@ dependencies {
     // AWS
     implementation 'software.amazon.awssdk:kms:2.20.0'                       // AWS KMS 의존성
 
+    // RabbitMQ
+    implementation 'org.springframework.boot:spring-boot-starter-amqp'
+    testImplementation 'org.springframework.amqp:spring-rabbit-test'
+    testImplementation 'org.testcontainers:rabbitmq'
+
     // 기타
     compileOnly 'org.projectlombok:lombok'                                   // Lombok (Getter, Setter, Constructor 자동 생성)
     annotationProcessor 'org.projectlombok:lombok'                           // Lombok 사용을 위한 어노테이션 프로세서

docker-compose.yml

@@ -49,6 +49,24 @@ services:
     environment:
       - INFLUXDB_DB=k6
 
+  rabbitmq:
+    image: rabbitmq:3.12-management
+    container_name: rabbitmq
+    restart: always
+    networks:
+      - monitoring
+    ports:
+      - "5672:5672"
+      - "15673:15672"
+    environment:
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    healthcheck:
+      test: [ "CMD", "rabbitmq-diagnostics", "-q", "ping" ]
+      interval: 10s
+      timeout: 10s
+      retries: 5
+
   # 🔹 Grafana (InfluxDB 데이터 시각화)
   grafana:
     image: grafana/grafana:9.3.8
@@ -96,7 +114,6 @@ services:
     ports:
       - "9090:8080"
     environment:
-      - SPRING_PROFILES_ACTIVE=docker
       - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres-db:5432/xchangepass
       - SPRING_DATASOURCE_USERNAME=postgres
       - SPRING_DATASOURCE_PASSWORD=postgres

src/main/java/bumblebee/xchangepass/domain/card/controller/CardController.java

@@ -5,7 +5,7 @@
 import bumblebee.xchangepass.domain.card.dto.response.DetailedCardInfoResponse;
 import bumblebee.xchangepass.domain.card.service.CardService;
 import bumblebee.xchangepass.global.error.ErrorCode;
-import bumblebee.xchangepass.global.security.jwt.JwtUtil;
+import bumblebee.xchangepass.global.security.jwt.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -17,6 +17,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -40,8 +41,8 @@ public class CardController {
     })
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping("/physical")
-    public void generatePhysicalCard(Authentication authentication) {
-        cardService.generatePhysicalCard(JwtUtil.getLoginId(authentication));
+    public void generatePhysicalCard(@AuthenticationPrincipal CustomUserDetails user) {
+        cardService.generatePhysicalCard(user.getUserId());
     }
 
     @Operation(summary = "카드 상태 변경", description = "현재 로그인한 사용자의 카드 상태를 변경합니다.")
@@ -56,9 +57,9 @@ public void generatePhysicalCard(Authentication authentication) {
     })
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PutMapping("/status")
-    public void changeCardStatus(Authentication authentication,
+    public void changeCardStatus(@AuthenticationPrincipal CustomUserDetails user,
                                  @RequestBody @Valid ChangeCardStatusRequest request) {
-        cardService.changeCardStatus(JwtUtil.getLoginId(authentication), request);
+        cardService.changeCardStatus(user.getUserId(), request);
     }
 
     @Operation(summary = "보유 카드 목록 조회", description = "현재 로그인한 사용자의 보유 카드 목록을 조회합니다.")
@@ -73,8 +74,8 @@ public void changeCardStatus(Authentication authentication,
     })
     @ResponseStatus(HttpStatus.OK)
     @GetMapping
-    public List<BasicCardInfoResponse> getBasicCardInfo(Authentication authentication) {
-        return cardService.getBasicCardInfo(JwtUtil.getLoginId(authentication));
+    public List<BasicCardInfoResponse> getBasicCardInfo(@AuthenticationPrincipal CustomUserDetails user) {
+        return cardService.getBasicCardInfo(user.getUserId());
     }
 
     @Operation(summary = "카드 상세 정보 조회", description = "특정 카드의 상세 정보를 조회합니다.")

src/main/java/bumblebee/xchangepass/domain/card/entity/Card.java

@@ -1,6 +1,6 @@
 package bumblebee.xchangepass.domain.card.entity;
 
-import bumblebee.xchangepass.domain.wallet.entity.Wallet;
+import bumblebee.xchangepass.domain.wallet.wallet.entity.Wallet;
 import bumblebee.xchangepass.global.common.EncryptionData;
 import jakarta.persistence.*;
 import lombok.Builder;

src/main/java/bumblebee/xchangepass/domain/card/service/CardService.java

@@ -8,7 +8,7 @@
 import bumblebee.xchangepass.domain.card.repository.CardRepository;
 import bumblebee.xchangepass.domain.user.entity.User;
 import bumblebee.xchangepass.domain.user.repository.UserRepository;
-import bumblebee.xchangepass.domain.wallet.entity.Wallet;
+import bumblebee.xchangepass.domain.wallet.wallet.entity.Wallet;
 import bumblebee.xchangepass.global.error.ErrorCode;
 import bumblebee.xchangepass.global.exception.CommonException;
 import bumblebee.xchangepass.global.security.crypto.AESEncryption;

src/main/java/bumblebee/xchangepass/domain/exchangeTransaction/controller/ExchangeTransactionController.java

@@ -3,7 +3,7 @@
 import bumblebee.xchangepass.domain.exchangeTransaction.dto.request.ExchangeRequestDTO;
 import bumblebee.xchangepass.domain.exchangeTransaction.dto.response.ExchangeResponseDTO;
 import bumblebee.xchangepass.domain.exchangeTransaction.service.ExchangeTransactionService;
-import bumblebee.xchangepass.global.security.jwt.JwtUtil;
+import bumblebee.xchangepass.global.security.jwt.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -14,6 +14,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.ErrorResponse;
 import org.springframework.web.bind.annotation.*;
 
@@ -42,8 +43,8 @@ public class ExchangeTransactionController {
     })
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/create")
-    public ExchangeResponseDTO createTransaction(@RequestBody ExchangeRequestDTO request, Authentication authentication) {
-        return exchangeService.createTransaction(request, JwtUtil.getLoginId(authentication));
+    public ExchangeResponseDTO createTransaction(@RequestBody ExchangeRequestDTO request, @AuthenticationPrincipal CustomUserDetails user) {
+        return exchangeService.createTransaction(request, user.getUserId());
     }
 
 
@@ -65,7 +66,7 @@ public ExchangeResponseDTO createTransaction(@RequestBody ExchangeRequestDTO req
     })
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/execute")
-    public ExchangeResponseDTO executeTransaction(@RequestParam Long transactionId, Authentication authentication) {
-        return exchangeService.executeTransaction(transactionId, JwtUtil.getLoginId(authentication));
+    public ExchangeResponseDTO executeTransaction(@RequestParam Long transactionId, @AuthenticationPrincipal CustomUserDetails user) {
+        return exchangeService.executeTransaction(transactionId, user.getUserId());
     }
 }

src/main/java/bumblebee/xchangepass/domain/exchangeTransaction/service/ExchangeTransactionService.java

@@ -9,12 +9,12 @@
 import bumblebee.xchangepass.domain.exchangeTransaction.repository.ExchangeTransactionRepository;
 import bumblebee.xchangepass.domain.user.entity.User;
 import bumblebee.xchangepass.domain.user.repository.UserRepository;
-import bumblebee.xchangepass.domain.wallet.dto.request.WalletInOutRequest;
-import bumblebee.xchangepass.domain.wallet.entity.Wallet;
-import bumblebee.xchangepass.domain.wallet.service.WalletService;
-import bumblebee.xchangepass.domain.walletBalance.entity.WalletBalance;
-import bumblebee.xchangepass.domain.walletBalance.repository.WalletBalanceRepository;
-import bumblebee.xchangepass.domain.walletBalance.service.WalletBalanceService;
+import bumblebee.xchangepass.domain.wallet.balance.entity.WalletBalance;
+import bumblebee.xchangepass.domain.wallet.balance.repository.WalletBalanceRepository;
+import bumblebee.xchangepass.domain.wallet.balance.service.WalletBalanceService;
+import bumblebee.xchangepass.domain.wallet.wallet.dto.request.WalletInOutRequest;
+import bumblebee.xchangepass.domain.wallet.wallet.entity.Wallet;
+import bumblebee.xchangepass.domain.wallet.wallet.service.WalletService;
 import bumblebee.xchangepass.global.error.ErrorCode;
 import bumblebee.xchangepass.global.exception.CommonException;
 import lombok.RequiredArgsConstructor;
@@ -110,14 +110,14 @@ public ExchangeResponseDTO executeTransaction(Long transactionId, Long userId) {
 
         if (fromBalance.getBalance().compareTo(amount) < 0) {
             WalletInOutRequest chargeRequest = WalletInOutRequest.builder()
-                    .userId(userId)
+//                    .userId(userId)
                     .fromCurrency(Currency.getInstance(fromCurrency))
                     .toCurrency(Currency.getInstance(fromCurrency))
                     .amount(amount)
                     .chargeDatetime(LocalDateTime.now())
                     .build();
 
-            walletService.charge(chargeRequest);
+//            walletService.charge(chargeRequest);
         }
 
         WalletBalance toBalance = getOrCreateBalance(wallet, toCurrency);

src/main/java/bumblebee/xchangepass/domain/refresh/RefreshTokenController.java → src/main/java/bumblebee/xchangepass/domain/refresh/controller/RefreshTokenController.java

@@ -1,6 +1,7 @@
-package bumblebee.xchangepass.domain.refresh;
+package bumblebee.xchangepass.domain.refresh.controller;
 
 import bumblebee.xchangepass.domain.refresh.dto.RefreshTokenRequest;
+import bumblebee.xchangepass.domain.refresh.service.RefreshTokenService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -43,7 +44,6 @@ public class RefreshTokenController {
     @ResponseStatus(HttpStatus.OK)
     @PostMapping("/token-refresh")
     public void tokenRefresh(@RequestBody @Valid RefreshTokenRequest request) {
-        // token 재발급
         refreshTokenService.refreshToken(request.refreshToken());
     }
 

src/main/java/bumblebee/xchangepass/domain/refresh/RefreshToken.java → src/main/java/bumblebee/xchangepass/domain/refresh/entity/RefreshToken.java

@@ -1,4 +1,4 @@
-package bumblebee.xchangepass.domain.refresh;
+package bumblebee.xchangepass.domain.refresh.entity;
 
 import bumblebee.xchangepass.global.error.ErrorCode;
 import lombok.AccessLevel;

src/main/java/bumblebee/xchangepass/domain/refresh/RefreshTokenRepository.java → src/main/java/bumblebee/xchangepass/domain/refresh/repository/RefreshTokenRepository.java

@@ -1,21 +1,20 @@
-package bumblebee.xchangepass.domain.refresh;
+package bumblebee.xchangepass.domain.refresh.repository;
 
 import bumblebee.xchangepass.global.error.ErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Repository;
 
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import static bumblebee.xchangepass.global.common.Constants.REFRESH_TOKEN_TTL;
+
 @Repository
 @RequiredArgsConstructor
 public class RefreshTokenRepository {
 
     private final RedisTemplate<String, Object> jsonRedisTemplate;
 
-    private static final Long REFRESH_TOKEN_TTL = 24 * 60 * 60L; // 24시간 (초 단위)
-
     /**
      * Refresh Token 저장 (사용자당 하나만 유지, 기존 토큰 자동 삭제)
      */

src/main/java/bumblebee/xchangepass/domain/refresh/RefreshTokenService.java → src/main/java/bumblebee/xchangepass/domain/refresh/service/RefreshTokenService.java

@@ -1,5 +1,6 @@
-package bumblebee.xchangepass.domain.refresh;
+package bumblebee.xchangepass.domain.refresh.service;
 
+import bumblebee.xchangepass.domain.refresh.repository.RefreshTokenRepository;
 import bumblebee.xchangepass.global.error.ErrorCode;
 import bumblebee.xchangepass.global.security.jwt.JwtProvider;
 import bumblebee.xchangepass.domain.refresh.dto.RefreshTokenResponse;

src/main/java/bumblebee/xchangepass/domain/user/controller/UserController.java

@@ -4,8 +4,8 @@
 import bumblebee.xchangepass.domain.user.dto.request.UserUpdateRequest;
 import bumblebee.xchangepass.domain.user.dto.response.UserResponse;
 import bumblebee.xchangepass.domain.user.service.UserService;
-import bumblebee.xchangepass.global.security.jwt.JwtUtil;
 import bumblebee.xchangepass.domain.user.service.UserRegisterService;
+import bumblebee.xchangepass.global.security.jwt.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
@@ -17,6 +17,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.ErrorResponse;
 import org.springframework.web.bind.annotation.*;
 
@@ -64,8 +65,8 @@ public void signup(@RequestBody @Valid UserRegisterRequest request) {
     })
     @ResponseStatus(HttpStatus.OK)
     @GetMapping
-    public UserResponse read(Authentication authentication){
-        return userService.readUser(JwtUtil.getLoginId(authentication));
+    public UserResponse read(@AuthenticationPrincipal CustomUserDetails user){
+        return userService.readUser(user.getUserId());
     }
 
 
@@ -87,9 +88,9 @@ public UserResponse read(Authentication authentication){
     })
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PutMapping
-    public void update(Authentication authentication,
+    public void update(@AuthenticationPrincipal CustomUserDetails user,
                        @RequestBody @Valid UserUpdateRequest request) {
-        userService.updateUser(JwtUtil.getLoginId(authentication), request);
+        userService.updateUser(user.getUserId(), request);
     }
 
 
@@ -104,7 +105,7 @@ public void update(Authentication authentication,
     })
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @DeleteMapping
-    public void softDeleteUser(Authentication authentication) {
-        userService.softDeleteUser(JwtUtil.getLoginId(authentication));
+    public void softDeleteUser(@AuthenticationPrincipal CustomUserDetails user) {
+        userService.softDeleteUser(user.getUserId());
     }
 }

src/main/java/bumblebee/xchangepass/domain/user/entity/User.java

@@ -2,7 +2,7 @@
 
 import bumblebee.xchangepass.domain.exchangeTransaction.entitiy.ExchangeTransaction;
 import bumblebee.xchangepass.domain.user.entity.value.*;
-import bumblebee.xchangepass.domain.wallet.entity.Wallet;
+import bumblebee.xchangepass.domain.wallet.wallet.entity.Wallet;
 import jakarta.persistence.*;
 import lombok.Builder;
 import lombok.Getter;

src/main/java/bumblebee/xchangepass/domain/user/login/LoginService.java

@@ -6,7 +6,7 @@
 import bumblebee.xchangepass.global.security.jwt.JwtProvider;
 import bumblebee.xchangepass.domain.user.login.dto.request.LoginRequest;
 import bumblebee.xchangepass.domain.user.login.dto.response.LoginResponse;
-import bumblebee.xchangepass.domain.refresh.RefreshTokenRepository;
+import bumblebee.xchangepass.domain.refresh.repository.RefreshTokenRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -26,7 +26,6 @@ public class LoginService{
 
     @Transactional
     public LoginResponse login(final LoginRequest request) {
-        System.out.println("loginRequestDTO = " + request);
         // 사용자 정보 조회
         UserLoginResponse userInfo = userService.readUserByUserEmail(request.userEmail());
 

src/main/java/bumblebee/xchangepass/domain/user/repository/UserRepository.java

@@ -14,7 +14,7 @@
 public interface UserRepository extends JpaRepository<User, Long>, UserRepositoryCustom {
 
     @Query(value = "SELECT m FROM User m WHERE m.userEmail.value=:email")
-    Optional<User> findByUserEmail(String email);
+    Optional<User> findByUserEmail(@Param("email") String email);
 
     @Modifying
     @Query(value = """
@@ -29,5 +29,13 @@ public interface UserRepository extends JpaRepository<User, Long>, UserRepositor
             FROM User u
             WHERE u.userId = :userId
             """)
-    Optional<User> findByUserId(Long userId);
+    Optional<User> findByUserId(@Param("userId") Long userId);
+
+    @Query(value = """
+            SELECT u
+            FROM User u
+            WHERE u.userName.value = :userName and u.userPhoneNumber.value=:userPhoneNumber
+            """)
+    Optional<User> findByUserId(@Param("userName") String userName, @Param("userPhoneNumber") String userPhoneNumber);
+
 }

src/main/java/bumblebee/xchangepass/domain/user/service/UserRegisterService.java

@@ -3,8 +3,8 @@
 import bumblebee.xchangepass.domain.user.dto.request.UserRegisterRequest;
 import bumblebee.xchangepass.domain.user.entity.User;
 import bumblebee.xchangepass.domain.user.repository.UserRepository;
-import bumblebee.xchangepass.domain.user.service.NicknameGenerator;
-import bumblebee.xchangepass.domain.wallet.service.WalletService;
+import bumblebee.xchangepass.domain.wallet.wallet.service.impl.WalletServiceImpl;
+import bumblebee.xchangepass.domain.wallet.wallet.service.impl.lock.PessimisticLockWalletService;
 import bumblebee.xchangepass.global.error.ErrorCode;
 import bumblebee.xchangepass.global.exception.CommonException;
 import bumblebee.xchangepass.global.util.DuplicateKeyExceptionHandler;
@@ -20,7 +20,7 @@ public class UserRegisterService {
 
     private final UserRepository userRepository;
     private final NicknameGenerator nicknameGenerator;
-    private final WalletService walletService;
+    private final WalletServiceImpl walletService;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
     /**

src/main/java/bumblebee/xchangepass/domain/user/service/UserService.java

@@ -31,6 +31,11 @@ public UserResponse readUser(Long userId) {
         return new UserResponse(user);
     }
 
+    public User readUser(String userName, String userPhoneNumber) {
+        return userRepository.findByUserId(userName, userPhoneNumber)
+                .orElseThrow(ErrorCode.USER_NOT_FOUND::commonException);
+    }
+
     /**
      * ✅ 사용자 정보 수정
      */
@@ -74,10 +79,8 @@ public void deleteUserBatch(LocalDateTime thirtyDaysAgo) {
     }
 
     public UserLoginResponse readUserByUserId(String userId) {
-        System.out.println("userId = " + userId);
         User user = userRepository.findByUserId(Long.parseLong(userId))
                 .orElseThrow(ErrorCode.USER_NOT_FOUND::commonException);
-        System.out.println("user = " + user.toString());
         return UserLoginResponse.fromEntity(user);
     }