refactor : 내 풀이리스트 부분 조회 (#393)

Author: sh0723

src/main/java/com/gamzabat/algohub/constants/BOJResultConstants.java

@@ -10,6 +10,7 @@ public class BOJResultConstants {
 	public static final String OVER_OUTPUT_LIMIT = "출력 초과";
 	public static final String WRONG_OUTPUT_FORMAT = "출력 형식이 잘못되었습니다";
 	public static final String WRONG_OUTPUT_FORMAT_CUSTOM = "출력 에러";
+	public static final String SCORE_UNIT = "점";
 
 	private BOJResultConstants() {
 		throw new RuntimeException("Can not instantiate : BOJResultConstants");

src/main/java/com/gamzabat/algohub/feature/solution/controller/SolutionController.java

@@ -6,9 +6,11 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,8 +22,10 @@
 import com.gamzabat.algohub.exception.RequestException;
 import com.gamzabat.algohub.feature.solution.dto.CreateSolutionRequest;
 import com.gamzabat.algohub.feature.solution.dto.GetCurrentSolvingStatusResponse;
+import com.gamzabat.algohub.feature.solution.dto.GetMySolutionListRequest;
+import com.gamzabat.algohub.feature.solution.dto.GetSolutionListRequest;
 import com.gamzabat.algohub.feature.solution.dto.GetSolutionResponse;
-import com.gamzabat.algohub.feature.solution.dto.GetSolutionWithGroupIdResponse;
+import com.gamzabat.algohub.feature.solution.enums.ProgressCategory;
 import com.gamzabat.algohub.feature.solution.service.SolutionService;
 import com.gamzabat.algohub.feature.user.domain.User;
 
@@ -41,14 +45,9 @@ public class SolutionController {
 	@Operation(summary = "풀이 목록 조회 API", description = "특정 문제에 대한 풀이를 모두 조회하는 API")
 	public ResponseEntity<Page<GetSolutionResponse>> getSolutionList(@AuthedUser User user,
 		@PathVariable Long problemId,
-		@RequestParam(required = false) String language,
-		@RequestParam(required = false) String result,
-		@RequestParam(required = false) String nickname,
-		@RequestParam(defaultValue = "0") int page,
-		@RequestParam(defaultValue = "20") int size) {
-		Pageable pageable = PageRequest.of(page, size);
-		Page<GetSolutionResponse> response = solutionService.getSolutionList(user, problemId, nickname, language,
-			result, pageable);
+		@ModelAttribute GetSolutionListRequest request,
+		@PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
+		Page<GetSolutionResponse> response = solutionService.getSolutionList(user, problemId,request,pageable);
 		return ResponseEntity.ok().body(response);
 	}
 
@@ -69,69 +68,21 @@ public ResponseEntity<Void> createSolution(@Valid @RequestBody CreateSolutionReq
 		return ResponseEntity.ok().build();
 	}
 
-	@GetMapping("/groups/{groupId}/my-solutions/in-progress")
-	@Operation(summary = "그룹 내 진행 중인 나의 풀이 전체 조회 API", description = "특정 그룹 내에서 진행 중인 문제에 대해 제출한 나의 풀이 모두 조회하는 API")
-	public ResponseEntity<Page<GetSolutionResponse>> getMySolutionsInGroupInProgress(@AuthedUser User user,
-		@PathVariable Long groupId,
-		@RequestParam(required = false) Integer problemNumber,
-		@RequestParam(required = false) String language,
-		@RequestParam(required = false) String result,
-		@RequestParam(defaultValue = "0") int page,
-		@RequestParam(defaultValue = "20") int size) {
-		Pageable pageable = PageRequest.of(page, size);
-		Page<GetSolutionResponse> response = solutionService.getMySolutionsInGroupInProgress(user,
-			groupId, problemNumber, language, result, pageable);
-		return ResponseEntity.ok().body(response);
-	}
-
-	@GetMapping("/groups/{groupId}/my-solutions/expired")
-	@Operation(summary = "그룹 내 마감된 나의 풀이 전체 조회 API", description = "특정 그룹 내에서 마감한 문제에 대해 제출한 나의 풀이를 모두 조회하는 API")
-	public ResponseEntity<Page<GetSolutionResponse>> getMySolutionsInGroupExpired(@AuthedUser User user,
-		@PathVariable Long groupId,
-		@RequestParam(required = false) Integer problemNumber,
-		@RequestParam(required = false) String language,
-		@RequestParam(required = false) String result,
-		@RequestParam(defaultValue = "0") int page,
-		@RequestParam(defaultValue = "20") int size) {
-		Pageable pageable = PageRequest.of(page, size);
-		Page<GetSolutionResponse> response = solutionService.getMySolutionsInGroupExpired(user,
-			groupId, problemNumber, language, result, pageable);
-		return ResponseEntity.ok().body(response);
-	}
-
-	@GetMapping("/users/my-solutions/in-progress")
-	@Operation(summary = "진행 중인 내 풀이 전체 조회 API", description = "그룹 상관 없이 진행 중인 문제에 대한 나의 풀이 전체를 조회하는 API")
-	public ResponseEntity<Page<GetSolutionWithGroupIdResponse>> getMySolutionsInProgress(@AuthedUser User user,
-		@RequestParam(required = false) Integer problemNumber,
-		@RequestParam(required = false) String language,
-		@RequestParam(required = false) String result,
-		@RequestParam(defaultValue = "0") int page,
-		@RequestParam(defaultValue = "20") int size) {
-		Pageable pageable = PageRequest.of(page, size);
-		Page<GetSolutionWithGroupIdResponse> response = solutionService.getMySolutionsInProgress(user,
-			problemNumber, language, result, pageable);
-		return ResponseEntity.ok().body(response);
-	}
-
-	@GetMapping("/users/my-solutions/expired")
-	@Operation(summary = "마감 된 내 풀이 전체 조회 API", description = "그룹 상관 없이 나의 풀이 전체를 조회하는 API")
-	public ResponseEntity<Page<GetSolutionWithGroupIdResponse>> getMySolutions(@AuthedUser User user,
-		@RequestParam(required = false) Integer problemNumber,
-		@RequestParam(required = false) String language,
-		@RequestParam(required = false) String result,
-		@RequestParam(defaultValue = "0") int page,
-		@RequestParam(defaultValue = "20") int size) {
-		Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
-		Page<GetSolutionWithGroupIdResponse> response = solutionService.getMySolutionsExpired(user,
-			problemNumber, language, result, pageable);
-		return ResponseEntity.ok().body(response);
-	}
-
 	@GetMapping("/groups/{groupId}/solutions/current-status")
 	@Operation(summary = "풀이 현황 테이블 조회 API", description = "진행 중인 문제들에 대해 풀이 현황 테이블을 조회하는 API")
 	public ResponseEntity<List<GetCurrentSolvingStatusResponse>> getCurrentSolvingStatus(@AuthedUser User user,
 		@PathVariable Long groupId) {
 		List<GetCurrentSolvingStatusResponse> response = solutionService.getCurrentSolvingStatuses(user, groupId);
 		return ResponseEntity.ok().body(response);
 	}
+
+	@GetMapping("/solutions/me")
+	@Operation(summary = "내 풀이 전체 조회", description = "나의 풀이를 그룹, 문제 번호, 언어, 결과, 상태 등으로 필터링하여 조회하는 API")
+	public ResponseEntity<Page<GetSolutionResponse>> getMySolutionList(@AuthedUser User user,
+		@ModelAttribute GetMySolutionListRequest request,
+		@PageableDefault(size = 20, sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable) {
+		Page<GetSolutionResponse> response = solutionService.getMySolutionList(user, request.groupId(),
+			request.problemNumber(), request.language(), request.result(), request.status(), request.isIncorrect(), pageable);
+		return ResponseEntity.ok().body(response);
+	}
 }

src/main/java/com/gamzabat/algohub/feature/solution/dto/GetMySolutionListRequest.java

@@ -0,0 +1,16 @@
+package com.gamzabat.algohub.feature.solution.dto;
+
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.gamzabat.algohub.feature.solution.enums.ProgressCategory;
+
+import lombok.Builder;
+
+@Builder
+public record GetMySolutionListRequest(Long groupId,
+									   Integer problemNumber,
+									   String language,
+									   String result,
+									   ProgressCategory status,
+									   Boolean isIncorrect) {
+}

src/main/java/com/gamzabat/algohub/feature/solution/dto/GetMySolutionListResponse.java

@@ -0,0 +1,9 @@
+package com.gamzabat.algohub.feature.solution.dto;
+
+import lombok.Builder;
+
+@Builder
+public record GetSolutionListRequest( String language,
+									  String result,
+									  String nickname) {
+}

src/main/java/com/gamzabat/algohub/feature/solution/dto/GetSolutionListRequest.java

@@ -28,6 +28,7 @@ public class GetSolutionResponse {
 	private final Integer codeLength;
 	private final Long commentCount;
 	private final Boolean isRead;
+	private final Long groupId;
 
 	public static GetSolutionResponse toDTO(Solution solution, Integer accuracy, Integer submitMemberCount,
 		Integer totalMemberCount, Long commentCount, Boolean isRead) {
@@ -50,6 +51,7 @@ public static GetSolutionResponse toDTO(Solution solution, Integer accuracy, Int
 			.codeLength(solution.getCodeLength())
 			.commentCount(commentCount)
 			.isRead(isRead)
+			.groupId(solution.getProblem().getStudyGroup().getId())
 			.build();
 	}
 

src/main/java/com/gamzabat/algohub/feature/solution/dto/GetSolutionResponse.java

@@ -34,5 +34,13 @@ Page<Solution> findAllFilteredMySolutions(
 		ProgressCategory category,
 		Pageable pageable);
 
+	Page<Solution> findAllFilteredMySolutionsIsIncorrect(
+		User user,
+		Integer problemNumber,
+		String language,
+		String result,
+		ProgressCategory category,
+		Pageable pageable);
+
 	boolean existsByUserAndProblemAndResult(User user, Problem problem, String result);
 }

src/main/java/com/gamzabat/algohub/feature/solution/dto/GetSolutionWithGroupIdResponse.java

@@ -18,6 +18,7 @@
 import com.gamzabat.algohub.feature.solution.domain.Solution;
 import com.gamzabat.algohub.feature.solution.enums.ProgressCategory;
 import com.gamzabat.algohub.feature.user.domain.User;
+import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
@@ -71,7 +72,8 @@ public Page<Solution> findAllFilteredMySolutionsInGroup(User user, StudyGroup gr
 				.and(solution.user.eq(user)))
 			.orderBy(solution.solvedDateTime.desc());
 
-		addMySolutionFilters(problemNumber, language, result, category, query);
+		addMySolutionFiltersExceptResult(problemNumber, language, category, query);
+		addResultFilter(result, query);
 		query.offset(pageable.getOffset())
 			.limit(pageable.getPageSize());
 
@@ -88,29 +90,56 @@ public Page<Solution> findAllFilteredMySolutions(User user, Integer problemNumbe
 				.and(solution.deletedAt.isNull()))
 			.orderBy(solution.solvedDateTime.desc());
 
-		addMySolutionFilters(problemNumber, language, result, category, query);
+		addMySolutionFiltersExceptResult(problemNumber, language, category, query);
+		addResultFilter(result, query);
 		query.offset(pageable.getOffset())
 			.limit(pageable.getPageSize());
 
 		JPAQuery<Long> countQuery = solutionCountQuery(query);
 		return PageableExecutionUtils.getPage(query.fetch(), pageable, countQuery::fetchOne);
 	}
 
-	private void addMySolutionFilters(Integer problemNumber, String language, String result, ProgressCategory category,
+	@Override
+	public Page<Solution> findAllFilteredMySolutionsIsIncorrect(User user,
+		Integer problemNumber,
+		String language,
+		String result,
+		ProgressCategory category,
+		Pageable pageable) {
+		JPAQuery<Solution> query = queryFactory.selectFrom(solution)
+			.where(solution.user.eq(user)
+				.and(solution.deletedAt.isNull()))
+			.orderBy(solution.solvedDateTime.desc());
+		addMySolutionFiltersExceptResult(problemNumber, language, category, query);
+		addResultIncorrectFilter(result, query);
+		query.offset(pageable.getOffset())
+			.limit(pageable.getPageSize());
+		JPAQuery<Long> countQuery = solutionCountQuery(query);
+		return PageableExecutionUtils.getPage(query.fetch(), pageable, countQuery::fetchOne);
+	}
+
+	private void addMySolutionFiltersExceptResult(Integer problemNumber, String language, ProgressCategory category,
 		JPAQuery<Solution> query) {
 		addEndDateFilter(category, query);
 		addProblemFilter(problemNumber, query);
 		addLanguageFilter(language, query);
-		addResultFilter(result, query);
 	}
 
 	private void addEndDateFilter(ProgressCategory category, JPAQuery<Solution> query) {
+		if (category == null) return;
 		if (category.equals(ProgressCategory.IN_PROGRESS))
 			query.where(problem.endDate.goe(LocalDate.now()));
 		else if (category.equals(ProgressCategory.EXPIRED))
 			query.where(problem.endDate.before(LocalDate.now()));
 	}
 
+	private void addResultIncorrectFilter(String result, JPAQuery<Solution> query) {
+		BooleanExpression incorrectBase =
+			solution.result.isNotNull()
+				.and(solution.result.ne(CORRECT))
+				.and(solution.result.endsWith(SCORE_UNIT).not());
+		query.where(incorrectBase);
+	}
 	private void addResultFilter(String result, JPAQuery<Solution> query) {
 		if (result != null && !result.isBlank()) {
 			if (result.equals(CORRECT))