hotfix : 문제 카테고리를 db table 로 변경 작업 완료 (#109)

* test : 장착 도메인 서비스 테스트 코드 추가

* hotfix : 문제 카테고리를 db table 로 변경 작업 완료

# Conflicts:
#	src/main/java/org/ezcode/codetest/application/submission/service/SubmissionService.java
#	src/main/java/org/ezcode/codetest/domain/submission/service/SubmissionDomainService.java

* hotfix : 문제 카테고리를 db table 로 변경 작업 완료

* hotfix : 문제 카테고리를 db table 로 변경 작업 완료

* hotfix : 오타수정

Author: chat26666

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

@@ -0,0 +1,16 @@
+package org.ezcode.codetest.application.problem.dto.request;
+
+import org.ezcode.codetest.domain.problem.model.entity.Category;
+
+public record CategoryCreateRequest(
+
+	String categoryCode,
+
+	String categoryName
+
+) {
+	public Category toCategory() {
+
+		return new Category(categoryCode, categoryName);
+	}
+}

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

@@ -1,9 +1,8 @@
 package org.ezcode.codetest.application.problem.dto.request;
 
-import java.util.List;
+import java.util.Map;
 
 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 org.ezcode.codetest.domain.user.model.entity.User;
@@ -14,9 +13,9 @@
 
 public record ProblemCreateRequest(
 
-	@NotNull(message = "카테고리를 설정해야 합니다.")
-	@Schema(description = "카테고리", example = "FOR_BEGINNER")
-	List<Category> categories,
+	@NotNull(message = "카테고리 이름를 설정해야 합니다.")
+	@Schema(description = "카테고리 코드 식별자(영어) / 한글 이름", example = "FOR_BEGINNER : 입문자용")
+	Map<String, String> categories,
 
 	@NotBlank(message = "문제 제목을 입력하세요.")
 	@Schema(description = "제목", example = "A+B")
@@ -27,7 +26,7 @@ public record ProblemCreateRequest(
 	String description,
 
 	@NotNull(message = "난이도를 설정해야 합니다.")
-	@Schema(description = "난이도", example = "BRONZE")
+	@Schema(description = "난이도", example = "LV1")
 	Difficulty difficulty,
 
 	@NotNull(message = "메모리 제한을 설정해야 합니다.")
@@ -45,11 +44,10 @@ public record ProblemCreateRequest(
 ) {
 
 	// Dto -> Entity 변환
-	public static Problem toEntity(ProblemCreateRequest request, User user) {
+	public static Problem toProblem(ProblemCreateRequest request, User user) {
 
 		return Problem.builder()
 			.creator(user)
-			.categories(request.categories)
 			.title(request.title)
 			.description(request.description)
 			.difficulty(request.difficulty)

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

@@ -3,7 +3,6 @@
 import java.util.List;
 
 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 org.ezcode.codetest.domain.user.model.entity.User;
@@ -13,7 +12,7 @@
 public record ProblemUpdateRequest(
 
 	@Schema(description = "카테고리", example = "FOR_BEGINNER")
-	List<Category> categories,
+	List<String> categories,
 
 	@Schema(description = "제목", example = "A+B")
 	String title,
@@ -39,7 +38,6 @@ public static Problem from(ProblemUpdateRequest request, User user) {
 
 		return Problem.builder()
 			.creator(user)
-			.categories(request.categories)
 			.title(request.title)
 			.description(request.description)
 			.difficulty(request.difficulty)

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

@@ -3,8 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.ezcode.codetest.domain.problem.model.entity.Category;
 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;
 
@@ -21,7 +21,7 @@ public record ProblemDetailResponse(
 	String creator,
 
 	@Schema(description = "카테고리", example = "FOR_BEGINNER")
-	List<Category> categories,
+	List<String> categories,
 
 	@Schema(description = "제목", example = "A+B")
 	String title,
@@ -52,14 +52,14 @@ public record ProblemDetailResponse(
 
 ) {
 
-	public static ProblemDetailResponse from(Problem problem) {
+	public static ProblemDetailResponse from(Problem problem, List<Category> categories) {
 
 		return ProblemDetailResponse.builder()
 			.id(problem.getId())
 			.creator(problem.getCreator().getNickname())
-			.categories(problem.getCategories())
 			.title(problem.getTitle())
 			.description(problem.getDescription())
+			.categories(categories.stream().map(Category::getKorName).toList())
 			.score(problem.getScore())
 			.difficulty(problem.getDifficulty())
 			.memoryLimit(problem.getMemoryLimit())

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

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
+import org.ezcode.codetest.domain.problem.model.entity.Category;
 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;
 
@@ -20,7 +20,7 @@ public record ProblemResponse(
 	String creator,
 
 	@Schema(description = "카테고리", example = "FOR_BEGINNER")
-	List<Category> categories,
+	List<String> categories,
 
 	@Schema(description = "제목", example = "A+B")
 	String title,
@@ -36,7 +36,7 @@ public record ProblemResponse(
 
 ) {
 
-	public static ProblemResponse from(Problem problem) {
+	public static ProblemResponse from(Problem problem, List<Category> categories) {
 
 		if (problem == null) {
 			throw new IllegalArgumentException("문제는 null 값이 아니어야 합니다.");
@@ -45,7 +45,7 @@ public static ProblemResponse from(Problem problem) {
 		return ProblemResponse.builder()
 			.id(problem.getId())
 			.creator(problem.getCreator() != null ? problem.getCreator().getNickname() : "존재하지 않는 이름.")
-			.categories(problem.getCategories())
+			.categories(categories.stream().map(Category::getKorName).toList())
 			.title(problem.getTitle())
 			.score(problem.getScore())
 			.difficulty(problem.getDifficulty())

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

@@ -29,7 +29,7 @@ public static ProblemSearchResponse from(ProblemSearchDocument document) {
 		return ProblemSearchResponse.builder()
 			.id(document.getId())
 			.title(document.getTitle())
-			.category(document.getCategories().stream().map(Enum::toString).toList())
+			.category(document.getCategories())
 			.difficulty(document.getDifficulty())
 			.reference(document.getReference().toString())
 			.description(document.getDescription())

src/main/java/org/ezcode/codetest/application/problem/service/ProblemSearchService.java

@@ -45,7 +45,6 @@ public Set<String> getProblemSuggestions(String keyword) {
 				Optional.ofNullable(doc.getCategories())
 					.stream()
 					.flatMap(Collection::stream)
-					.map(Enum::toString)
 					.forEach(searchedKeyword::add);
 
 				Optional.ofNullable(doc.getCategoriesKor())

src/main/java/org/ezcode/codetest/application/problem/service/ProblemService.java

@@ -1,11 +1,20 @@
 package org.ezcode.codetest.application.problem.service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.ezcode.codetest.application.problem.dto.request.CategoryCreateRequest;
 import org.ezcode.codetest.application.problem.dto.request.ProblemCreateRequest;
 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.game.model.character.CategoryStat;
+import org.ezcode.codetest.domain.game.util.StatUpdateUtil;
 import org.ezcode.codetest.domain.problem.model.ProblemSearchCondition;
+import org.ezcode.codetest.domain.problem.model.entity.Category;
 import org.ezcode.codetest.domain.problem.model.entity.Problem;
+import org.ezcode.codetest.domain.problem.model.entity.ProblemCategory;
 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;
@@ -15,6 +24,7 @@
 import org.ezcode.codetest.infrastructure.s3.exception.S3Exception;
 import org.ezcode.codetest.infrastructure.s3.exception.code.S3ExceptionCode;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,32 +40,53 @@ public class ProblemService {
 
 	private final ProblemDomainService problemDomainService;
 	private final UserDomainService userDomainService;
+	private final StatUpdateUtil statUpdateUtil;
 	private final S3Uploader s3Uploader;
 
+	@Transactional
+	public void createCategory(CategoryCreateRequest requestDto) {
+
+		Category category =problemDomainService.createCategory(requestDto.toCategory());
+
+		statUpdateUtil.save(new CategoryStat(category));
+	}
+
 	// 문제 생성 ( 관리자 )
 	@Transactional
-	public ProblemDetailResponse createProblem(ProblemCreateRequest requestDto, MultipartFile image, AuthUser authUser) {
+	public void createProblem(ProblemCreateRequest requestDto, MultipartFile image, AuthUser authUser) {
 
 		User user = userDomainService.getUserById(authUser.getId());
 
-		Problem problem = ProblemCreateRequest.toEntity(requestDto, user);
-		Problem savedProblem = problemDomainService.createProblem(problem);
+		Problem problem = ProblemCreateRequest.toProblem(requestDto, user);
+		Problem savedProblem = problemDomainService.createProblem(problem, requestDto.categories());
 
 		// 문제 이미지 있다면?
 		if (image != null && !image.isEmpty()) {
 			String imageUrl = uploadImageAfterTransaction(image, savedProblem.getId());
 			updateProblemWithImage(savedProblem.getId(), imageUrl);
 		}
 
-		return ProblemDetailResponse.from(savedProblem);
 	}
 
 	// 문제 전체 조회
 	@Transactional(readOnly = true)
 	public Page<ProblemResponse> getProblemsList(Pageable pageable, ProblemSearchCondition searchCondition) {
-		Page<Problem> problems = problemDomainService.getProblemBySearchCondition(pageable, searchCondition);
 
-		return problems.map(ProblemResponse::from); // Entity → DTO 변환
+		Page<Problem> problemPage = problemDomainService.getProblemBySearchCondition(pageable, searchCondition);
+		List<Problem> problems = problemPage.getContent();
+		List<ProblemCategory> categories = problemDomainService.getProblemsCategoryList(problems);
+
+		Map<Problem, List<Category>> maps = categories.stream()
+			.collect(Collectors.groupingBy(
+				ProblemCategory::getProblem,
+				Collectors.mapping(ProblemCategory::getCategory, Collectors.toList())
+			));
+
+		List<ProblemResponse> responses = problems.stream()
+			.map(p -> ProblemResponse.from(p, maps.getOrDefault(p, List.of())))
+			.collect(Collectors.toList());
+
+		return new PageImpl<>(responses, pageable, problemPage.getTotalElements());
 	}
 
 	// 문제 상세 조회
@@ -64,18 +95,19 @@ public ProblemDetailResponse getProblem(Long problemId) {
 
 		Problem findProblem = problemDomainService.getProblem(problemId);
 
-		return ProblemDetailResponse.from(findProblem);
+		List<Category> categoryList = problemDomainService.getProblemCategoryList(findProblem);
+
+		return ProblemDetailResponse.from(findProblem, categoryList);
 	}
 
 	// 문제 수정 ( 관리자 )
 	@Transactional
-	public ProblemDetailResponse modifyProblem(Long problemId, ProblemUpdateRequest request) {
+	public void modifyProblem(Long problemId, ProblemUpdateRequest request) {
 
 		Problem findProblem = problemDomainService.getProblem(problemId);
 
 		findProblem.update(
 			findProblem.getCreator(),
-			request.categories(),
 			request.title(),
 			request.description(),
 			request.difficulty(),
@@ -84,7 +116,8 @@ public ProblemDetailResponse modifyProblem(Long problemId, ProblemUpdateRequest
 			request.reference()
 		);
 
-		return ProblemDetailResponse.from(findProblem);
+		problemDomainService.updateCategoryAndSearchEngine(findProblem, request.categories());
+
 	}
 
 	// 문제 삭제 ( 관리자 )