Skip to content

Hotfix/#55 문항세트, 발행 문제 해결 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seokbeom00 merged 3 commits into from
Feb 16, 2025
Merged

Hotfix/#55 문항세트, 발행 문제 해결 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39be34d
[feat/#55] 공통응답 어드바이스 추가
seokbeom00 Feb 16, 2025
1ad4958
[fix/#55] 문항세트 검색 변경사항 반영
seokbeom00 Feb 16, 2025
7997431
[fix/#55] 변경된 data 필드 추가
seokbeom00 Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...ava/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ public class ProblemSetSearchController {
)
public ResponseEntity<List<ProblemSetSearchGetResponse>> search(
@RequestParam(value = "problemSetTitle", required = false) String problemSetTitle,
@RequestParam(value = "problemTitle", required = false) String problemTitle,
@RequestParam(value = "conceptTagNames", required = false) List<String> conceptTagNames
@RequestParam(value = "problemTitle", required = false) String problemTitle
) {
List<ProblemSetSearchGetResponse> problemSets = problemSetSearchRepository.search(problemSetTitle, problemTitle,
conceptTagNames);
List<ProblemSetSearchGetResponse> problemSets = problemSetSearchRepository.search(problemSetTitle, problemTitle);
return ResponseEntity.ok(problemSets);
}

Expand All @@ -44,11 +42,10 @@ public ResponseEntity<List<ProblemSetSearchGetResponse>> search(
)
public ResponseEntity<List<ProblemSetSearchGetResponse>> confirmSearch(
@RequestParam(value = "problemSetTitle", required = false) String problemSetTitle,
@RequestParam(value = "problemTitle", required = false) String problemTitle,
@RequestParam(value = "conceptTagNames", required = false) List<String> conceptTagNames
@RequestParam(value = "problemTitle", required = false) String problemTitle
) {
List<ProblemSetSearchGetResponse> problemSets = problemSetSearchRepository.confirmSearch(problemSetTitle,
problemTitle, conceptTagNames);
problemTitle);
return ResponseEntity.ok(problemSets);
}
}
16 changes: 4 additions & 12 deletions ...m/moplus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,15 @@ public class ProblemSetSearchRepositoryCustom {

private final JPAQueryFactory queryFactory;

public List<ProblemSetSearchGetResponse> search(String problemSetTitle, String problemTitle,
List<String> conceptTagNames) {
public List<ProblemSetSearchGetResponse> search(String problemSetTitle, String problemTitle) {
return queryFactory
.from(problemSet)
.leftJoin(problem).on(problem.id.in(problemSet.problemIds)) // 문제 세트 내 포함된 문항과 조인
.leftJoin(conceptTag).on(conceptTag.id.in(problem.conceptTagIds)) // 문제의 개념 태그 조인
.leftJoin(publish).on(publish.problemSetId.eq(problemSet.id)) // 문제 세트와 발행 데이터 조인
.where(
containsProblemSetTitle(problemSetTitle),
containsProblemTitle(problemTitle),
containsConceptTagNames(conceptTagNames)
containsProblemTitle(problemTitle)
)
.distinct()
.transform(GroupBy.groupBy(problemSet.id).list(
Expand All @@ -51,8 +49,7 @@ public List<ProblemSetSearchGetResponse> search(String problemSetTitle, String p
));
}

public List<ProblemSetSearchGetResponse> confirmSearch(String problemSetTitle, String problemTitle,
List<String> conceptTagNames) {
public List<ProblemSetSearchGetResponse> confirmSearch(String problemSetTitle, String problemTitle) {
return queryFactory
.from(problemSet)
.leftJoin(problem).on(problem.id.in(problemSet.problemIds)) // 문제 세트 내 포함된 문항과 조인
Expand All @@ -61,8 +58,7 @@ public List<ProblemSetSearchGetResponse> confirmSearch(String problemSetTitle, S
.where(
problemSet.confirmStatus.eq(CONFIRMED),
containsProblemSetTitle(problemSetTitle),
containsProblemTitle(problemTitle),
containsConceptTagNames(conceptTagNames)
containsProblemTitle(problemTitle)
)
.distinct()
.transform(GroupBy.groupBy(problemSet.id).list(
Expand All @@ -89,8 +85,4 @@ private BooleanExpression containsProblemSetTitle(String problemSetTitle) {
private BooleanExpression containsProblemTitle(String problemTitle) {
return (problemTitle == null || problemTitle.isEmpty()) ? null : problem.memo.containsIgnoreCase(problemTitle);
}

private BooleanExpression containsConceptTagNames(List<String> conceptTagNames) {
return (conceptTagNames == null || conceptTagNames.isEmpty()) ? null : conceptTag.name.in(conceptTagNames);
}
}
20 changes: 20 additions & 0 deletions src/main/java/com/moplus/moplus_server/global/response/ResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.moplus.moplus_server.global.response;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.moplus.moplus_server.global.error.ErrorResponse;
import org.springframework.http.HttpStatus;

@JsonInclude(JsonInclude.Include.NON_NULL)
public record ResponseDto<T>(
T data,
String message,
HttpStatus status
) {
public static <T> ResponseDto<T> success(final T data) {
return new ResponseDto<>(data, null, null);
}

public static <T> ResponseDto<T> fail(ErrorResponse errorResponse) {
return new ResponseDto<>(null, errorResponse.getMessage(), errorResponse.getStatus());
}
}
39 changes: 39 additions & 0 deletions src/main/java/com/moplus/moplus_server/global/response/ResponseDtoAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.moplus.moplus_server.global.response;

import com.moplus.moplus_server.global.error.ErrorResponse;
import com.moplus.moplus_server.global.error.exception.ErrorCode;
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;

@RestControllerAdvice(
basePackages = "com.moplus.moplus_server"
)

public class ResponseDtoAdvice implements ResponseBodyAdvice<Object> {

@Override
public boolean supports(MethodParameter returnType, Class converterType) {
return !(returnType.getParameterType() == ResponseDto.class)
&& MappingJackson2HttpMessageConverter.class.isAssignableFrom(converterType);
}

@Override
public Object beforeBodyWrite(
Object body,
MethodParameter returnType,
MediaType selectedContentType,
Class selectedConverterType,
ServerHttpRequest request,
ServerHttpResponse response
) {
if (body instanceof ErrorResponse) {
return ResponseDto.fail((ErrorResponse) body);
}
return ResponseDto.success(body);
}
}
6 changes: 3 additions & 3 deletions src/test/java/com/moplus/moplus_server/domain/member/controller/MemberControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public void setMockMvc() throws Exception {
.contentType("application/json")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + validToken))
.andExpect(status().isOk()) // 200 응답 확인
.andExpect(jsonPath("$.id").exists()) // MemberGetResponse의 필드 확인
.andExpect(jsonPath("$.name").exists())
.andExpect(jsonPath("$.email").exists());
.andExpect(jsonPath("$.data.id").exists()) // MemberGetResponse의 필드 확인
.andExpect(jsonPath("$.data.name").exists())
.andExpect(jsonPath("$.data.email").exists());
}
}
}
30 changes: 8 additions & 22 deletions ...plus/moplus_server/domain/problemset/repository/ProblemSetSearchRepositoryCustomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 문항세트_타이틀_일부_포함_검색() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null, null);
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null);

// then
assertThat(result).hasSize(1);
Expand All @@ -46,18 +46,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 문항타이틀_포함_검색() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search(null, "설명", null);

// then
assertThat(result).hasSize(2);
assertThat(result.get(0).getProblemSetTitle()).isEqualTo("2025년 5월 고2 모의고사 문제 세트");
assertThat(result.get(1).getProblemSetTitle()).isEqualTo("2025년 5월 고3 모의고사 문제 세트");
}

@Test
void 개념태그_하나라도_포함되면_조회() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search(null, null, List.of("미분 개념"));
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search(null, "설명");

// then
assertThat(result).hasSize(2);
Expand All @@ -68,7 +57,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 모두_적용된_검색() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2", "설명 1", List.of("미분 개념"));
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2", "설명 1");

// then
assertThat(result).hasSize(1);
Expand All @@ -78,7 +67,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 아무_조건도_없으면_모든_데이터_조회() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search(null, null, null);
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search(null, null);

// then
assertThat(result).hasSize(2);
Expand All @@ -87,7 +76,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 문항_여러개_문항세트_검색_조회() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null, null);
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null);

// then
assertThat(result).hasSize(1);
Expand All @@ -111,7 +100,7 @@ public class ProblemSetSearchRepositoryCustomTest {
@Test
void 발행되지_않은_문항세트는_NOT_CONFIRMED_테스트() {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null, null);
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고2 모의고사", null);

// then
assertThat(result).hasSize(1);
Expand All @@ -128,7 +117,7 @@ public class ProblemSetSearchRepositoryCustomTest {
publishSaveService.createPublish(new PublishPostRequest(publishDate, 2L));

// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고3 모의고사", null, null);
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.search("고3 모의고사", null);

// then
assertThat(result).hasSize(1);
Expand All @@ -146,8 +135,7 @@ public class ProblemSetSearchRepositoryCustomTest {
// when: publishSearch 실행 (CONFIRMED 상태만 검색되어야 함)
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.confirmSearch(
"고",
"설명",
List.of("미분 개념")
"설명"
);

// then
Expand All @@ -164,7 +152,6 @@ public class ProblemSetSearchRepositoryCustomTest {

// when: 발행된 문제 세트만 조회하는 publishSearch 실행
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.confirmSearch(
null,
null,
null
);
Expand All @@ -182,7 +169,6 @@ public class ProblemSetSearchRepositoryCustomTest {
// when
List<ProblemSetSearchGetResponse> result = problemSetSearchRepository.confirmSearch(
"고3 모의고사",
null,
null
);

Expand Down