Skip to content

fix: 답변 기능 수정 #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjswjddn merged 2 commits into from
Jul 30, 2025
Merged

fix: 답변 기능 수정 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a40de0e
fix: 답변 조회 수정
rjswjddn Jul 30, 2025
4ab78c9
test: 답변 조회 테스트 수정
rjswjddn Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/main/java/com/oronaminc/join/answer/service/AnswerReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -31,11 +34,6 @@ public List<Answer> 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));
Expand Down
19 changes: 10 additions & 9 deletions src/main/java/com/oronaminc/join/answer/service/AnswerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -65,7 +67,6 @@ public Slice<AnswerGetResponse> getAnswers(
memberReader.getById(memberId);
roomReader.getById(roomId);
questionReader.getByIdAndRoomId(questionId, roomId);
answerReader.getByQuestionId(questionId);

Pageable pageable = PageRequest.of(0, size + 1);

Expand Down
4 changes: 0 additions & 4 deletions src/test/java/com/oronaminc/join/answer/service/AnswerServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand All @@ -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,
Expand All @@ -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)))
Expand All @@ -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
Expand Down