refactor: ProductPriceController 내부 null체크 간소화

LJHCS · LJHCS · commit 4c8ff73ed02b · 2025-03-30T14:00:30.000+09:00
diff --git a/src/main/java/com/moaguide/refactor/article/service/ArticleOverviewService.java b/src/main/java/com/moaguide/refactor/article/service/ArticleOverviewService.java
@@ -3,7 +3,7 @@
 import com.moaguide.refactor.article.dto.ArticleOverviewDto;
 import com.moaguide.refactor.article.repository.ArticleContentRepository;
 import com.moaguide.refactor.enums.ArticleCategory;
-import com.moaguide.refactor.util.TimeServie;
+import com.moaguide.refactor.util.TimeUtil;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,7 +22,7 @@ public class ArticleOverviewService {
 	// 인기 콘텐츠 (조회수 기준 정렬)
 	public List<ArticleOverviewDto> getPopularContents(int popularLimit) {
 		Pageable pageable = PageRequest.of(0, popularLimit, Sort.by(Sort.Direction.DESC, "views"));
-		return articleContentRepository.findContentsByViews(pageable, TimeServie.getNowTimestamp())
+		return articleContentRepository.findContentsByViews(pageable, TimeUtil.getNowTimestamp())
 			.getContent();
 	}
 
@@ -31,7 +31,7 @@ public List<ArticleOverviewDto> getRecentContents(int recentLimit) {
 		Pageable pageable = PageRequest.of(0, recentLimit,
 			Sort.by(Sort.Direction.DESC, "createdAt"));
 		return articleContentRepository.findContentsWithCategory(pageable,
-				TimeServie.getNowTimestamp())
+				TimeUtil.getNowTimestamp())
 			.getContent();
 	}
 
@@ -41,7 +41,7 @@ public List<ArticleOverviewDto> getNewsContents(ArticleCategory articleCategory,
 		Pageable pageable = PageRequest.of(0, newsLimit, Sort.by(Sort.Direction.DESC, "createdAt"));
 
 		return articleContentRepository.findByCategory(articleCategory.getId(), pageable,
-				TimeServie.getNowTimestamp())
+				TimeUtil.getNowTimestamp())
 			.getContent();
 	}
 }
diff --git a/src/main/java/com/moaguide/refactor/article/service/ArticleQueryService.java b/src/main/java/com/moaguide/refactor/article/service/ArticleQueryService.java
@@ -5,7 +5,7 @@
 import com.moaguide.refactor.article.repository.ArticleContentRepository;
 import com.moaguide.refactor.article.repository.ArticleLikeRepository;
 import com.moaguide.refactor.enums.ArticleCategory;
-import com.moaguide.refactor.util.TimeServie;
+import com.moaguide.refactor.util.TimeUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -27,19 +27,19 @@ public class ArticleQueryService {
 	public Page<ArticleQueryDto> getContentsByCategory(int categoryId, int page) {
 		Pageable pageable = PageRequest.of(page - 1, 5, Sort.by(Sort.Direction.DESC, "createdAt"));
 		return articleContentRepository.findByCategoryId(categoryId, pageable,
-				TimeServie.getNowTimestamp())
+				TimeUtil.getNowTimestamp())
 			.map(this::mapToContentDto);
 	}
 
 	// 전체 콘텐츠 조회
 	public Page<ArticleQueryDto> getContentsByAll(ArticleCategory articleCategory, int page) {
 		Pageable pageable = PageRequest.of(page - 1, 5, Sort.by(Sort.Direction.DESC, "createdAt"));
 		if (articleCategory == ArticleCategory.ALL) {
-			return articleContentRepository.findAllContent(pageable, TimeServie.getNowTimestamp())
+			return articleContentRepository.findAllContent(pageable, TimeUtil.getNowTimestamp())
 				.map(this::mapToContentDto);
 		} else {
 			return articleContentRepository.findByCategoryId(articleCategory.getId(), pageable,
-					TimeServie.getNowTimestamp())
+					TimeUtil.getNowTimestamp())
 				.map(this::mapToContentDto);
 		}
 	}
@@ -50,11 +50,11 @@ public Page<ArticleQueryDto> getContentsByType(String type, ArticleCategory arti
 		Pageable pageable = PageRequest.of(page - 1, 5, Sort.by(Sort.Direction.DESC, "createdAt"));
 		if (articleCategory == ArticleCategory.ALL) {
 			return articleContentRepository.findByTypeContent(type, pageable,
-					TimeServie.getNowTimestamp())
+					TimeUtil.getNowTimestamp())
 				.map(this::mapToContentDto);
 		} else {
 			return articleContentRepository.findByTypeAndCategoryId(type, articleCategory.getId(),
-					pageable, TimeServie.getNowTimestamp())
+					pageable, TimeUtil.getNowTimestamp())
 				.map(this::mapToContentDto);
 		}
 	}
diff --git a/src/main/java/com/moaguide/refactor/product/controller/ProductPriceController.java b/src/main/java/com/moaguide/refactor/product/controller/ProductPriceController.java
@@ -1,12 +1,13 @@
 package com.moaguide.refactor.product.controller;
 
+import static com.moaguide.refactor.util.EmptyCheckUtil.isEmpty;
+import static com.moaguide.refactor.util.EmptyCheckUtil.isListEmpty;
+import static com.moaguide.refactor.util.HashMapUtil.createEmptyHashMap;
+
 import com.moaguide.refactor.product.dto.DetailTransactionResponseDto;
 import com.moaguide.refactor.product.dto.DivideGraphDto;
 import com.moaguide.refactor.product.service.DivideService;
 import com.moaguide.refactor.product.service.TransactionService;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,19 +28,9 @@ public ResponseEntity<Object> divide(@PathVariable String product_Id, @RequestPa
 		DivideGraphDto divideCustomDtos = divideService.getGraphData(product_Id,
 			month);
 		// null 체크
-		if (divideCustomDtos == null) {
-			Map<String, Object> response = new HashMap<>();
-			response.put("divide", new ArrayList<>());
-			return ResponseEntity.ok(response);
-		}
-
-		// 빈 리스트 체크
-		if (divideCustomDtos.getDivide().isEmpty()) {
-			Map<String, Object> response = new HashMap<>();
-			response.put("divide", new ArrayList<>());
-			return ResponseEntity.ok(response);
+		if (isEmpty(divideCustomDtos) || isListEmpty(divideCustomDtos.getDivide())) {
+			return ResponseEntity.ok(createEmptyHashMap("divide"));
 		}
-
 		// 정상적인 경우 데이터 반환
 		return ResponseEntity.ok().body(divideCustomDtos);
 	}
@@ -49,18 +40,10 @@ public ResponseEntity<Object> transaction(@PathVariable String product_Id,
 		@RequestParam int month) {
 		DetailTransactionResponseDto transaction = transactionService.findbymonth(product_Id,
 			month);
-		if (transaction.getTransaction() == null) {
-			Map<String, Object> response = new HashMap<>();
-			response.put("transaction", new ArrayList<>());
-			return ResponseEntity.ok(response);
+		if (isEmpty(transaction) || isEmpty(transaction.getTransaction())) {
+			return ResponseEntity.ok(createEmptyHashMap("transaction"));
 		}
 
-		// 빈 리스트 체크
-		if (transaction.getTransaction().isEmpty()) {
-			Map<String, Object> response = new HashMap<>();
-			response.put("transaction", new ArrayList<>());
-			return ResponseEntity.ok(response);
-		}
 
 		return ResponseEntity.ok().body(transaction);
 	}
diff --git a/src/main/java/com/moaguide/refactor/util/EmptyCheckUtil.java b/src/main/java/com/moaguide/refactor/util/EmptyCheckUtil.java
@@ -1,6 +1,7 @@
 package com.moaguide.refactor.util;
 
 
+import java.util.List;
 
 public class EmptyCheckUtil {
 
@@ -12,8 +13,8 @@ public static boolean isEmpty(Object obj) {
 		}
 	}
 
-	public static boolean isListEmpty(Object[] list) {
-		if (list == null || list.length == 0) {
+	public static boolean isListEmpty(List<?> list) {
+		if (list == null) {
 			return true;
 		}else {
 			return false;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.moaguide.refactor.util;`
`2`	`2`
`3`	`3`
	`4`	`+import java.util.List;`
`4`	`5`
`5`	`6`	`public class EmptyCheckUtil {`
`6`	`7`
`@@ -12,8 +13,8 @@ public static boolean isEmpty(Object obj) {`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`
`15`		`- public static boolean isListEmpty(Object[] list) {`
`16`		`- if (list == null \|\| list.length == 0) {`
	`16`	`+ public static boolean isListEmpty(List<?> list) {`
	`17`	`+ if (list == null) {`
`17`	`18`	`return true;`
`18`	`19`	`}else {`
`19`	`20`	`return false;`