Merge pull request #4 from ne-o-rdinary/refactor/refactoring

refactor : uuid 부여 & response 변경

src/main/java/com/example/demo/controller/answer/AnswerController.java

@@ -20,19 +20,19 @@ public class AnswerController {
 
 	@PostMapping()
 	@Operation(summary = "답변 저장 API", description = "답변을 저장하는 API")
-	public ResponseEntity<ApiResponse<AnswerCreateResponseDto>> createAnswer(
+	public ApiResponse<AnswerCreateResponseDto> createAnswer(
 		@Valid @RequestBody AnswerRequestDto dto) {
 
 		AnswerCreateResponseDto answerCreateResponseDto = answerService.createAnswer(dto);
 
-		return ResponseEntity.ok(ApiResponse.onSuccess(answerCreateResponseDto));
+		return ApiResponse.onSuccess(answerCreateResponseDto);
 	}
 
-	@GetMapping("/{answerId}")
-	@Operation(summary = "답변 조회 API", description = "답변을 조회하는 API")
-	public ResponseEntity<ApiResponse<AnswerResponseDto>> getAnswer(@PathVariable Long answerId) {
-		AnswerResponseDto answerResponseDto = answerService.getAnswer(answerId);
+	@GetMapping("/{uuid}")
+	@Operation(summary = "질문/답변 조회 API", description = "질문/답변 조회하는 API")
+	public ApiResponse<AnswerResponseDto> getAnswer(@PathVariable String uuid) {
+		AnswerResponseDto answerResponseDto = answerService.getAnswer(uuid);
 
-		return ResponseEntity.ok(ApiResponse.onSuccess(answerResponseDto));
+		return ApiResponse.onSuccess(answerResponseDto);
 	}
 }

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

@@ -4,9 +4,9 @@
 
 public class AnswerCreateResponseDto {
 
-	private Long answerId;
+	private String uuid;
 
-	public AnswerCreateResponseDto(Answer answer) {
-		this.answerId = answer.getId();
+	public AnswerCreateResponseDto(String uuid) {
+		this.uuid = uuid;
 	}
 }

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

@@ -2,9 +2,12 @@
 
 public class AnswerResponseDto {
 
+	private String question;
+
 	private String answer;
 
-	public AnswerResponseDto(String answer) {
+	public AnswerResponseDto(String question, String answer) {
+		this.question = question;
 		this.answer = answer;
 	}
 

src/main/java/com/example/demo/domain/entity/question_answer/QuestionAnswer.java

@@ -4,6 +4,7 @@
 import com.example.demo.domain.entity.answer.Answer;
 import com.example.demo.domain.entity.question.Question;
 import jakarta.persistence.*;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -27,8 +28,12 @@ public class QuestionAnswer extends BaseEntity {
 	@JoinColumn(name = "answer_id")
 	private Answer answer;
 
-	public QuestionAnswer(Question question, Answer answer) {
+	@Column
+	private String uuid;
+
+	public QuestionAnswer(Question question, Answer answer, String uuid) {
 		this.question = question;
 		this.answer = answer;
+		this.uuid = uuid;
 	}
 }

src/main/java/com/example/demo/repository/question_answer/QuestionAnswerRepository.java

@@ -1,7 +1,10 @@
 package com.example.demo.repository.question_answer;
 
 import com.example.demo.domain.entity.question_answer.QuestionAnswer;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface QuestionAnswerRepository extends JpaRepository<QuestionAnswer, Long> {
+
+	Optional<QuestionAnswer> findBy(String uuid);
 }

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

@@ -11,6 +11,7 @@
 import com.example.demo.repository.answer.AnswerRepository;
 import com.example.demo.repository.question.QuestionRepository;
 import com.example.demo.repository.question_answer.QuestionAnswerRepository;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -34,17 +35,20 @@ public AnswerCreateResponseDto createAnswer(AnswerRequestDto dto) {
 		Answer answer = new Answer(dto.getAnswer());
 		answerRepository.save(answer);
 
-		QuestionAnswer questionAnswer = new QuestionAnswer(question, answer);
+		String uuid = UUID.randomUUID().toString();
+
+		QuestionAnswer questionAnswer = new QuestionAnswer(question, answer, uuid);
 		questionAnswerRepository.save(questionAnswer);
 
-		return new AnswerCreateResponseDto(answer);
+		return new AnswerCreateResponseDto(questionAnswer.getUuid());
 	}
 
 	@Transactional(readOnly = true)
-	public AnswerResponseDto getAnswer(Long answerId) {
-		Answer answer = answerRepository.findById(answerId).orElseThrow(
+	public AnswerResponseDto getAnswer(String uuid) {
+		QuestionAnswer questionAnswer = questionAnswerRepository.findBy(uuid).orElseThrow(
 			() -> new GeneralException(ErrorStatus.ANSWER_NOT_FOUND.getReasonHttpStatus()));
 
-		return new AnswerResponseDto(answer.getAnswer());
+		return new AnswerResponseDto(questionAnswer.getQuestion().getQuestion(),
+			questionAnswer.getAnswer().getAnswer());
 	}
 }