Merge branch 'dev' of https://github.com/ne-o-rdinary/back into feat/…

…getAnswer

src/main/java/com/example/demo/domain/dto/answer/AnswerResponseDto.java

@@ -5,11 +5,14 @@
 @Getter
 public class AnswerResponseDto {
 
+	private int imageIndex;
+
 	private String question;
 
 	private String answer;
 
-	public AnswerResponseDto(String question, String answer) {
+	public AnswerResponseDto(int imageIndex, String question, String answer) {
+		this.imageIndex = imageIndex;
 		this.question = question;
 		this.answer = answer;
 	}

src/main/java/com/example/demo/domain/dto/question/QuestionResponseDTO.java

@@ -11,8 +11,10 @@
 public class QuestionResponseDTO {
     private Long questionId;
     private String question;
-    public QuestionResponseDTO(Long questionId, String question) {
+    private int imageIndex;
+    public QuestionResponseDTO(Long questionId, String question, int imageIndex) {
         this.questionId = questionId;
         this.question = question;
+        this.imageIndex = imageIndex;
     }
 }

src/main/java/com/example/demo/domain/entity/question/Question.java

@@ -26,6 +26,9 @@ public class Question extends BaseEntity {
 	@Column(nullable = false, columnDefinition = "VARCHAR(15)")
 	private QuestionCategory questionCategory;
 
+	@Column
+	private int imageIndex;
+
 	public Question(String question) {
 		this.question = question;
 	}

src/main/java/com/example/demo/service/answer/AnswerService.java

@@ -52,7 +52,7 @@ public AnswerResponseDto getAnswer(String uuid) {
 			throw new GeneralException(ErrorStatus.QUESTION_ANSWER_NOT_FOUND.getReasonHttpStatus());
 		}
 
-		return new AnswerResponseDto(questionAnswer.getQuestion().getQuestion(),
+		return new AnswerResponseDto(questionAnswer.getQuestion().getImageIndex(),questionAnswer.getQuestion().getQuestion(),
 			questionAnswer.getAnswer().getAnswer());
 	}
 }

src/main/java/com/example/demo/service/question/QuestionService.java

@@ -44,6 +44,7 @@ public QuestionResponseDTO getRandomQuestion(QuestionCategory category) {
         return QuestionResponseDTO.builder()
             .questionId(q.getId())
             .question(q.getQuestion())
+            .imageIndex(q.getImageIndex())
             .build();
     }
 }