refactor : category, Difficulty 리팩토링 (2)

Author: Kimminu7

src/main/java/org/ezcode/codetest/application/problem/dto/request/ProblemCreateRequest.java

@@ -52,7 +52,7 @@ public static Problem toEntity(ProblemCreateRequest request, User user) {
 			.categories(request.categories)
 			.title(request.title)
 			.description(request.description)
-			.difficulty(request.difficulty.getDifficulty())
+			.difficulty(request.difficulty)
 			.score(request.difficulty.getScore())
 			.memoryLimit(request.memoryLimit)
 			.timeLimit(request.timeLimit)

src/main/java/org/ezcode/codetest/application/problem/dto/request/ProblemUpdateRequest.java

@@ -42,7 +42,7 @@ public static Problem from(ProblemUpdateRequest request, User user) {
 			.categories(request.categories)
 			.title(request.title)
 			.description(request.description)
-			.difficulty(request.difficulty.getDifficulty())
+			.difficulty(request.difficulty)
 			.score(request.difficulty.getScore())
 			.memoryLimit(request.memoryLimit)
 			.timeLimit(request.timeLimit)

src/main/java/org/ezcode/codetest/application/problem/dto/response/ProblemDetailResponse.java

@@ -5,6 +5,7 @@
 
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
 import org.ezcode.codetest.domain.problem.model.enums.Category;
+import org.ezcode.codetest.domain.problem.model.enums.Difficulty;
 import org.ezcode.codetest.domain.problem.model.enums.Reference;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,7 +33,7 @@ public record ProblemDetailResponse(
 	int score,
 
 	@Schema(description = "난이도", example = "BRONZE")
-	String difficulty,
+	Difficulty difficulty,
 
 	@Schema(description = "메모리 제한(KB)", example = "30000")
 	Long memoryLimit,

src/main/java/org/ezcode/codetest/application/problem/dto/response/ProblemResponse.java

@@ -4,6 +4,7 @@
 
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
 import org.ezcode.codetest.domain.problem.model.enums.Category;
+import org.ezcode.codetest.domain.problem.model.enums.Difficulty;
 import org.ezcode.codetest.domain.problem.model.enums.Reference;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -28,7 +29,7 @@ public record ProblemResponse(
 	int score,
 
 	@Schema(description = "난이도", example = "BRONZE")
-	String difficulty,
+	Difficulty difficulty,
 
 	@Schema(description = "출처", example = "ORIGINAL")
 	Reference reference

src/main/java/org/ezcode/codetest/application/problem/dto/response/ProblemSearchResponse.java

@@ -1,5 +1,7 @@
 package org.ezcode.codetest.application.problem.dto.response;
 
+import java.util.List;
+
 import org.ezcode.codetest.domain.problem.model.entity.ProblemSearchDocument;
 
 import lombok.Builder;
@@ -11,7 +13,7 @@ public record ProblemSearchResponse(
 
 	String title,
 
-	String category,
+	List<String> category,
 
 	String difficulty,
 
@@ -27,7 +29,7 @@ public static ProblemSearchResponse from(ProblemSearchDocument document) {
 		return ProblemSearchResponse.builder()
 			.id(document.getId())
 			.title(document.getTitle())
-			.category(document.getCategories().toString())
+			.category(document.getCategories().stream().map(Enum::toString).toList())
 			.difficulty(document.getDifficulty())
 			.reference(document.getReference().toString())
 			.description(document.getDescription())

src/main/java/org/ezcode/codetest/domain/problem/model/entity/Problem.java

@@ -50,8 +50,9 @@ public class Problem extends BaseEntity {
 	@Column(nullable = false)
 	private int score;
 
+	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
-	private String difficulty;
+	private Difficulty difficulty;
 
 	@Column(nullable = false)
 	private Long memoryLimit;
@@ -89,7 +90,7 @@ public class Problem extends BaseEntity {
 
 	@Builder
 	public Problem(User creator, List<Category> categories, String title, String description, int score,
-		String difficulty,
+		Difficulty difficulty,
 		Long memoryLimit, Long timeLimit, Reference reference) {
 		this.creator = creator;
 		this.categories = categories;
@@ -107,7 +108,7 @@ public Problem(User creator, List<Category> categories, String title, String des
 
 	// 여러개를 하나의 객체로 만드는 것
 	public static Problem of(User creator, List<Category> categories, String title, String description, int score,
-		String difficulty,
+		Difficulty difficulty,
 		Long memoryLimit, Long timeLimit, Reference reference) {
 
 		return Problem.builder()
@@ -136,7 +137,7 @@ public void update(User creator, List<Category> categories, String title, String
 		if (description != null)
 			this.description = description;
 		if (difficulty != null) {
-			this.difficulty = difficulty.getDifficulty();
+			this.difficulty = difficulty;
 			this.score = difficulty.getScore();
 		}
 		if (memoryLimit != null)

src/main/java/org/ezcode/codetest/domain/problem/model/entity/ProblemSearchDocument.java

@@ -183,12 +183,12 @@ public static ProblemSearchDocument from(Problem problem) {
 			.id(problem.getId())
 			.title(problem.getTitle())
 			.categories(problem.getCategories())
-			.difficulty(problem.getDifficulty())
+			.difficulty(problem.getDifficulty().getDifficulty())
 			.reference(problem.getReference())
 			.description(problem.getDescription())
 			.score(problem.getScore())
 			.categoriesKor(problem.getCategories().stream().map(Category::getDescription).toList())
-			.difficultyEn(Difficulty.getDifficultyFromKor(problem.getDifficulty()))
+			.difficultyEn(problem.getDifficulty())
 			.referenceKor(problem.getReference().getDescription())
 			.isDeleted(problem.getIsDeleted())
 			.build();
@@ -202,8 +202,11 @@ public void update(Problem problem) {
 		if (problem.getId().equals(this.id)) {
 			this.title = problem.getTitle();
 			this.categories = problem.getCategories();
-			this.difficulty = problem.getDifficulty();
+			this.categoriesKor = problem.getCategories().stream().map(Category::getDescription).toList();
+			this.difficulty = problem.getDifficulty().getDifficulty();
+			this.difficultyEn = problem.getDifficulty();
 			this.reference = problem.getReference();
+			this.referenceKor = problem.getReference().getDescription();
 			this.description = problem.getDescription();
 			this.score = problem.getScore();
 		}

src/main/java/org/ezcode/codetest/domain/problem/model/enums/Difficulty.java

@@ -9,13 +9,13 @@
 
 @Getter
 public enum Difficulty {
-	LV1("1", 10),
-	LV2("2", 20),
-	LV3("3", 40),
-	LV4("4", 80),
-	LV5("5", 160),
-	LV6("6", 320),
-	LV7("7", 640);
+	LV1("레벨1", 10),
+	LV2("레벨2", 20),
+	LV3("레벨3", 40),
+	LV4("레벨4", 80),
+	LV5("레벨5", 160),
+	LV6("레벨6", 320),
+	LV7("레벨7", 640);
 
 	private final String difficulty;
 

src/main/java/org/ezcode/codetest/infrastructure/persistence/repository/problem/ProblemQueryRepositoryImpl.java

@@ -5,6 +5,7 @@
 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.ezcode.codetest.domain.problem.model.enums.Difficulty;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
@@ -31,12 +32,12 @@ public Page<Problem> searchByCondition(Pageable pageable, ProblemSearchCondition
 
 		builder.and(problem.isDeleted.isFalse());
 
-		// if(searchCondition.category() != null) {
-		// 	builder.and(problem.categories.eq(searchCondition.category().));
-		// }
+		if(searchCondition.category() != null) {
+			builder.and(problem.categories.contains(searchCondition.category()));
+		}
 
 		if(searchCondition.difficulty() != null) {
-			builder.and(problem.difficulty.eq(searchCondition.difficulty()));
+			builder.and(problem.difficulty.eq(Difficulty.valueOf(searchCondition.difficulty())));
 		}
 
 		List<Problem> content = jpaQueryFactory