refactor: code smell 제거

C4-ComeTrue · Feb 24, 2024 · 893d60a · 893d60a
1 parent f0a79a5
commit 893d60a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/src/main/java/org/c4marathon/assignment/bankaccount/exception/AccountErrorCode.java b/src/main/java/org/c4marathon/assignment/bankaccount/exception/AccountErrorCode.java
@@ -16,6 +16,10 @@ public enum AccountErrorCode implements ErrorCode {
 	private final HttpStatus httpStatus;
 	private final String message;
 
+	public AccountException accountException() {
+		return new AccountException(getHttpStatus(), name(), getMessage());
+	}
+
 	public AccountException accountException(String debugMessage) {
 		return new AccountException(getHttpStatus(), name(), getMessage(), debugMessage);
 	}

diff --git a/src/main/java/org/c4marathon/assignment/bankaccount/exception/AccountException.java b/src/main/java/org/c4marathon/assignment/bankaccount/exception/AccountException.java
@@ -11,6 +11,14 @@ public class AccountException extends RuntimeException {
 	private final String errorMessage;
 	private final String debugMessage;
 
+	public AccountException(HttpStatus httpStatus, String errorName, String errorMessage) {
+		super(errorMessage);
+		this.httpStatus = httpStatus;
+		this.errorName = errorName;
+		this.errorMessage = errorMessage;
+		this.debugMessage = null;
+	}
+
 	public AccountException(HttpStatus httpStatus, String errorName, String errorMessage,
 		String debugMessage) {
 		super(errorMessage);

diff --git a/src/main/java/org/c4marathon/assignment/bankaccount/limit/ChargeLimitManager.java b/src/main/java/org/c4marathon/assignment/bankaccount/limit/ChargeLimitManager.java
@@ -13,7 +13,7 @@
 @Component
 @RequiredArgsConstructor
 public class ChargeLimitManager {
-	private final RedisTemplate redisTemplate;
+	private final RedisTemplate<Long, Long> redisTemplate;
 	private final MainAccountRepository mainAccountRepository;
 
 	public long get(long pk) {
@@ -22,11 +22,11 @@ public long get(long pk) {
 
 	public boolean charge(long pk, long money) {
 		Long limit = getChargeLimit(pk);
-		System.out.println("limit: " + limit);
+
 		if (limit >= money) {
 			limit -= money;
 			redisTemplate.opsForValue().set(pk, limit);
-			System.out.println("db limit: " + limit);
+
 			return true;
 		}
 		return false;

diff --git a/src/main/java/org/c4marathon/assignment/bankaccount/product/ProductManager.java b/src/main/java/org/c4marathon/assignment/bankaccount/product/ProductManager.java
@@ -21,7 +21,7 @@ public class ProductManager {
 	public List<SavingProductResponseDto> getProductInfo() {
 		List<SavingProduct> productList = savingProductRepository.findAll();
 		return productList.stream()
-			.map(product -> new SavingProductResponseDto(product))
+			.map(SavingProductResponseDto::new)
 			.toList();
 	}
 

diff --git a/src/main/java/org/c4marathon/assignment/bankaccount/service/MainAccountService.java b/src/main/java/org/c4marathon/assignment/bankaccount/service/MainAccountService.java
@@ -37,8 +37,7 @@ public long chargeMoney(long mainAccountPk, long money) {
 		}
 
 		MainAccount mainAccount = mainAccountRepository.findByPkForUpdate(mainAccountPk)
-			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException(
-				"존재하지 않는 계좌, mainAccountPk = " + mainAccountPk));
+			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException());
 
 		mainAccount.chargeMoney(money);
 		mainAccountRepository.save(mainAccount);
@@ -49,17 +48,15 @@ public long chargeMoney(long mainAccountPk, long money) {
 	@Transactional(isolation = Isolation.READ_COMMITTED)
 	public void sendToSavingAccount(long mainAccountPk, long savingAccountPk, long money) {
 		MainAccount mainAccount = mainAccountRepository.findByPkForUpdate(mainAccountPk)
-			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException(
-				"존재하지 않는 계좌, mainAccountPk = " + mainAccountPk));
+			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException());
 
 		if (!isSendValid(mainAccount.getMoney(), money)) {
 			throw AccountErrorCode.INVALID_MONEY_SEND.accountException(
 				"현재 잔고 부족, mainAccount.getMoney() = " + mainAccount.getMoney() + ", send money = " + money);
 		}
 
 		SavingAccount savingAccount = savingAccountRepository.findByPkForUpdate(savingAccountPk)
-			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException(
-				"존재하지 않는 계좌, savingAccountPk = " + savingAccountPk));
+			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException());
 		savingAccount.addMoney(money);
 		savingAccountRepository.save(savingAccount);
 
@@ -71,7 +68,7 @@ public MainAccountResponseDto getMainAccountInfo(long mainAccountPk) {
 		MainAccount mainAccount = mainAccountRepository.findById(mainAccountPk)
 			.orElseThrow(() -> AccountErrorCode.ACCOUNT_NOT_FOUND.accountException(
 				"존재하지 않는 계좌, mainAccountPk = " + mainAccountPk));
-		System.out.println(new MainAccountResponseDto(mainAccount));
+
 		return new MainAccountResponseDto(mainAccount);
 	}
 

diff --git a/src/main/java/org/c4marathon/assignment/member/interceptor/LoginInterceptor.java b/src/main/java/org/c4marathon/assignment/member/interceptor/LoginInterceptor.java
@@ -21,7 +21,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 		HttpSession session = request.getSession();
 		SessionMemberInfo memberInfo = (SessionMemberInfo)session.getAttribute(SessionConst.MEMBER_INFO);
 
-		if (session == null || memberInfo == null) {
+		if (memberInfo == null) {
 			HttpStatus httpStatus = CommonErrorCode.UNAUTHORIZED_USER.getHttpStatus();
 			String message = CommonErrorCode.UNAUTHORIZED_USER.getMessage();
 			ErrorResponse errorResponse = ErrorResponse.of(httpStatus, message);

diff --git a/src/test/java/org/c4marathon/assignment/SetContainerTest.java b/src/test/java/org/c4marathon/assignment/SetContainerTest.java
@@ -3,12 +3,10 @@
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.utility.DockerImageName;
 
 import com.redis.testcontainers.RedisContainer;
 
-@Testcontainers
 public class SetContainerTest {
 
 	private static final String REDIS_IMAGE = "redis:latest";