[refactor#148] 답변 채택 API 성능 최적화

src/main/java/com/dnd/gongmuin/answer/controller/AnswerController.java

@@ -52,7 +52,7 @@ public ResponseEntity<PageResponse<AnswerDetailResponse>> getAnswersByQuestionPo
 	@ApiResponse(useReturnTypeSchema = true)
 	@PostMapping("/api/question-posts/answers/{answerId}")
 	public ResponseEntity<AnswerDetailResponse> getAnswersByQuestionPostId(
-		@PathVariable Long answerId,
+		@PathVariable("answerId") Long answerId,
 		@AuthenticationPrincipal Member member
 	) {
 		AnswerDetailResponse response = answerService.chooseAnswer(answerId, member);

src/main/java/com/dnd/gongmuin/answer/dto/AnswerDetailResponse.java

@@ -1,6 +1,6 @@
 package com.dnd.gongmuin.answer.dto;
 
-import com.dnd.gongmuin.question_post.dto.response.MemberInfo;
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
 
 public record AnswerDetailResponse(
 	Long answerId,

src/main/java/com/dnd/gongmuin/answer/dto/AnswerMapper.java

@@ -2,7 +2,7 @@
 
 import com.dnd.gongmuin.answer.domain.Answer;
 import com.dnd.gongmuin.member.domain.Member;
-import com.dnd.gongmuin.question_post.dto.response.MemberInfo;
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;

src/main/java/com/dnd/gongmuin/answer/repository/AnswerRepository.java

@@ -1,6 +1,7 @@
 package com.dnd.gongmuin.answer.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -21,4 +22,8 @@ public interface AnswerRepository extends JpaRepository<Answer, Long> {
 	@Modifying(flushAutomatically = true, clearAutomatically = true)
 	@Query("UPDATE Answer a SET a.member = :member WHERE a.member.id = :memberId")
 	void updateAnswersMember(Long memberId, Member member);
+
+	@Query("select a from Answer a "
+		+ "join fetch a.member where a.id = :answerId")
+	Optional<Answer> findByIdWithMember(Long answerId);
 }

src/main/java/com/dnd/gongmuin/answer/repository/AnswerSimpleQueryRepository.java

@@ -0,0 +1,28 @@
+package com.dnd.gongmuin.answer.repository;
+
+import java.util.Optional;
+
+import org.springframework.stereotype.Repository;
+
+import com.dnd.gongmuin.answer.domain.Answer;
+
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class AnswerSimpleQueryRepository {
+
+	private final EntityManager em;
+
+	public Optional<Answer> findAnswerById(Long answerId) {
+		Answer answer = em.createQuery(
+				"select a from Answer a" +
+					" join fetch a.member m" +
+					" where a.id = :answerId", Answer.class
+			)
+			.setParameter("answerId", answerId)
+			.getSingleResult();
+		return Optional.of(answer);
+	}
+}

src/main/java/com/dnd/gongmuin/answer/service/AnswerService.java

@@ -47,7 +47,7 @@ public AnswerDetailResponse registerAnswer(
 		RegisterAnswerRequest request,
 		Member member
 	) {
-		QuestionPost questionPost = findQuestionPostById(questionPostId);
+		QuestionPost questionPost = getQuestionPostById(questionPostId);
 		Answer answer = AnswerMapper.toAnswer(questionPostId, questionPost.isQuestioner(member.getId()), request,
 			member);
 		Answer savedAnswer = answerRepository.save(answer);
@@ -73,8 +73,8 @@ public AnswerDetailResponse chooseAnswer(
 		Long answerId,
 		Member member
 	) {
-		Answer answer = getAnswerById(answerId);
-		QuestionPost questionPost = findQuestionPostById(answer.getQuestionPostId());
+		Answer answer = getAnswerWithMember(answerId);
+		QuestionPost questionPost = getQuestionPostWithMember(answer.getQuestionPostId());
 		validateIfQuestioner(member, questionPost);
 		chooseAnswer(questionPost, answer);
 
@@ -99,13 +99,18 @@ private void validateIfQuestionPostExists(Long questionPostId) {
 		}
 	}
 
-	private Answer getAnswerById(Long answerId) {
-		return answerRepository.findById(answerId)
+	private Answer getAnswerWithMember(Long answerId) {
+		return answerRepository.findByIdWithMember(answerId)
 			.orElseThrow(() -> new NotFoundException(AnswerErrorCode.NOT_FOUND_ANSWER));
 	}
 
-	private QuestionPost findQuestionPostById(Long questionPostId) {
+	private QuestionPost getQuestionPostById(Long questionPostId) {
 		return questionPostRepository.findById(questionPostId)
 			.orElseThrow(() -> new NotFoundException(QuestionPostErrorCode.NOT_FOUND_QUESTION_POST));
 	}
+
+	private QuestionPost getQuestionPostWithMember(Long questionPostId) {
+		return questionPostRepository.findByIdWithMember(questionPostId)
+			.orElseThrow(() -> new NotFoundException(QuestionPostErrorCode.NOT_FOUND_QUESTION_POST));
+	}
 }

src/main/java/com/dnd/gongmuin/auth/service/AuthService.java

@@ -74,13 +74,13 @@ public TempSignResponse tempSignUp(TempSignUpRequest tempSignUpRequest, HttpServ
 			throw new NotFoundException(MemberErrorCode.NOT_FOUND_MEMBER);
 		}
 
-		memberRepository.save(member);
+		Member savedMember = memberRepository.save(member);
 
 		AuthInfo authInfo = AuthInfo.of(member.getSocialName(), member.getSocialEmail(), member.getRole());
 		CustomOauth2User customOauth2User = new CustomOauth2User(authInfo);
 
-		tokenProvider.generateRefreshToken(customOauth2User, now);
-		String accessToken = tokenProvider.generateAccessToken(customOauth2User, now);
+		tokenProvider.generateRefreshToken(savedMember, customOauth2User, now);
+		String accessToken = tokenProvider.generateAccessToken(savedMember, customOauth2User, now);
 		response.addCookie(cookieUtil.createCookie(accessToken));
 
 		return new TempSignResponse(true);
@@ -98,8 +98,8 @@ public TempSignResponse tempSignIn(TempSignInRequest tempSignInRequest, HttpServ
 		AuthInfo authInfo = AuthInfo.of(member.getSocialName(), member.getSocialEmail(), member.getRole());
 		CustomOauth2User customOauth2User = new CustomOauth2User(authInfo);
 
-		tokenProvider.generateRefreshToken(customOauth2User, now);
-		String accessToken = tokenProvider.generateAccessToken(customOauth2User, now);
+		tokenProvider.generateRefreshToken(member, customOauth2User, now);
+		String accessToken = tokenProvider.generateAccessToken(member, customOauth2User, now);
 		response.addCookie(cookieUtil.createCookie(accessToken));
 
 		return new TempSignResponse(true);
@@ -175,8 +175,8 @@ public ReissueResponse reissue(HttpServletRequest request, HttpServletResponse r
 
 		CustomOauth2User customUser = new CustomOauth2User(
 			AuthInfo.of(member.getSocialName(), member.getSocialEmail(), member.getRole()));
-		String reissuedAccessToken = tokenProvider.generateAccessToken(customUser, new Date());
-		tokenProvider.generateRefreshToken(customUser, new Date());
+		String reissuedAccessToken = tokenProvider.generateAccessToken(member, customUser, new Date());
+		tokenProvider.generateRefreshToken(member, customUser, new Date());
 
 		response.addCookie(cookieUtil.createCookie(reissuedAccessToken));
 

src/main/java/com/dnd/gongmuin/chat_inquiry/controller/ChatInquiryController.java

@@ -11,6 +11,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.dnd.gongmuin.chat_inquiry.dto.AcceptChatResponse;
+import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryDetailResponse;
 import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryResponse;
 import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryRequest;
 import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryResponse;
@@ -42,7 +43,17 @@ public ResponseEntity<CreateChatInquiryResponse> createChatInquiry(
 		return ResponseEntity.ok(response);
 	}
 
-	@Operation(summary = "채팅방 요청 목록 조회 API", description = "회원의 채팅방 목록을 조회한다.")
+	@Operation(summary = "채팅 요청 상세 조회 API", description = "채팅방 요청을 조회한다.")
+	@GetMapping("/api/chat/inquiries/{chatInquiryId}")
+	public ResponseEntity<ChatInquiryDetailResponse> getChatInquiryById(
+		@PathVariable("chatInquiryId") Long chatInquiryId,
+		@AuthenticationPrincipal Member member
+	) {
+		ChatInquiryDetailResponse response = chatInquiryService.getChatInquiryById(chatInquiryId, member);
+		return ResponseEntity.ok(response);
+	}
+
+	@Operation(summary = "채팅 요청 목록 조회 API", description = "회원의 채팅 목록을 조회한다.")
 	@GetMapping("/api/chat/inquiries")
 	public ResponseEntity<PageResponse<ChatInquiryResponse>> getChatInquiresByMember(
 		@AuthenticationPrincipal Member member,

src/main/java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java

@@ -31,7 +31,7 @@ public class ChatInquiry extends TimeBaseEntity {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "chat_proposal_id", nullable = false)
+	@Column(name = "chat_inquiry_id", nullable = false)
 	private Long id;
 
 	@ManyToOne(fetch = LAZY)
@@ -90,4 +90,12 @@ public void updateStatusRejected() {
 		status = InquiryStatus.REJECTED;
 		inquirer.increaseCredit(CHAT_REWARD);
 	}
+
+	public boolean isInquirer(Member member) {
+		return member.equals(this.inquirer);
+	}
+
+	public Member getChatPartner(Member member) {
+		return isInquirer(member) ? this.answerer : this.inquirer;
+	}
 }

src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryDetailResponse.java

@@ -0,0 +1,12 @@
+package com.dnd.gongmuin.chat_inquiry.dto;
+
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
+
+public record ChatInquiryDetailResponse(
+	Long chatInquiryId,
+	String inquiryMessage,
+	String inquiryStatus,
+	boolean isInquirer,
+	MemberInfo chatPartner
+) {
+}

src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryMapper.java

@@ -4,8 +4,8 @@
 import com.dnd.gongmuin.chat_inquiry.domain.InquiryStatus;
 import com.dnd.gongmuin.chatroom.domain.ChatRoom;
 import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
 import com.dnd.gongmuin.question_post.domain.QuestionPost;
-import com.dnd.gongmuin.question_post.dto.response.MemberInfo;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -44,6 +44,24 @@ public static CreateChatInquiryResponse toCreateChatInquiryResponse(
 		);
 	}
 
+	public static ChatInquiryDetailResponse toChatInquiryDetailResponse(
+		ChatInquiry chatInquiry,
+		Member chatPartner,
+		boolean isInquirer
+	) {
+		return new ChatInquiryDetailResponse(chatInquiry.getId(),
+			chatInquiry.getMessage(),
+			chatInquiry.getStatus().getLabel(),
+			isInquirer,
+			new MemberInfo(
+				chatPartner.getId(),
+				chatPartner.getNickname(),
+				chatPartner.getJobGroup().getLabel(),
+				chatPartner.getProfileImageNo()
+			)
+		);
+	}
+
 	public static AcceptChatResponse toAcceptChatResponse(
 		ChatInquiry chatInquiry,
 		ChatRoom chatRoom

src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java

@@ -1,39 +1,40 @@
 package com.dnd.gongmuin.chat_inquiry.dto;
 
-import com.dnd.gongmuin.chat_inquiry.domain.InquiryStatus;
-import com.dnd.gongmuin.member.domain.JobGroup;
-import com.dnd.gongmuin.question_post.dto.response.MemberInfo;
+import com.dnd.gongmuin.chat_inquiry.domain.ChatInquiry;
+import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
 import com.querydsl.core.annotations.QueryProjection;
 
 public record ChatInquiryResponse(
 	Long chatInquiryId,
 	String inquiryMessage,
 	String inquiryStatus,
 	boolean isInquirer,
-	MemberInfo chatPartner
+	MemberInfo chatPartner,
+	String createdAt
 ) {
 	@QueryProjection
 	public ChatInquiryResponse(
-		Long chatInquiryId,
-		String inquiryMessage,
-		InquiryStatus inquiryStatus,
-		boolean isInquirer,
-		Long partnerId,
-		String partnerNickname,
-		JobGroup partnerJobGroup,
-		int partnerProfileImageNo
+		ChatInquiry chatInquiry,
+		boolean isInquirer
 	) {
 		this(
-			chatInquiryId,
-			inquiryMessage,
-			inquiryStatus.getLabel(),
+			chatInquiry.getId(),
+			chatInquiry.getMessage(),
+			chatInquiry.getStatus().getLabel(),
 			isInquirer,
-			new MemberInfo(
-				partnerId,
-				partnerNickname,
-				partnerJobGroup.getLabel(),
-				partnerProfileImageNo
-			)
+			createPartnerInfo(isInquirer, chatInquiry),
+			chatInquiry.getCreatedAt().toString()
+		);
+	}
+
+	private static MemberInfo createPartnerInfo(boolean isInquirer, ChatInquiry chatInquiry) {
+		Member partner = isInquirer ? chatInquiry.getAnswerer() : chatInquiry.getInquirer();
+		return new MemberInfo(
+			partner.getId(),
+			partner.getNickname(),
+			partner.getJobGroup().getLabel(),
+			partner.getProfileImageNo()
 		);
 	}
 }

src/main/java/com/dnd/gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java

@@ -1,6 +1,6 @@
 package com.dnd.gongmuin.chat_inquiry.dto;
 
-import com.dnd.gongmuin.question_post.dto.response.MemberInfo;
+import com.dnd.gongmuin.member.dto.response.MemberInfo;
 
 public record CreateChatInquiryResponse(
 	Long chatInquiryId,

src/main/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryQueryRepositoryImpl.java

@@ -26,29 +26,11 @@ public class ChatInquiryQueryRepositoryImpl implements ChatInquiryQueryRepositor
 	public Slice<ChatInquiryResponse> getChatInquiresByMember(Member member, Pageable pageable) {
 		List<ChatInquiryResponse> content = queryFactory
 			.select(new QChatInquiryResponse(
-				chatInquiry.id,
-				chatInquiry.message,
-				chatInquiry.status,
+				chatInquiry,
 				new CaseBuilder()
 					.when(chatInquiry.inquirer.id.eq(member.getId()))
 					.then(true)
-					.otherwise(false),
-				new CaseBuilder()
-					.when(chatInquiry.inquirer.id.eq(member.getId()))
-					.then(chatInquiry.answerer.id)
-					.otherwise(chatInquiry.inquirer.id),
-				new CaseBuilder()
-					.when(chatInquiry.inquirer.id.eq(member.getId()))
-					.then(chatInquiry.answerer.nickname)
-					.otherwise(chatInquiry.inquirer.nickname),
-				new CaseBuilder()
-					.when(chatInquiry.inquirer.id.eq(member.getId()))
-					.then(chatInquiry.answerer.jobGroup)
-					.otherwise(chatInquiry.inquirer.jobGroup),
-				new CaseBuilder()
-					.when(chatInquiry.inquirer.id.eq(member.getId()))
-					.then(chatInquiry.answerer.profileImageNo)
-					.otherwise(chatInquiry.inquirer.profileImageNo)
+					.otherwise(false)
 			))
 			.from(chatInquiry)
 			.where(chatInquiry.inquirer.id.eq(member.getId())

src/main/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryService.java

@@ -11,6 +11,7 @@
 
 import com.dnd.gongmuin.chat_inquiry.domain.ChatInquiry;
 import com.dnd.gongmuin.chat_inquiry.dto.AcceptChatResponse;
+import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryDetailResponse;
 import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryMapper;
 import com.dnd.gongmuin.chat_inquiry.dto.ChatInquiryResponse;
 import com.dnd.gongmuin.chat_inquiry.dto.CreateChatInquiryRequest;
@@ -70,6 +71,17 @@ public CreateChatInquiryResponse createChatInquiry(CreateChatInquiryRequest requ
 		return ChatInquiryMapper.toCreateChatInquiryResponse(chatInquiry);
 	}
 
+	@Transactional(readOnly = true)
+	public ChatInquiryDetailResponse getChatInquiryById(Long chatInquiryId, Member member) {
+		ChatInquiry chatInquiry = getChatInquiryById(chatInquiryId);
+
+		return ChatInquiryMapper.toChatInquiryDetailResponse(
+			chatInquiry,
+			chatInquiry.getChatPartner(member),
+			chatInquiry.isInquirer(member)
+		);
+	}
+
 	@Transactional(readOnly = true)
 	public PageResponse<ChatInquiryResponse> getChatInquiresByMember(Member member, Pageable pageable) {
 		Slice<ChatInquiryResponse> responsePage = chatInquiryRepository.getChatInquiresByMember(

src/main/java/com/dnd/gongmuin/chatroom/domain/ChatRoom.java

@@ -58,4 +58,12 @@ public static ChatRoom of(
 	) {
 		return new ChatRoom(questionPost, inquirer, answerer);
 	}
+
+	public boolean isInquirer(Member member) {
+		return member.equals(this.inquirer);
+	}
+
+	public Member getChatPartner(Member member) {
+		return isInquirer(member) ? this.answerer : this.inquirer;
+	}
 }