Skip to content

Commit 0c1e44c

Browse files
committed
♻️ refactor : PR 리뷰 반영 (메서드 네이밍, static import, 빌더 패턴 삭제)
1 parent 3800aa8 commit 0c1e44c

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

backend/src/main/java/io/f1/backend/domain/question/app/QuestionService.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.f1.backend.domain.question.app;
22

3+
import static io.f1.backend.domain.question.mapper.QuestionMapper.questionRequestToQuestion;
4+
import static io.f1.backend.domain.question.mapper.TextQuestionMapper.questionRequestToTextQuestion;
5+
36
import io.f1.backend.domain.question.dao.QuestionRepository;
47
import io.f1.backend.domain.question.dao.TextQuestionRepository;
58
import io.f1.backend.domain.question.dto.QuestionRequest;
69
import io.f1.backend.domain.question.entity.Question;
710
import io.f1.backend.domain.question.entity.TextQuestion;
8-
import io.f1.backend.domain.question.mapper.QuestionMapper;
9-
import io.f1.backend.domain.question.mapper.TextQuestionMapper;
1011
import io.f1.backend.domain.quiz.entity.Quiz;
1112

1213
import lombok.RequiredArgsConstructor;
@@ -24,12 +25,12 @@ public class QuestionService {
2425
@Transactional
2526
public void saveQuestion(Quiz quiz, QuestionRequest request) {
2627

27-
Question question = QuestionMapper.questionRequestToQuestion(quiz, request);
28+
Question question = questionRequestToQuestion(quiz, request);
2829
quiz.addQuestion(question);
2930
questionRepository.save(question);
3031

3132
TextQuestion textQuestion =
32-
TextQuestionMapper.questionRequestToTextQuestion(question, request.getContent());
33+
questionRequestToTextQuestion(question, request.getContent());
3334
textQuestionRepository.save(textQuestion);
3435
question.addTextQuestion(textQuestion);
3536
}

backend/src/main/java/io/f1/backend/domain/quiz/app/QuizService.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package io.f1.backend.domain.quiz.app;
22

3+
import static io.f1.backend.domain.quiz.mapper.QuizMapper.quizCreateRequestToQuiz;
4+
import static io.f1.backend.domain.quiz.mapper.QuizMapper.quizToQuizCreateResponse;
5+
36
import io.f1.backend.domain.question.app.QuestionService;
47
import io.f1.backend.domain.question.dto.QuestionRequest;
58
import io.f1.backend.domain.quiz.dao.QuizRepository;
69
import io.f1.backend.domain.quiz.dto.QuizCreateRequest;
710
import io.f1.backend.domain.quiz.dto.QuizCreateResponse;
811
import io.f1.backend.domain.quiz.entity.Quiz;
9-
import io.f1.backend.domain.quiz.mapper.QuizMapper;
1012
import io.f1.backend.domain.user.dao.UserRepository;
1113
import io.f1.backend.domain.user.entity.User;
1214

@@ -41,25 +43,25 @@ public class QuizService {
4143
@Transactional
4244
public QuizCreateResponse saveQuiz(MultipartFile file, QuizCreateRequest request)
4345
throws IOException {
44-
String imgUrl = defaultThumbnailPath;
46+
String thumbnailPath = defaultThumbnailPath;
4547

4648
if (file != null && !file.isEmpty()) {
4749
validateImageFile(file);
48-
imgUrl = saveThumbnail(file);
50+
thumbnailPath = convertToThumbnailPath(file);
4951
}
5052

5153
// TODO : 시큐리티 구현 이후 삭제 (data.sql로 초기 저장해둔 유저 get), 나중엔 현재 로그인한 유저의 아이디를 받아오도록 수정
5254
User user = userRepository.findById(1L).orElseThrow(RuntimeException::new);
5355

54-
Quiz quiz = QuizMapper.quizCreateRequestToQuiz(request, imgUrl, user);
56+
Quiz quiz = quizCreateRequestToQuiz(request, thumbnailPath, user);
5557

5658
Quiz savedQuiz = quizRepository.save(quiz);
5759

5860
for (QuestionRequest qRequest : request.getQuestions()) {
5961
questionService.saveQuestion(savedQuiz, qRequest);
6062
}
6163

62-
return QuizMapper.quizToQuizCreateResponse(savedQuiz);
64+
return quizToQuizCreateResponse(savedQuiz);
6365
}
6466

6567
private void validateImageFile(MultipartFile file) {
@@ -75,7 +77,7 @@ private void validateImageFile(MultipartFile file) {
7577
}
7678
}
7779

78-
private String saveThumbnail(MultipartFile file) throws IOException {
80+
private String convertToThumbnailPath(MultipartFile file) throws IOException {
7981
String originalFilename = file.getOriginalFilename();
8082
String ext = getExtension(originalFilename);
8183
String savedFilename = UUID.randomUUID().toString() + "." + ext;

backend/src/main/java/io/f1/backend/domain/quiz/entity/Quiz.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public class Quiz extends BaseEntity {
5353
@JoinColumn(name = "creator_id")
5454
private User creator;
5555

56-
@Builder
5756
public Quiz(
5857
String title,
5958
String description,

backend/src/main/java/io/f1/backend/domain/quiz/mapper/QuizMapper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ public class QuizMapper {
1111
public static Quiz quizCreateRequestToQuiz(
1212
QuizCreateRequest quizCreateRequest, String imgUrl, User user) {
1313

14-
return Quiz.builder()
15-
.title(quizCreateRequest.getTitle())
16-
.description(quizCreateRequest.getDescription())
17-
.quizType(quizCreateRequest.getQuizType())
18-
.thumbnailUrl(imgUrl)
19-
.creator(user) // TODO : 이후 creator에 들어갈 User은 현재 로그인 중인 유저를 가져오도록 변경
20-
.build();
14+
return new Quiz(
15+
quizCreateRequest.getTitle(),
16+
quizCreateRequest.getDescription(),
17+
quizCreateRequest.getQuizType(),
18+
imgUrl,
19+
user // TODO : 이후 creator에 들어갈 User은 현재 로그인 중인 유저를 가져오도록 변경
20+
);
2121
}
2222

2323
public static QuizCreateResponse quizToQuizCreateResponse(Quiz quiz) {

0 commit comments

Comments
 (0)