Skip to content

Commit bc345f6

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent f6a8ea5 commit bc345f6

File tree

17 files changed

+110
-87
lines changed

17 files changed

+110
-87
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import io.f1.backend.domain.question.mapper.QuestionMapper;
99
import io.f1.backend.domain.question.mapper.TextQuestionMapper;
1010
import io.f1.backend.domain.quiz.entity.Quiz;
11+
1112
import lombok.RequiredArgsConstructor;
13+
1214
import org.springframework.stereotype.Service;
1315
import org.springframework.transaction.annotation.Transactional;
1416

@@ -26,11 +28,9 @@ public void saveQuestion(Quiz quiz, QuestionRequest request) {
2628
quiz.addQuestion(question);
2729
questionRepository.save(question);
2830

29-
TextQuestion textQuestion = TextQuestionMapper.questionRequestToTextQuestion(question, request.getContent());
31+
TextQuestion textQuestion =
32+
TextQuestionMapper.questionRequestToTextQuestion(question, request.getContent());
3033
textQuestionRepository.save(textQuestion);
3134
question.addTextQuestion(textQuestion);
32-
3335
}
34-
35-
3636
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package io.f1.backend.domain.question.dao;
22

33
import io.f1.backend.domain.question.entity.Question;
4-
import org.springframework.data.jpa.repository.JpaRepository;
54

6-
public interface QuestionRepository extends JpaRepository<Question, Long> {
5+
import org.springframework.data.jpa.repository.JpaRepository;
76

8-
}
7+
public interface QuestionRepository extends JpaRepository<Question, Long> {}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package io.f1.backend.domain.question.dao;
22

33
import io.f1.backend.domain.question.entity.TextQuestion;
4-
import org.springframework.data.jpa.repository.JpaRepository;
54

6-
public interface TextQuestionRepository extends JpaRepository<TextQuestion, Long> {
5+
import org.springframework.data.jpa.repository.JpaRepository;
76

8-
}
7+
public interface TextQuestionRepository extends JpaRepository<TextQuestion, Long> {}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package io.f1.backend.domain.question.dto;
22

33
import jakarta.validation.constraints.NotBlank;
4+
45
import lombok.AccessLevel;
56
import lombok.Getter;
67
import lombok.NoArgsConstructor;
78

89
@Getter
9-
@NoArgsConstructor(access= AccessLevel.PROTECTED)
10+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1011
public class QuestionRequest {
1112

12-
@NotBlank(message="문제를 입력해주세요.")
13+
@NotBlank(message = "문제를 입력해주세요.")
1314
private String content;
1415

15-
@NotBlank(message="정답을 입력해주세요.")
16+
@NotBlank(message = "정답을 입력해주세요.")
1617
private String answer;
17-
1818
}

backend/src/main/java/io/f1/backend/domain/question/entity/Question.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
import jakarta.persistence.JoinColumn;
1414
import jakarta.persistence.ManyToOne;
1515
import jakarta.persistence.OneToOne;
16+
1617
import lombok.AccessLevel;
1718
import lombok.NoArgsConstructor;
1819

1920
@Entity
20-
@NoArgsConstructor(access= AccessLevel.PROTECTED)
21+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2122
public class Question extends BaseEntity {
2223

2324
@Id
@@ -33,13 +34,13 @@ public class Question extends BaseEntity {
3334

3435
@OneToOne(mappedBy = "question", cascade = CascadeType.REMOVE)
3536
private TextQuestion textQuestion;
36-
public Question(Quiz quiz, String answer) {
37-
this.quiz = quiz;
38-
this.answer = answer;
39-
}
4037

41-
public void addTextQuestion(TextQuestion textQuestion) {
42-
this.textQuestion = textQuestion;
43-
}
38+
public Question(Quiz quiz, String answer) {
39+
this.quiz = quiz;
40+
this.answer = answer;
41+
}
4442

43+
public void addTextQuestion(TextQuestion textQuestion) {
44+
this.textQuestion = textQuestion;
45+
}
4546
}

backend/src/main/java/io/f1/backend/domain/question/entity/TextQuestion.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import jakarta.persistence.Id;
88
import jakarta.persistence.JoinColumn;
99
import jakarta.persistence.OneToOne;
10+
1011
import lombok.AccessLevel;
1112
import lombok.NoArgsConstructor;
1213

1314
@Entity
14-
@NoArgsConstructor(access= AccessLevel.PROTECTED)
15+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1516
public class TextQuestion {
1617

1718
@Id
@@ -25,8 +26,8 @@ public class TextQuestion {
2526
@Column(nullable = false)
2627
private String content;
2728

28-
public TextQuestion(Question question, String content) {
29-
this.question = question;
30-
this.content = content;
31-
}
29+
public TextQuestion(Question question, String content) {
30+
this.question = question;
31+
this.content = content;
32+
}
3233
}

backend/src/main/java/io/f1/backend/domain/question/mapper/QuestionMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ public class QuestionMapper {
99
public static Question questionRequestToQuestion(Quiz quiz, QuestionRequest questionRequest) {
1010
return new Question(quiz, questionRequest.getAnswer());
1111
}
12-
1312
}

backend/src/main/java/io/f1/backend/domain/question/mapper/TextQuestionMapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ public class TextQuestionMapper {
88
public static TextQuestion questionRequestToTextQuestion(Question question, String content) {
99
return new TextQuestion(question, content);
1010
}
11-
1211
}

backend/src/main/java/io/f1/backend/domain/quiz/api/QuizController.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import io.f1.backend.domain.quiz.app.QuizService;
44
import io.f1.backend.domain.quiz.dto.QuizCreateRequest;
55
import io.f1.backend.domain.quiz.dto.QuizCreateResponse;
6+
67
import jakarta.validation.Valid;
7-
import java.io.IOException;
8+
89
import lombok.RequiredArgsConstructor;
10+
911
import org.springframework.http.HttpStatus;
1012
import org.springframework.http.MediaType;
1113
import org.springframework.http.ResponseEntity;
@@ -15,6 +17,8 @@
1517
import org.springframework.web.bind.annotation.RestController;
1618
import org.springframework.web.multipart.MultipartFile;
1719

20+
import java.io.IOException;
21+
1822
@RestController
1923
@RequestMapping("/quizzes")
2024
@RequiredArgsConstructor
@@ -23,10 +27,12 @@ public class QuizController {
2327
private final QuizService quizService;
2428

2529
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
26-
public ResponseEntity<QuizCreateResponse> saveQuiz(@RequestPart(required = false) MultipartFile file, @Valid @RequestPart QuizCreateRequest request) throws IOException {
30+
public ResponseEntity<QuizCreateResponse> saveQuiz(
31+
@RequestPart(required = false) MultipartFile file,
32+
@Valid @RequestPart QuizCreateRequest request)
33+
throws IOException {
2734
QuizCreateResponse response = quizService.saveQuiz(file, request);
2835

2936
return ResponseEntity.status(HttpStatus.CREATED).body(response);
3037
}
31-
3238
}

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@
99
import io.f1.backend.domain.quiz.mapper.QuizMapper;
1010
import io.f1.backend.domain.user.dao.UserRepository;
1111
import io.f1.backend.domain.user.entity.User;
12-
import java.io.IOException;
13-
import java.nio.file.Path;
14-
import java.nio.file.Paths;
15-
import java.util.List;
16-
import java.util.Optional;
17-
import java.util.UUID;
12+
1813
import lombok.RequiredArgsConstructor;
14+
1915
import org.springframework.beans.factory.annotation.Value;
2016
import org.springframework.stereotype.Service;
2117
import org.springframework.transaction.annotation.Transactional;
2218
import org.springframework.web.multipart.MultipartFile;
2319

20+
import java.io.IOException;
21+
import java.nio.file.Path;
22+
import java.nio.file.Paths;
23+
import java.util.List;
24+
import java.util.UUID;
25+
2426
@Service
2527
@RequiredArgsConstructor
2628
public class QuizService {
@@ -37,10 +39,11 @@ public class QuizService {
3739
private final QuizRepository quizRepository;
3840

3941
@Transactional
40-
public QuizCreateResponse saveQuiz(MultipartFile file, QuizCreateRequest request) throws IOException {
42+
public QuizCreateResponse saveQuiz(MultipartFile file, QuizCreateRequest request)
43+
throws IOException {
4144
String imgUrl = defaultThumbnailPath;
4245

43-
if(file!=null && !file.isEmpty()) {
46+
if (file != null && !file.isEmpty()) {
4447
validateImageFile(file);
4548
imgUrl = saveThumbnail(file);
4649
}
@@ -52,7 +55,7 @@ public QuizCreateResponse saveQuiz(MultipartFile file, QuizCreateRequest request
5255

5356
Quiz savedQuiz = quizRepository.save(quiz);
5457

55-
for(QuestionRequest qRequest : request.getQuestions()) {
58+
for (QuestionRequest qRequest : request.getQuestions()) {
5659
questionService.saveQuestion(savedQuiz, qRequest);
5760
}
5861

@@ -61,13 +64,13 @@ public QuizCreateResponse saveQuiz(MultipartFile file, QuizCreateRequest request
6164

6265
private void validateImageFile(MultipartFile file) {
6366

64-
if(!file.getContentType().startsWith("image")) {
67+
if (!file.getContentType().startsWith("image")) {
6568
// TODO : 이후 커스텀 예외로 변경
6669
throw new IllegalArgumentException("이미지 파일을 업로드해주세요.");
6770
}
6871

6972
List<String> allowedExt = List.of("jpg", "jpeg", "png", "webp");
70-
if(!allowedExt.contains(getExtension(file.getOriginalFilename()))) {
73+
if (!allowedExt.contains(getExtension(file.getOriginalFilename()))) {
7174
throw new IllegalArgumentException("지원하지 않는 확장자입니다.");
7275
}
7376
}
@@ -86,5 +89,4 @@ private String saveThumbnail(MultipartFile file) throws IOException {
8689
private String getExtension(String filename) {
8790
return filename.substring(filename.lastIndexOf(".") + 1);
8891
}
89-
9092
}

0 commit comments

Comments
 (0)