refactor: SSE용 이벤트 변환시 db조회 제거

woowacourse-teams · Mar 12, 2024 · 68d919a · 68d919a
1 parent 353146a
commit 68d919a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 63 deletions.
diff --git a/backend/src/main/java/team/teamby/teambyteam/feed/application/FeedWriteService.java b/backend/src/main/java/team/teamby/teambyteam/feed/application/FeedWriteService.java
@@ -81,7 +81,7 @@ public Long write(
                 imageResponses,
                 memberEmailDto.email()
         );
-        sendFeedWritingEvent(responseForMe);
+        sendFeedWritingEvent(responseForMe, teamPlaceId);
 
         return threadId;
     }
@@ -126,7 +126,7 @@ private List<FeedImageResponse> saveImages(final List<MultipartFile> images, fin
                 .toList();
     }
 
-    private void sendFeedWritingEvent(final FeedResponse response) {
-        applicationEventPublisher.publishEvent(new FeedEvent(response));
+    private void sendFeedWritingEvent(final FeedResponse response, final Long teamPlaceId) {
+        applicationEventPublisher.publishEvent(new FeedEvent(response, teamPlaceId));
     }
 }
diff --git a/backend/src/main/java/team/teamby/teambyteam/feed/application/event/FeedEvent.java b/backend/src/main/java/team/teamby/teambyteam/feed/application/event/FeedEvent.java
@@ -5,11 +5,13 @@
 
 public class FeedEvent implements DomainEvent<Long> {
     private final Long feedId;
+    private final Long teamPlaceId;
     private final FeedResponse response;
 
-    public FeedEvent(final FeedResponse response) {
+    public FeedEvent(final FeedResponse response, final Long teamPlaceId) {
         this.feedId = response.id();
         this.response = response;
+        this.teamPlaceId = teamPlaceId;
     }
 
     @Override
@@ -20,4 +22,8 @@ public Long getDomainId() {
     public FeedResponse response() {
         return response;
     }
+
+    public Long getTeamPlaceId() {
+        return teamPlaceId;
+    }
 }
diff --git a/backend/src/main/java/team/teamby/teambyteam/sse/domain/converter/FeedEventConverter.java b/backend/src/main/java/team/teamby/teambyteam/sse/domain/converter/FeedEventConverter.java
@@ -5,42 +5,23 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import team.teamby.teambyteam.common.domain.DomainEvent;
-import team.teamby.teambyteam.feed.application.dto.FeedImageResponse;
 import team.teamby.teambyteam.feed.application.dto.FeedResponse;
 import team.teamby.teambyteam.feed.application.event.FeedEvent;
-import team.teamby.teambyteam.feed.domain.Feed;
-import team.teamby.teambyteam.feed.domain.FeedRepository;
-import team.teamby.teambyteam.feed.domain.FeedThread;
-import team.teamby.teambyteam.feed.domain.image.FeedThreadImage;
-import team.teamby.teambyteam.member.domain.MemberTeamPlace;
-import team.teamby.teambyteam.member.domain.MemberTeamPlaceRepository;
 import team.teamby.teambyteam.sse.domain.TeamPlaceSseEvent;
 import team.teamby.teambyteam.sse.domain.emitter.TeamPlaceEmitterId;
 
-import java.util.List;
-
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class FeedEventConverter implements TeamPlaceSseConverter<Long> {
 
-    private final FeedRepository feedRepository;
-    private final MemberTeamPlaceRepository memberTeamPlaceRepository;
-
     @Override
     @Transactional(readOnly = true)
     public TeamPlaceSseEvent convert(final DomainEvent<Long> event) {
-        final Long feedId =  event.getDomainId();
-        final Feed feed = feedRepository.findById(feedId)
-                .orElseThrow(() -> {
-                    final String message = "No FeedFound ID : " + feedId;
-                    log.error(message);
-                    return new RuntimeException(message);
-                });
-        final MemberTeamPlace author = memberTeamPlaceRepository
-                .findByTeamPlaceIdAndMemberId(feed.getTeamPlaceId(), feed.getAuthorId())
-                .orElse(MemberTeamPlace.UNKNOWN_MEMBER_TEAM_PLACE);
-        return new FeedSse(feed, author);
+        final FeedEvent feedEvent = (FeedEvent) event;
+        final Long teamplaceId = feedEvent.getTeamPlaceId();
+
+        return new FeedSse(feedEvent.response(), teamplaceId);
     }
 
     @Override
@@ -53,32 +34,32 @@ private static class FeedSse implements TeamPlaceSseEvent {
         private static final String EVENT_NAME = "new_thread";
 
         private final Long teamPlaceId;
-        private final FeedResponse forMe;
+        private FeedResponse forMe;
         private FeedResponse forOthers;
 
-        public FeedSse(final Feed feed, final MemberTeamPlace author) {
-            this.teamPlaceId = feed.getTeamPlaceId();
-            this.forMe = new FeedResponse(
-                    feed.getId(),
-                    feed.getType().name().toLowerCase(),
-                    feed.getAuthorId(),
-                    author.getDisplayMemberNameValue(),
-                    author.findMemberProfileImageUrl(),
-                    feed.getCreatedAt(),
-                    feed.getContent().getValue(),
-                    convertImageResponses(((FeedThread) feed).getImages()),
-                    true
-            );
+        public FeedSse(final FeedResponse response, final Long teamPlaceId) {
+            this.teamPlaceId = teamPlaceId;
+            if (response.isMe()) {
+                forMe = response;
+                forOthers = reverseForMeField(response);
+                return;
+            }
+            forMe = reverseForMeField(response);
+            forOthers = response;
         }
 
-        private static List<FeedImageResponse> convertImageResponses(final List<FeedThreadImage> images) {
-            return images.stream().map(feedThreadImage ->
-                            new FeedImageResponse(
-                                    feedThreadImage.getId(),
-                                    feedThreadImage.isExpired(),
-                                    feedThreadImage.getImageName().getValue(),
-                                    feedThreadImage.getImageUrl().getValue()))
-                    .toList();
+        private static FeedResponse reverseForMeField(final FeedResponse response) {
+            return new FeedResponse(
+                    response.id(),
+                    response.type(),
+                    response.authorId(),
+                    response.authorName(),
+                    response.profileImageUrl(),
+                    response.createdAt(),
+                    response.content(),
+                    response.images(),
+                    !response.isMe()
+            );
         }
 
         @Override
@@ -96,19 +77,6 @@ public Object getEvent(final TeamPlaceEmitterId emitterId) {
             if (emitterId.isMemberId(forMe.authorId())) {
                 return forMe;
             }
-            if (forOthers == null) {
-                return new FeedResponse(
-                        forMe.id(),
-                        forMe.type(),
-                        forMe.authorId(),
-                        forMe.authorName(),
-                        forMe.profileImageUrl(),
-                        forMe.createdAt(),
-                        forMe.content(),
-                        forMe.images(),
-                        false
-                );
-            }
             return forOthers;
         }
     }

diff --git a/...end/src/test/java/team/teamby/teambyteam/sse/domain/converter/FeedEventConverterTest.java b/...end/src/test/java/team/teamby/teambyteam/sse/domain/converter/FeedEventConverterTest.java
@@ -61,7 +61,7 @@ void convert() {
                 savedMember.getEmailValue()
         );
 
-        final FeedEvent testEvent = new FeedEvent(response);
+        final FeedEvent testEvent = new FeedEvent(response, savedTeamPlace.getId());
 
         // when
         final TeamPlaceSseEvent sseEvent = feedEventConverter.convert(testEvent);