diff --git a/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java b/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java index 3909422..bc5fe7e 100644 --- a/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java +++ b/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java @@ -10,7 +10,7 @@ @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-02-18T17:01:34+0900", + date = "2025-02-20T02:36:18+0900", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)" ) @Component diff --git a/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java b/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java index f3bf9ff..428b7de 100644 --- a/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java +++ b/src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java @@ -15,7 +15,7 @@ @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2025-02-18T21:41:47+0900", + date = "2025-02-20T02:36:19+0900", comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)" ) @Component diff --git a/src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java b/src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java index 9f3b995..b73be8c 100644 --- a/src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java +++ b/src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java @@ -37,7 +37,7 @@ public class QIncorrectProblem extends EntityPathBase { public final NumberPath practiceTestId = createNumber("practiceTestId", Long.class); - public final NumberPath problemId = createNumber("problemCustomId", Long.class); + public final NumberPath problemId = createNumber("problemId", Long.class); public final StringPath problemNumber = createString("problemNumber"); diff --git a/src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java b/src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java index 67b69aa..b7e7668 100644 --- a/src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java +++ b/src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java @@ -25,7 +25,7 @@ public class QProblemImageForTest extends EntityPathBase { public final StringPath imageUrl = createString("imageUrl"); - public final NumberPath problemId = createNumber("problemCustomId", Long.class); + public final NumberPath problemId = createNumber("problemId", Long.class); public QProblemImageForTest(String variable) { super(ProblemImageForTest.class, forVariable(variable)); diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java b/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java index 89bdc0f..9afcfc1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java @@ -24,7 +24,7 @@ public class ImageUploadController { @Operation(summary = "이미지 업로드를 위한 presigned URL 발급") @GetMapping("/problem/{problemId}/presigned-url") public ResponseEntity getProblemImagePresignedUrl( - @PathVariable("problemId") String problemId, + @PathVariable("problemId") Long problemId, @RequestParam(value = "image-type") ProblemImageType imageType) { String presignedUrl = imageUploadService.generateProblemImagePresignedUrl(problemId, imageType); return ResponseEntity.ok(PresignedUrlResponse.of(presignedUrl)); diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/Answer.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/Answer.java index 79ec350..ae8764c 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/Answer.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/Answer.java @@ -31,7 +31,7 @@ private void validateByType(String answer, AnswerType answerType) { throw new InvalidValueException(ErrorCode.INVALID_MULTIPLE_CHOICE_ANSWER); } } - if (answerType == AnswerType.SHORT_NUMBER_ANSWER) { + if (answerType == AnswerType.SHORT_ANSWER) { try { int numericAnswer = Integer.parseInt(answer); if (numericAnswer < 0 || numericAnswer > 999) { diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java index 8396008..aff64c1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java @@ -54,7 +54,7 @@ public ChildProblem(Long id, String imageUrl, AnswerType answerType, String answ public static ChildProblem createEmptyChildProblem() { return ChildProblem.builder() .imageUrl("") - .answerType(AnswerType.SHORT_STRING_ANSWER) + .answerType(AnswerType.SHORT_ANSWER) .answer("") .conceptTagIds(Set.of()) .build(); diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/AnswerType.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/AnswerType.java index 27d748d..ac2760e 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/AnswerType.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/AnswerType.java @@ -5,33 +5,8 @@ @RequiredArgsConstructor public enum AnswerType { MULTIPLE_CHOICE("객관식"), - SHORT_NUMBER_ANSWER("주관식_숫자"), - SHORT_STRING_ANSWER("주관식_문자"); + SHORT_ANSWER("주관식"); private final String name; - - public static AnswerType getTypeForProblem(String subject, int number) { - - // 미적분, 기하, 확률과 통계 - if (subject.equals("미적분") || subject.equals("기하") || subject.equals("확률과통계")) { - if ((number >= 1 && number <= 15) || (number >= 23 && number <= 28)) { - return MULTIPLE_CHOICE; - } else if ((number >= 16 && number <= 22) || number == 29 || number == 30) { - return SHORT_NUMBER_ANSWER; - } - } - - // 고1, 고2 - if (subject.equals("고1") || subject.equals("고2")) { - if (number >= 1 && number <= 21) { - return MULTIPLE_CHOICE; - } else if (number >= 22 && number <= 30) { - return SHORT_NUMBER_ANSWER; - } - } - - // 기본값: 객관식 - return MULTIPLE_CHOICE; - } } diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java index fc3e302..0877351 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java @@ -1,12 +1,14 @@ package com.moplus.moplus_server.domain.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; +import jakarta.validation.constraints.NotNull; import java.util.Set; public record ChildProblemPostRequest( String imageUrl, AnswerType answerType, String answer, + @NotNull(message = "컬렉션 값은 필수입니다.") Set conceptTagIds, int sequence ) { diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java index c791a80..a89a81c 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java @@ -1,6 +1,7 @@ package com.moplus.moplus_server.domain.problem.dto.request; import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType; +import jakarta.validation.constraints.NotNull; import java.util.Set; public record ChildProblemUpdateRequest( @@ -8,6 +9,7 @@ public record ChildProblemUpdateRequest( String imageUrl, AnswerType answerType, String answer, + @NotNull(message = "컬렉션 값은 필수입니다.") Set conceptTagIds ) { } diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java index 1603133..a5aa604 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java @@ -11,6 +11,7 @@ public record ProblemUpdateRequest( ProblemType problemType, Long practiceTestId, int number, + @NotNull(message = "컬렉션 값은 필수입니다.") Set conceptTagIds, String answer, String title, @@ -23,6 +24,7 @@ public record ProblemUpdateRequest( String seniorTipImageUrl, List prescriptionImageUrls, AnswerType answerType, + @NotNull(message = "컬렉션 값은 필수입니다.") List updateChildProblems, Integer recommendedMinute, Integer recommendedSecond diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java index 3daed3d..b5fc52e 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java @@ -13,6 +13,7 @@ public record ChildProblemGetResponse( String imageUrl, AnswerType answerType, String answer, + @NotNull(message = "컬렉션 값은 필수입니다.") Set conceptTagIds ) { diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java index 2d4fd4b..426f097 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java @@ -14,6 +14,7 @@ public record ProblemGetResponse( Long id, @NotNull(message = "문항 custom ID는 필수입니다") String problemCustomId, + @NotNull(message = "컬렉션 값은 필수입니다.") Set conceptTagIds, Long practiceTestId, int number, @@ -28,7 +29,9 @@ public record ProblemGetResponse( String mainAnalysisImageUrl, String readingTipImageUrl, String seniorTipImageUrl, + @NotNull(message = "컬렉션 값은 필수입니다.") List prescriptionImageUrls, + @NotNull(message = "컬렉션 값은 필수입니다.") List childProblems, Integer recommendedMinute, Integer recommendedSecond diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java index 459b45e..246bb54 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java @@ -8,15 +8,18 @@ @Getter @NoArgsConstructor public class ProblemSearchGetResponse { + private Long id; @NotNull(message = "문항 ID는 필수입니다") - private String problemId; + private String problemCustomId; private String memo; private String mainProblemImageUrl; + @NotNull(message = "개념 태그리스트는 필수입니다") private Set conceptTagResponses; - public ProblemSearchGetResponse(String problemId, String memo, String mainProblemImageUrl, + public ProblemSearchGetResponse(Long id, String problemCustomId, String memo, String mainProblemImageUrl, Set conceptTagResponses) { - this.problemId = problemId; + this.id = id; + this.problemCustomId = problemCustomId; this.memo = memo; this.mainProblemImageUrl = mainProblemImageUrl; this.conceptTagResponses = conceptTagResponses; diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java b/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java index bec194e..3457bce 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustom.java @@ -1,6 +1,7 @@ package com.moplus.moplus_server.domain.problem.repository; import static com.moplus.moplus_server.domain.concept.domain.QConceptTag.conceptTag; +import static com.moplus.moplus_server.domain.problem.domain.childProblem.QChildProblem.childProblem; import static com.moplus.moplus_server.domain.problem.domain.problem.QProblem.problem; import com.moplus.moplus_server.domain.problem.dto.response.ConceptTagSearchResponse; @@ -8,6 +9,7 @@ import com.querydsl.core.group.GroupBy; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -23,15 +25,18 @@ public List search(String problemId, String memo, List return queryFactory .select(problem.problemCustomId.id, problem.memo, problem.mainProblemImageUrl) .from(problem) + .leftJoin(childProblem).on(childProblem.in(problem.childProblems)) + .leftJoin(conceptTag).on(conceptTag.id.in(problem.conceptTagIds) + .or(conceptTag.id.in(childProblem.conceptTagIds))) .where( containsProblemId(problemId), containsName(memo), - inConceptTagIds(conceptTagIds) + hasConceptTags(conceptTagIds) ) - .leftJoin(conceptTag).on(conceptTag.id.in(problem.conceptTagIds)).fetchJoin() .distinct() .transform(GroupBy.groupBy(problem.id).list( Projections.constructor(ProblemSearchGetResponse.class, + problem.id, problem.problemCustomId.id, problem.memo, problem.mainProblemImageUrl, @@ -45,6 +50,30 @@ public List search(String problemId, String memo, List )); } + private BooleanExpression hasConceptTags(List conceptTagIds) { + if (conceptTagIds == null || conceptTagIds.isEmpty()) { + return null; + } + + return problem.id.in( + JPAExpressions + .selectFrom(problem) + .where( + problem.conceptTagIds.any().in(conceptTagIds) + .or( + problem.id.in( + JPAExpressions + .select(childProblem.id) + .from(childProblem) + .where(childProblem.conceptTagIds.any() + .in(conceptTagIds)) + ) + ) + ) + .select(problem.id) + ); + } + //problemCustomId 일부 포함 검색 private BooleanExpression containsProblemId(String problemId) { return (problemId == null || problemId.isEmpty()) ? null diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/service/ImageUploadService.java b/src/main/java/com/moplus/moplus_server/domain/problem/service/ImageUploadService.java index 6ba2888..634f602 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/service/ImageUploadService.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/service/ImageUploadService.java @@ -1,7 +1,6 @@ package com.moplus.moplus_server.domain.problem.service; import com.amazonaws.HttpMethod; -import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId; import com.moplus.moplus_server.domain.problem.domain.problem.ProblemImageType; import com.moplus.moplus_server.domain.problem.repository.ProblemRepository; import com.moplus.moplus_server.global.utils.s3.S3Util; @@ -17,15 +16,15 @@ public class ImageUploadService { private final S3Util s3Util; private final ProblemRepository problemRepository; - public String generateProblemImagePresignedUrl(String problemId, ProblemImageType imageType) { - problemRepository.existsByProblemAdminIdElseThrow(new ProblemCustomId(problemId)); + public String generateProblemImagePresignedUrl(Long problemId, ProblemImageType imageType) { + problemRepository.existsByIdElseThrow(problemId); String fileName = generateProblemImageFileName(problemId, imageType); return s3Util.getS3PresignedUrl(fileName, HttpMethod.PUT); } - private String generateProblemImageFileName(String problemId, ProblemImageType imageType) { + private String generateProblemImageFileName(Long problemId, ProblemImageType imageType) { String uuid = UUID.randomUUID().toString(); - return String.format("%s%s/%s/%s.jpg", + return String.format("%s%d/%s/%s.jpg", PROBLEM_IMAGE_PREFIX, problemId, imageType.getType(), diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java index e398789..bd4e0fa 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java @@ -1,8 +1,10 @@ package com.moplus.moplus_server.domain.problemset.dto.request; +import jakarta.validation.constraints.NotNull; import java.util.List; public record ProblemReorderRequest( + @NotNull(message = "컬렉션 값은 필수입니다.") List newProblems ) { } diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java index d8d1abf..4b8a872 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java @@ -1,10 +1,12 @@ package com.moplus.moplus_server.domain.problemset.dto.request; import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; +import jakarta.validation.constraints.NotNull; import java.util.List; public record ProblemSetPostRequest( String problemSetTitle, + @NotNull(message = "컬렉션 값은 필수입니다.") List problems ) { public ProblemSet toEntity(List problemIdList) { diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java index 3cd3091..97d6d48 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java @@ -1,9 +1,11 @@ package com.moplus.moplus_server.domain.problemset.dto.request; +import jakarta.validation.constraints.NotNull; import java.util.List; public record ProblemSetUpdateRequest( String problemSetTitle, + @NotNull(message = "컬렉션 값은 필수입니다.") List problemIds ) { } diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java index 7c32ba7..ab71eae 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java @@ -2,6 +2,7 @@ import com.moplus.moplus_server.domain.problemset.domain.ProblemSet; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; +import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.util.List; import lombok.Builder; @@ -12,9 +13,11 @@ public record ProblemSetGetResponse( String title, ProblemSetConfirmStatus confirmStatus, LocalDate publishedDate, + @NotNull(message = "컬렉션 값은 필수입니다.") List problemSummaries ) { - public static ProblemSetGetResponse of(ProblemSet problemSet, LocalDate publishedDate, List problemSummaries) { + public static ProblemSetGetResponse of(ProblemSet problemSet, LocalDate publishedDate, + List problemSummaries) { return ProblemSetGetResponse.builder() .id(problemSet.getId()) diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java index 789b310..5803ad1 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java @@ -1,6 +1,7 @@ package com.moplus.moplus_server.domain.problemset.dto.response; import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus; +import jakarta.validation.constraints.NotNull; import java.time.LocalDate; import java.util.List; import lombok.Getter; @@ -12,10 +13,12 @@ public class ProblemSetSearchGetResponse { private String problemSetTitle; private ProblemSetConfirmStatus confirmStatus; private LocalDate publishedDate; + @NotNull(message = "컬렉션 값은 필수입니다.") private List problemThumbnailResponses; public ProblemSetSearchGetResponse( - String problemSetTitle, ProblemSetConfirmStatus confirmStatus, LocalDate publishedDate, List problemThumbnailResponses + String problemSetTitle, ProblemSetConfirmStatus confirmStatus, LocalDate publishedDate, + List problemThumbnailResponses ) { this.problemSetTitle = problemSetTitle; this.confirmStatus = confirmStatus; diff --git a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java index 8317e89..4bb2cfe 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java +++ b/src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java @@ -1,6 +1,7 @@ package com.moplus.moplus_server.domain.problemset.dto.response; import com.moplus.moplus_server.domain.problem.domain.problem.Problem; +import jakarta.validation.constraints.NotNull; import java.util.List; import lombok.Builder; @@ -11,6 +12,7 @@ public record ProblemSummaryResponse( String practiceTestName, String memo, String mainProblemImageUrl, + @NotNull(message = "컬렉션 값은 필수입니다.") List tagNames ) { public static ProblemSummaryResponse of(Problem problem, String practiceTestName, List tagNames) { diff --git a/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java b/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java index 4eb1e25..d586582 100644 --- a/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java +++ b/src/test/java/com/moplus/moplus_server/domain/problem/repository/ProblemSearchRepositoryCustomTest.java @@ -27,7 +27,7 @@ public class ProblemSearchRepositoryCustomTest { // then assertThat(result).hasSize(2); - assertThat(result).extracting(ProblemSearchGetResponse::getProblemId) + assertThat(result).extracting(ProblemSearchGetResponse::getProblemCustomId) .containsExactlyInAnyOrder("1224052001", "1224052002"); } @@ -38,7 +38,7 @@ public class ProblemSearchRepositoryCustomTest { // then assertThat(result).hasSize(1); - assertThat(result.get(0).getProblemId()).isEqualTo("1224052001"); + assertThat(result.get(0).getProblemCustomId()).isEqualTo("1224052001"); } @Test @@ -48,7 +48,7 @@ public class ProblemSearchRepositoryCustomTest { // then assertThat(result).hasSize(2); - assertThat(result).extracting(ProblemSearchGetResponse::getProblemId) + assertThat(result).extracting(ProblemSearchGetResponse::getProblemCustomId) .containsExactlyInAnyOrder("1224052001", "1224052002"); } @@ -59,7 +59,7 @@ public class ProblemSearchRepositoryCustomTest { // then assertThat(result).hasSize(1); - assertThat(result.get(0).getProblemId()).isEqualTo("1224052001"); + assertThat(result.get(0).getProblemCustomId()).isEqualTo("1224052001"); } @Test