feature : 동적 쿼리 적용, /api 경로 추가 (#63)

Kimminu7 · web-flow · commit af31df15390e · 2025-06-15T12:03:53.000+09:00
* feat : QueryDsl 프로젝트 적용(셋팅) * feat, refactor : ProblemSearchCondition, JPAQueryFactory 생성, gitkeep 제거 * refactor : 주석 제거 * refactor : QueryDSL 동적 쿼리 적용 * refactor : 사용하지 않는 메소드 제거 * feat : QueryDsl 프로젝트 적용(셋팅) * feat, refactor : ProblemSearchCondition, JPAQueryFactory 생성, gitkeep 제거 * refactor : 주석 제거 * refactor : QueryDSL 동적 쿼리 적용 * refactor : 사용하지 않는 메소드 제거 * refactor : title 검색 제거 ( 동적 쿼리 ) * refactor : URL 경로 /api 추가 (문제, 테스트케이스) * refactor : NPE 방지 ( @nonnull ) * refactor : ProblemSearchCondition 위치 변경 ( domain 계층 - model )
diff --git a/build.gradle b/build.gradle
@@ -90,12 +90,20 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
 
+
+    // QueryDSL
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
+    annotationProcessor 'jakarta.persistence:jakarta.persistence-api:3.1.0'
+    annotationProcessor 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+    
     // mongodb
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 
     // map-struct
     implementation 'org.mapstruct:mapstruct:1.6.3'
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
+
 }
 
 tasks.named('test') {
diff --git a/src/main/java/org/ezcode/codetest/application/problem/service/ProblemService.java b/src/main/java/org/ezcode/codetest/application/problem/service/ProblemService.java
@@ -1,11 +1,11 @@
 package org.ezcode.codetest.application.problem.service;
 
 import org.ezcode.codetest.application.problem.dto.request.ProblemCreateRequest;
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.application.problem.dto.request.ProblemUpdateRequest;
 import org.ezcode.codetest.application.problem.dto.response.ProblemDetailResponse;
 import org.ezcode.codetest.application.problem.dto.response.ProblemResponse;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
-import org.ezcode.codetest.domain.problem.model.enums.Category;
 import org.ezcode.codetest.domain.problem.service.ProblemDomainService;
 import org.ezcode.codetest.domain.user.model.entity.AuthUser;
 import org.ezcode.codetest.domain.user.model.entity.User;
@@ -39,14 +39,8 @@ public ProblemDetailResponse createProblem(ProblemCreateRequest requestDto, Auth
 
 	// 문제 전체 조회
 	@Transactional(readOnly = true)
-	public Page<ProblemResponse> getProblemsList(Pageable pageable, Category category) {
-		Page<Problem> problems;
-
-		if (category != null) {
-			problems = problemDomainService.getProblemsByCategoryList(category, pageable);
-		} else {
-			problems = problemDomainService.getProblemsList(pageable);
-		}
+	public Page<ProblemResponse> getProblemsList(Pageable pageable, ProblemSearchCondition searchCondition) {
+		Page<Problem> problems = problemDomainService.getProblemBySearchCondition(pageable, searchCondition);
 
 		return problems.map(ProblemResponse::from); // Entity → DTO 변환
 	}
diff --git a/src/main/java/org/ezcode/codetest/domain/problem/model/ProblemSearchCondition.java b/src/main/java/org/ezcode/codetest/domain/problem/model/ProblemSearchCondition.java
@@ -0,0 +1,11 @@
+package org.ezcode.codetest.domain.problem.model;
+
+import org.ezcode.codetest.domain.problem.model.enums.Category;
+
+public record ProblemSearchCondition(
+	Category category,
+
+	String difficulty
+
+) {
+}
diff --git a/src/main/java/org/ezcode/codetest/domain/problem/repository/ProblemRepository.java b/src/main/java/org/ezcode/codetest/domain/problem/repository/ProblemRepository.java
@@ -2,21 +2,20 @@
 
 import java.util.Optional;
 
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
-import org.ezcode.codetest.domain.problem.model.enums.Category;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.lang.NonNull;
 
 public interface ProblemRepository {
 
 	Problem save(Problem problem);
 
-	Page<Problem> findByCategoryAndIsDeletedIsFalse(Category category, Pageable pageable);
-
-	Page<Problem> findByIsDeletedIsFalse(Pageable pageable);
-
 	Optional<Problem> findByIdNotDeleted(Long problemId);
 
+	Page<Problem> searchByCondition(@NonNull Pageable pageable, @NonNull ProblemSearchCondition searchCondition);
+
 	void delete(Problem problem);
 
 	Optional<Problem> findProblemWithTestcasesById(Long problemId);
diff --git a/src/main/java/org/ezcode/codetest/domain/problem/service/ProblemDomainService.java b/src/main/java/org/ezcode/codetest/domain/problem/service/ProblemDomainService.java
@@ -1,11 +1,11 @@
 package org.ezcode.codetest.domain.problem.service;
 
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.domain.problem.exception.ProblemException;
 import org.ezcode.codetest.domain.problem.exception.code.ProblemExceptionCode;
 import org.ezcode.codetest.domain.problem.model.ProblemInfo;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
 import org.ezcode.codetest.domain.problem.model.entity.ProblemSearchDocument;
-import org.ezcode.codetest.domain.problem.model.enums.Category;
 import org.ezcode.codetest.domain.problem.repository.ProblemDocumentRepository;
 import org.ezcode.codetest.domain.problem.repository.ProblemRepository;
 import org.springframework.data.domain.Page;
@@ -36,15 +36,11 @@ public Problem createProblem(Problem problem) {
 		return savedProblem;
 	}
 
-	public Page<Problem> getProblemsByCategoryList(Category category, Pageable pageable) {
+	public Page<Problem> getProblemBySearchCondition(Pageable pageable, ProblemSearchCondition searchCondition) {
 
-		return problemRepository.findByCategoryAndIsDeletedIsFalse(category, pageable);
+		return problemRepository.searchByCondition(pageable, searchCondition);
 	}
 
-	public Page<Problem> getProblemsList(Pageable pageable) {
-
-		return problemRepository.findByIsDeletedIsFalse(pageable);
-	}
 
 	public Problem getProblem(Long problemId) {
 
@@ -68,4 +64,5 @@ public ProblemInfo getProblemInfo(Long problemId) {
 
 		return new ProblemInfo(problem, problem.getTestcases());
 	}
+
 }
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/config/.gitkeep b/src/main/java/org/ezcode/codetest/infrastructure/persistence/config/.gitkeep
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/config/QuerydslConfig.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/config/QuerydslConfig.java
@@ -0,0 +1,17 @@
+package org.ezcode.codetest.infrastructure.persistence.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import jakarta.persistence.EntityManager;
+
+@Configuration
+public class QuerydslConfig {
+
+	@Bean
+	public JPAQueryFactory jpaQueryFactory(EntityManager entityManager) {
+		return new JPAQueryFactory(entityManager);
+	}
+}
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemJpaRepository.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemJpaRepository.java
@@ -3,19 +3,12 @@
 import java.util.Optional;
 
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
-import org.ezcode.codetest.domain.problem.model.enums.Category;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 public interface ProblemJpaRepository extends JpaRepository<Problem, Long> {
 
-	Page<Problem> findByCategoryAndIsDeletedIsFalse(Category category, Pageable pageable);
-
-	Page<Problem> findByIsDeletedIsFalse(Pageable pageable);
-
 	@Query("SELECT p FROM Problem p WHERE p.isDeleted = false AND p.id = :problemId")
 	Optional<Problem> findByIdNotDeleted(Long problemId);
 
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemQueryRepositoryImpl.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemQueryRepositoryImpl.java
@@ -0,0 +1,58 @@
+package org.ezcode.codetest.infrastructure.persistence.repository.problem;
+
+import java.util.List;
+
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
+import org.ezcode.codetest.domain.problem.model.entity.Problem;
+import org.ezcode.codetest.domain.problem.model.entity.QProblem;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class ProblemQueryRepositoryImpl implements ProblemRepositoryCustom {
+
+	private final JPAQueryFactory jpaQueryFactory;
+
+	@Override
+	public Page<Problem> searchByCondition(Pageable pageable, ProblemSearchCondition searchCondition) {
+
+		QProblem problem = QProblem.problem;
+
+		// where 조건을 깔끔 하게 조립
+		BooleanBuilder builder = new BooleanBuilder();
+
+		builder.and(problem.isDeleted.isFalse());
+
+		if(searchCondition.category() != null) {
+			builder.and(problem.category.eq(searchCondition.category()));
+		}
+
+		if(searchCondition.difficulty() != null) {
+			builder.and(problem.difficulty.eq(searchCondition.difficulty()));
+		}
+
+		List<Problem> content = jpaQueryFactory
+			.selectFrom(problem)
+			.where(builder)
+			.offset(pageable.getOffset())
+			.limit(pageable.getPageSize())
+			.orderBy(problem.createdAt.desc())
+			.fetch();
+
+		Long total = jpaQueryFactory
+			.select(problem.count())
+			.from(problem)
+			.where(builder)
+			.fetchOne();
+
+		return new PageImpl<>(content, pageable, total != null ? total : 0);
+	}
+}
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemRepositoryCustom.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemRepositoryCustom.java
@@ -0,0 +1,10 @@
+package org.ezcode.codetest.infrastructure.persistence.repository.problem;
+
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
+import org.ezcode.codetest.domain.problem.model.entity.Problem;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface ProblemRepositoryCustom {
+	Page<Problem> searchByCondition(Pageable pageable, ProblemSearchCondition searchCondition);
+}
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemRepositoryImpl.java b/src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemRepositoryImpl.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.ezcode.codetest.domain.problem.model.enums.Category;
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.domain.problem.repository.ProblemRepository;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
 import org.springframework.data.domain.Page;
@@ -16,30 +16,25 @@
 public class ProblemRepositoryImpl implements ProblemRepository {
 
 	private final ProblemJpaRepository problemJpaRepository;
+	private final ProblemRepositoryCustom problemRepositoryCustom;
 
 	@Override
 	public Problem save(Problem problem) {
 		return problemJpaRepository.save(problem);
 	}
 
 	@Override
-	public Page<Problem> findByCategoryAndIsDeletedIsFalse(Category category, Pageable pageable) {
-		return problemJpaRepository.findByCategoryAndIsDeletedIsFalse(category, pageable);
+	public Optional<Problem> findByIdNotDeleted(Long problemId) {
+		return problemJpaRepository.findByIdNotDeleted(problemId);
 	}
 
 	@Override
-	public Page<Problem> findByIsDeletedIsFalse(Pageable pageable) {
-		return problemJpaRepository.findByIsDeletedIsFalse(pageable);
-	}
-
-	@Override
-	public Optional<Problem> findByIdNotDeleted(Long problemId) {
-		return problemJpaRepository.findByIdNotDeleted(problemId);
+	public Page<Problem> searchByCondition(Pageable pageable, ProblemSearchCondition searchCondition) {
+		return problemRepositoryCustom.searchByCondition(pageable, searchCondition);
 	}
 
 	@Override
 	public void delete(Problem problem) {
-
 		problem.softDelete();
 	}
 
@@ -52,5 +47,4 @@ public Optional<Problem> findProblemWithTestcasesById(Long problemId) {
 	public boolean existsByTitleAndIsDeletedIsFalse(String title) {
 		return problemJpaRepository.existsByTitleAndIsDeletedIsFalse(title);
 	}
-
 }
diff --git a/src/main/java/org/ezcode/codetest/presentation/problemmanagement/problem/ProblemAdminController.java b/src/main/java/org/ezcode/codetest/presentation/problemmanagement/problem/ProblemAdminController.java
@@ -23,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/admin/problems")
+@RequestMapping("/api/admin/problems")
 @RequiredArgsConstructor
 @Tag(name = "Problem(관리자)", description = "문제 API(관리자용)")
 public class ProblemAdminController {
diff --git a/src/main/java/org/ezcode/codetest/presentation/problemmanagement/problem/ProblemController.java b/src/main/java/org/ezcode/codetest/presentation/problemmanagement/problem/ProblemController.java
@@ -1,5 +1,6 @@
 package org.ezcode.codetest.presentation.problemmanagement.problem;
 
+import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
 import org.ezcode.codetest.application.problem.dto.response.ProblemDetailResponse;
 import org.ezcode.codetest.application.problem.dto.response.ProblemResponse;
 import org.ezcode.codetest.application.problem.service.ProblemService;
@@ -22,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/problems")
+@RequestMapping("/api/problems")
 @RequiredArgsConstructor
 @Tag(name = "Problem", description = "문제 API")
 public class ProblemController {
@@ -34,12 +35,15 @@ public class ProblemController {
 	@ApiResponse(responseCode = "200", description = "문제 전체 조회성공")
 	public ResponseEntity<Page<ProblemResponse>> getProblemsList(
 		@PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable,
-		@RequestParam(required = false) Category category
+		@RequestParam(required = false) Category category,
+		@RequestParam(required = false) String difficulty
 	) {
 
+		ProblemSearchCondition searchCondition = new ProblemSearchCondition(category, difficulty);
+
 		return ResponseEntity
 				.status(HttpStatus.OK)
-				.body(problemService.getProblemsList(pageable, category));
+				.body(problemService.getProblemsList(pageable, searchCondition));
 	}
 
 	@GetMapping("/{problemId}")
diff --git a/src/main/java/org/ezcode/codetest/presentation/problemmanagement/testcase/TestcaseAdminController.java b/src/main/java/org/ezcode/codetest/presentation/problemmanagement/testcase/TestcaseAdminController.java
@@ -24,7 +24,7 @@
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/admin/problems/{problemId}/testcases")
+@RequestMapping("/api/admin/problems/{problemId}/testcases")
 @RequiredArgsConstructor
 @Tag(name = "Testcase(관리자)", description = "테스트 케이스 API(관리자용) ")
 public class TestcaseAdminController {
