diff --git a/src/main/java/life/offonoff/ab/application/service/TopicService.java b/src/main/java/life/offonoff/ab/application/service/TopicService.java index b27db2d4..53daae14 100644 --- a/src/main/java/life/offonoff/ab/application/service/TopicService.java +++ b/src/main/java/life/offonoff/ab/application/service/TopicService.java @@ -147,15 +147,16 @@ public Topic findTopic(final Long topicId) { * @param pageable * @return */ - public Slice findAll(final Long memberId, final TopicSearchRequest request, final Pageable pageable) { + public Slice findAll(final Long retrieverId, final TopicSearchRequest request, final Pageable pageable) { - Slice topics = topicRepository.findAll(memberId, request, pageable); + Slice topics = topicRepository.findAll(retrieverId, request, pageable); - if (memberId == null) { + if (retrieverId == null) { return topics.map(TopicResponse::from); } - return topics.map(topic -> TopicResponse.from(topic, findMember(memberId))); + Member retriever = findMember(retrieverId); + return topics.map(topic -> TopicResponse.from(topic, retriever)); } //== Hide ==//