From a40de0e2f3c32c1ca4b4ae52ece0a0297a4c6690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Wed, 30 Jul 2025 18:10:35 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=8B=B5=EB=B3=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../join/answer/service/AnswerReader.java | 18 ++++++++---------- .../join/answer/service/AnswerService.java | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java b/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java index 773a534..349c842 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerReader.java @@ -1,16 +1,19 @@ package com.oronaminc.join.answer.service; -import com.oronaminc.join.answer.dao.AnswerRepository; -import com.oronaminc.join.answer.domain.Answer; -import com.oronaminc.join.global.exception.ErrorCode; -import com.oronaminc.join.global.exception.ErrorException; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; -import lombok.RequiredArgsConstructor; + import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; +import com.oronaminc.join.answer.dao.AnswerRepository; +import com.oronaminc.join.answer.domain.Answer; +import com.oronaminc.join.global.exception.ErrorCode; +import com.oronaminc.join.global.exception.ErrorException; + +import lombok.RequiredArgsConstructor; + @Component @RequiredArgsConstructor public class AnswerReader { @@ -31,11 +34,6 @@ public List getAnswerByQuestionIdWithCursor(Long questionId, pageable); } - public Answer getByQuestionId(Long questionId) { - return answerRepository.findByQuestionId(questionId) - .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_EXIST_ANSWER)); - } - public Answer getById(Long answerId) { return findById(answerId) .orElseThrow(() -> new ErrorException(ErrorCode.NOT_FOUND_ANSWER)); diff --git a/src/main/java/com/oronaminc/join/answer/service/AnswerService.java b/src/main/java/com/oronaminc/join/answer/service/AnswerService.java index cc06dff..699123d 100644 --- a/src/main/java/com/oronaminc/join/answer/service/AnswerService.java +++ b/src/main/java/com/oronaminc/join/answer/service/AnswerService.java @@ -1,5 +1,14 @@ package com.oronaminc.join.answer.service; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; + +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.oronaminc.join.answer.dao.AnswerRepository; import com.oronaminc.join.answer.domain.Answer; @@ -16,15 +25,8 @@ import com.oronaminc.join.question.service.QuestionReader; import com.oronaminc.join.room.domain.Room; import com.oronaminc.join.room.service.RoomReader; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Set; + import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @Transactional(readOnly = true) @@ -65,7 +67,6 @@ public Slice getAnswers( memberReader.getById(memberId); roomReader.getById(roomId); questionReader.getByIdAndRoomId(questionId, roomId); - answerReader.getByQuestionId(questionId); Pageable pageable = PageRequest.of(0, size + 1); From 4ab78c931749c209fb2a79d75b773c9f64d8db7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Wed, 30 Jul 2025 18:13:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test:=20=EB=8B=B5=EB=B3=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/oronaminc/join/answer/service/AnswerServiceTests.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java b/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java index 126b86e..d59c318 100644 --- a/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java +++ b/src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java @@ -152,7 +152,6 @@ void getAnswers_firstPage_success() { given(memberReader.getById(1L)).willReturn(mockMember); given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.getByQuestionId(1L)).willReturn(null); given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(answers); given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, List.of(100L, 99L))) @@ -174,7 +173,6 @@ void getAnswers_cursorPaging_success() { given(memberReader.getById(1L)).willReturn(mockMember); given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.getByQuestionId(1L)).willReturn(null); given(answerReader.getAnswerByQuestionIdWithCursor(eq(1L), any(), any(), any())).willReturn( answers); given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, @@ -198,7 +196,6 @@ void getAnswers_containsEmojiedAnswers() { given(memberReader.getById(1L)).willReturn(mockMember); given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.getByQuestionId(1L)).willReturn(null); given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(answers); given(emojiReader.findTargetIdsByMemberAndTargetTypeInBatch(1L, TargetType.ANSWER, List.of(1L, 2L))) @@ -220,7 +217,6 @@ void getAnswers_emptyList_noError() { given(memberReader.getById(1L)).willReturn(mockMember); given(roomReader.getById(1L)).willReturn(mockRoom); given(questionReader.getByIdAndRoomId(1L, 1L)).willReturn(mockQuestion); - given(answerReader.getByQuestionId(1L)).willReturn(null); given(answerReader.getFirstPageByQuestionId(eq(1L), any())).willReturn(List.of()); // when