Skip to content

Commit 560bac0

Browse files
starwookstarwook
committed
style: 코딩 컨벤션 적용
1 parent f35c8ff commit 560bac0

File tree

10 files changed

+294
-297
lines changed

10 files changed

+294
-297
lines changed

‎application/src/main/java/com/comssa/api/question/service/rest/license/implement/AdminLicenseQuestionGetService.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
@RequiredArgsConstructor
2020
public class AdminLicenseQuestionGetService implements LicenseQuestionGetService {
2121

22-
private final LicenseMultipleChoiceQuestionDslRepository licenseMultipleChoiceQuestionDslRepository;
23-
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
22+
private final LicenseMultipleChoiceQuestionDslRepository licenseMultipleChoiceQuestionDslRepository;
23+
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
2424

25-
/**
26-
* 관리자 조회시 허용 여부와 관련 없이 모든 문제를 가져온다.
27-
* 문제지도 섞지 않는다.
28-
* 허용 여부 순대로 섞는다
29-
*/
30-
@Override
31-
public Map<QuestionCategory, List<Question>> getClassifiedLicenseMultipleChoiceQuestion(
32-
Long sessionId) {
33-
List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository
34-
.findAllWhereLicenseSessionId(sessionId);
35-
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(licenseMultipleChoiceQuestions);
36-
}
25+
/**
26+
* 관리자 조회시 허용 여부와 관련 없이 모든 문제를 가져온다.
27+
* 문제지도 섞지 않는다.
28+
* 허용 여부 순대로 섞는다
29+
*/
30+
@Override
31+
public Map<QuestionCategory, List<Question>> getClassifiedLicenseMultipleChoiceQuestion(
32+
Long sessionId) {
33+
List<LicenseMultipleChoiceQuestion> licenseMultipleChoiceQuestions = licenseMultipleChoiceQuestionDslRepository
34+
.findAllWhereLicenseSessionId(sessionId);
35+
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(licenseMultipleChoiceQuestions);
36+
}
3737
}

‎application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionClassifiedGetService.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
@RequiredArgsConstructor
2121
@Transactional
2222
public class BasicAdminMajorQuestionClassifiedGetService implements AdminMajorQuestionClassifiedGetService {
23-
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
24-
private final MajorDescriptiveDslRepository majorDescriptiveQuestionChooseRepository;
25-
private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
23+
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
24+
private final MajorDescriptiveDslRepository majorDescriptiveQuestionChooseRepository;
25+
private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
2626

27-
/**
28-
* 관리자가 조회시 Approve됐는지 기준으로 정렬되며(false인 것부터),
29-
* 이후엔 객관식 -> 주관식으로 정렬된다.
30-
*
31-
* @return
32-
*/
33-
@Override
34-
public Map<QuestionCategory, List<Question>> getClassifiedAllMajorMultipleChoiceQuestions() {
35-
List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository
36-
.findAllOrderByIfApprovedAsc();
37-
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions);
38-
}
27+
/**
28+
* 관리자가 조회시 Approve됐는지 기준으로 정렬되며(false인 것부터),
29+
* 이후엔 객관식 -> 주관식으로 정렬된다.
30+
*
31+
* @return
32+
*/
33+
@Override
34+
public Map<QuestionCategory, List<Question>> getClassifiedAllMajorMultipleChoiceQuestions() {
35+
List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository
36+
.findAllOrderByIfApprovedAsc();
37+
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions);
38+
}
3939

40-
@Override
41-
public Map<QuestionCategory, List<Question>> getClassifiedAllMajorDescriptiveQuestions() {
42-
List<MajorDescriptiveQuestion> majorDescriptiveQuestions =
43-
majorDescriptiveQuestionChooseRepository.findAllOrderByIfApprovedAsc();
44-
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions);
45-
}
40+
@Override
41+
public Map<QuestionCategory, List<Question>> getClassifiedAllMajorDescriptiveQuestions() {
42+
List<MajorDescriptiveQuestion> majorDescriptiveQuestions =
43+
majorDescriptiveQuestionChooseRepository.findAllOrderByIfApprovedAsc();
44+
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions);
45+
}
4646
}

‎application/src/main/java/com/comssa/api/question/service/rest/major/implement/BasicAdminMajorQuestionMakeService.java

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -22,74 +22,74 @@
2222
@Transactional
2323
public class BasicAdminMajorQuestionMakeService implements AdminMajorQuestionMakeService {
2424

25-
private final QuestionRepository questionRepository;
26-
private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository;
27-
private final QuestionChoiceService questionChoiceService;
28-
private final DuplicateQuestionDetector duplicateQuestionDetector;
25+
private final QuestionRepository questionRepository;
26+
private final MajorMultipleChoiceQuestionRepository majorMultipleChoiceQuestionRepository;
27+
private final QuestionChoiceService questionChoiceService;
28+
private final DuplicateQuestionDetector duplicateQuestionDetector;
2929

30-
/**
31-
* 리스트로 생성
32-
*/
33-
@Override
34-
public List<MajorMultipleChoiceQuestion> makeMultipleChoiceQuestions(
35-
List<RequestMakeMultipleChoiceQuestionDto> requestDtos) {
36-
// 중복되지 않은 질문을 필터링하여 저장
37-
return requestDtos.stream()
38-
.filter(this::isNotDuplicateQuestion)
39-
.map(this::saveMajorMultipleChoiceQuestion)
40-
.collect(Collectors.toList());
41-
}
30+
/**
31+
* 리스트로 생성
32+
*/
33+
@Override
34+
public List<MajorMultipleChoiceQuestion> makeMultipleChoiceQuestions(
35+
List<RequestMakeMultipleChoiceQuestionDto> requestDtos) {
36+
// 중복되지 않은 질문을 필터링하여 저장
37+
return requestDtos.stream()
38+
.filter(this::isNotDuplicateQuestion)
39+
.map(this::saveMajorMultipleChoiceQuestion)
40+
.collect(Collectors.toList());
41+
}
4242

43-
/**
44-
* 단일 생성
45-
*/
46-
@Override
47-
public MajorMultipleChoiceQuestion makeMultipleChoiceQuestion(
48-
RequestMakeMultipleChoiceQuestionDto requestDto) throws DuplicateQuestionContentException {
49-
if (!isNotDuplicateQuestion(requestDto)) {
50-
throw new DuplicateQuestionContentException();
51-
}
52-
return saveMajorMultipleChoiceQuestion(requestDto);
53-
}
43+
/**
44+
* 단일 생성
45+
*/
46+
@Override
47+
public MajorMultipleChoiceQuestion makeMultipleChoiceQuestion(
48+
RequestMakeMultipleChoiceQuestionDto requestDto) throws DuplicateQuestionContentException {
49+
if (!isNotDuplicateQuestion(requestDto)) {
50+
throw new DuplicateQuestionContentException();
51+
}
52+
return saveMajorMultipleChoiceQuestion(requestDto);
53+
}
5454

55-
@Override
56-
public List<MajorDescriptiveQuestion> makeDescriptiveQuestions(
57-
List<RequestMakeMajorDescriptiveQuestionDto> requestNormalQuestionDto) {
55+
@Override
56+
public List<MajorDescriptiveQuestion> makeDescriptiveQuestions(
57+
List<RequestMakeMajorDescriptiveQuestionDto> requestNormalQuestionDto) {
5858

59-
return requestNormalQuestionDto.stream()
60-
.map(this::saveMajorDescriptiveQuestion)
61-
.collect(Collectors.toList());
62-
}
59+
return requestNormalQuestionDto.stream()
60+
.map(this::saveMajorDescriptiveQuestion)
61+
.collect(Collectors.toList());
62+
}
6363

64-
/**
65-
* 중복되지 않은 질문인지 확인하는 메서드
66-
* 매번 DB에서 새롭게 조회 후 검증한다.(DTO 자체의 중복된 데이터)
67-
*/
68-
private boolean isNotDuplicateQuestion(RequestMakeMultipleChoiceQuestionDto requestDto) {
69-
return majorMultipleChoiceQuestionRepository.findAll().stream()
70-
.noneMatch(existingQuestion -> duplicateQuestionDetector.isQuestionDuplicate(
71-
existingQuestion.getContent(), requestDto.getContent()));
72-
}
64+
/**
65+
* 중복되지 않은 질문인지 확인하는 메서드
66+
* 매번 DB에서 새롭게 조회 후 검증한다.(DTO 자체의 중복된 데이터)
67+
*/
68+
private boolean isNotDuplicateQuestion(RequestMakeMultipleChoiceQuestionDto requestDto) {
69+
return majorMultipleChoiceQuestionRepository.findAll().stream()
70+
.noneMatch(existingQuestion -> duplicateQuestionDetector.isQuestionDuplicate(
71+
existingQuestion.getContent(), requestDto.getContent()));
72+
}
7373

74-
/**
75-
* 새로운 질문을 저장하고 선택지를 저장하는 메서드
76-
*/
77-
private MajorMultipleChoiceQuestion saveMajorMultipleChoiceQuestion(
78-
RequestMakeMultipleChoiceQuestionDto requestDto) {
79-
MajorMultipleChoiceQuestion question = MajorMultipleChoiceQuestion.makeWithDto(requestDto);
80-
questionRepository.save(question);
81-
questionChoiceService.saveWith(requestDto, question);
82-
return question;
83-
}
74+
/**
75+
* 새로운 질문을 저장하고 선택지를 저장하는 메서드
76+
*/
77+
private MajorMultipleChoiceQuestion saveMajorMultipleChoiceQuestion(
78+
RequestMakeMultipleChoiceQuestionDto requestDto) {
79+
MajorMultipleChoiceQuestion question = MajorMultipleChoiceQuestion.makeWithDto(requestDto);
80+
questionRepository.save(question);
81+
questionChoiceService.saveWith(requestDto, question);
82+
return question;
83+
}
8484

85-
private MajorDescriptiveQuestion saveMajorDescriptiveQuestion(
86-
RequestMakeMajorDescriptiveQuestionDto requestDto
87-
) {
88-
MajorDescriptiveQuestion question = MajorDescriptiveQuestion.makeWithDto(
89-
requestDto
90-
);
91-
questionRepository.save(question);
92-
return question;
93-
}
85+
private MajorDescriptiveQuestion saveMajorDescriptiveQuestion(
86+
RequestMakeMajorDescriptiveQuestionDto requestDto
87+
) {
88+
MajorDescriptiveQuestion question = MajorDescriptiveQuestion.makeWithDto(
89+
requestDto
90+
);
91+
questionRepository.save(question);
92+
return question;
93+
}
9494
}
9595

‎application/src/main/java/com/comssa/api/question/service/rest/major/implement/UserMajorQuestionClassifiedGetService.java

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@
2020
@Service
2121
@RequiredArgsConstructor
2222
public class UserMajorQuestionClassifiedGetService implements MajorQuestionClassifiedGetService<Question> {
23-
private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
24-
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
25-
private final MajorDescriptiveDslRepository majorDescriptiveQuestionDslRepository;
23+
private final MajorMultipleChoiceQuestionDslRepository majorMultipleChoiceQuestionDslRepository;
24+
private final QuestionClassifyByCategoryService questionClassifyByCategoryService;
25+
private final MajorDescriptiveDslRepository majorDescriptiveQuestionDslRepository;
2626

27-
/**
28-
* 분야, 난이도 파라미터로 문제를 조회하는 경우 - 객관식.
29-
* 문제 선택지들을 섞어준다.
30-
*/
31-
@Override
32-
public Map<QuestionCategory, List<Question>> getApprovedClassifiedMajorMultipleChoiceQuestions(
33-
RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto) {
34-
List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository
35-
.findAllCategoriesAndLevelsAndIfApproved(
36-
requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(),
37-
requestGetQuestionByCategoryAndLevelDto.getQuestionLevels(),
38-
true);
39-
for (MajorMultipleChoiceQuestion question : majorMultipleChoiceQuestions) {
40-
Collections.shuffle(question.getQuestionChoices());
41-
}
42-
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions);
43-
}
27+
/**
28+
* 분야, 난이도 파라미터로 문제를 조회하는 경우 - 객관식.
29+
* 문제 선택지들을 섞어준다.
30+
*/
31+
@Override
32+
public Map<QuestionCategory, List<Question>> getApprovedClassifiedMajorMultipleChoiceQuestions(
33+
RequestGetQuestionByCategoryAndLevelDto requestGetQuestionByCategoryAndLevelDto) {
34+
List<MajorMultipleChoiceQuestion> majorMultipleChoiceQuestions = majorMultipleChoiceQuestionDslRepository
35+
.findAllCategoriesAndLevelsAndIfApproved(
36+
requestGetQuestionByCategoryAndLevelDto.getQuestionCategories(),
37+
requestGetQuestionByCategoryAndLevelDto.getQuestionLevels(),
38+
true);
39+
for (MajorMultipleChoiceQuestion question : majorMultipleChoiceQuestions) {
40+
Collections.shuffle(question.getQuestionChoices());
41+
}
42+
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorMultipleChoiceQuestions);
43+
}
4444

4545

46-
/**
47-
* 분야, 난이도 파라미터로 문제를 조회하는 경우 - 서술형
48-
*/
49-
@Override
50-
public Map<QuestionCategory, List<Question>> getApprovedClassifiedDescriptiveQuestions(
51-
RequestGetQuestionByCategoryAndLevelDto dto) {
52-
List<MajorDescriptiveQuestion> majorDescriptiveQuestions = majorDescriptiveQuestionDslRepository
53-
.findAllCategoriesAndLevelsAndIfApproved(
54-
dto.getQuestionCategories(),
55-
dto.getQuestionLevels(),
56-
true
57-
);
58-
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions);
59-
}
46+
/**
47+
* 분야, 난이도 파라미터로 문제를 조회하는 경우 - 서술형
48+
*/
49+
@Override
50+
public Map<QuestionCategory, List<Question>> getApprovedClassifiedDescriptiveQuestions(
51+
RequestGetQuestionByCategoryAndLevelDto dto) {
52+
List<MajorDescriptiveQuestion> majorDescriptiveQuestions = majorDescriptiveQuestionDslRepository
53+
.findAllCategoriesAndLevelsAndIfApproved(
54+
dto.getQuestionCategories(),
55+
dto.getQuestionLevels(),
56+
true
57+
);
58+
return questionClassifyByCategoryService.classifyQuestionByCategoryOrdered(majorDescriptiveQuestions);
59+
}
6060
}

‎persistence/src/main/java/com/comssa/persistence/question/domain/license/LicenseMultipleChoiceQuestion.java

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -29,54 +29,54 @@
2929
@DiscriminatorValue("LM")
3030
public class LicenseMultipleChoiceQuestion extends Question implements ChoiceBehavior {
3131

32-
@Enumerated(value = EnumType.STRING)
33-
protected LicenseCategory licenseCategory;
34-
@ManyToOne
35-
@JoinColumn(name = "license_session_id")
36-
private LicenseSession licenseSession;
37-
@OneToMany(mappedBy = "question", cascade = CascadeType.ALL, orphanRemoval = true)
38-
private List<LicenseQuestionChoice> questionChoices;
39-
32+
@Enumerated(value = EnumType.STRING)
33+
protected LicenseCategory licenseCategory;
34+
@ManyToOne
35+
@JoinColumn(name = "license_session_id")
36+
private LicenseSession licenseSession;
37+
@OneToMany(mappedBy = "question", cascade = CascadeType.ALL, orphanRemoval = true)
38+
private List<LicenseQuestionChoice> questionChoices;
4039

41-
public static LicenseMultipleChoiceQuestion makeWithDto(
42-
RequestMakeMultipleChoiceQuestionDto dto,
43-
LicenseSession licenseSession,
44-
LicenseCategory licenseCategory) {
45-
LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder()
46-
.content(dto.getContent())
47-
.questionCategory(dto.getQuestionCategory())
48-
.questionLevel(dto.getQuestionLevel())
49-
.description(dto.getDescription())
50-
.imageUrl(null)
51-
.licenseSession(licenseSession)
52-
.licenseCategory(licenseCategory)
53-
.build();
54-
licenseMultipleChoiceQuestion.initDefaults();
55-
return licenseMultipleChoiceQuestion;
56-
}
5740

41+
public static LicenseMultipleChoiceQuestion makeWithDto(
42+
RequestMakeMultipleChoiceQuestionDto dto,
43+
LicenseSession licenseSession,
44+
LicenseCategory licenseCategory) {
45+
LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder()
46+
.content(dto.getContent())
47+
.questionCategory(dto.getQuestionCategory())
48+
.questionLevel(dto.getQuestionLevel())
49+
.description(dto.getDescription())
50+
.imageUrl(null)
51+
.licenseSession(licenseSession)
52+
.licenseCategory(licenseCategory)
53+
.build();
54+
licenseMultipleChoiceQuestion.initDefaults();
55+
return licenseMultipleChoiceQuestion;
56+
}
5857

59-
public static LicenseMultipleChoiceQuestion makeForTest(String test) {
60-
LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder()
61-
.id(1L)
62-
.content(test)
63-
.questionCategory(QuestionCategory.ALGORITHM)
64-
.questionLevel(QuestionLevel.LOW)
65-
.description(test)
66-
.imageUrl(null)
67-
.licenseSession(LicenseSession.builder()
68-
.licenseCategory(LicenseCategory.SQLD)
69-
.content(test)
70-
.build())
71-
.licenseCategory(LicenseCategory.SQLD)
72-
.build();
73-
licenseMultipleChoiceQuestion.initDefaults();
74-
return licenseMultipleChoiceQuestion;
75-
}
7658

77-
@Override
78-
public void initDefaults() {
79-
this.questionChoices = new ArrayList<>();
80-
}
59+
public static LicenseMultipleChoiceQuestion makeForTest(String test) {
60+
LicenseMultipleChoiceQuestion licenseMultipleChoiceQuestion = LicenseMultipleChoiceQuestion.builder()
61+
.id(1L)
62+
.content(test)
63+
.questionCategory(QuestionCategory.ALGORITHM)
64+
.questionLevel(QuestionLevel.LOW)
65+
.description(test)
66+
.imageUrl(null)
67+
.licenseSession(LicenseSession.builder()
68+
.licenseCategory(LicenseCategory.SQLD)
69+
.content(test)
70+
.build())
71+
.licenseCategory(LicenseCategory.SQLD)
72+
.build();
73+
licenseMultipleChoiceQuestion.initDefaults();
74+
return licenseMultipleChoiceQuestion;
75+
}
76+
77+
@Override
78+
public void initDefaults() {
79+
this.questionChoices = new ArrayList<>();
80+
}
8181

8282
}

0 commit comments

Comments
 (0)