Merge branch 'dev' into be/feat/#69-url-notification

# Conflicts:
#	be/src/main/java/movlit/be/pub_sub/chatMessage/application/service/ChatMessageService.java
#	be/src/main/java/movlit/be/pub_sub/chatRoom/application/service/GroupChatroomService.java

be/src/main/java/movlit/be/common/config/SecurityConfig.java

@@ -1,8 +1,10 @@
 package movlit.be.common.config;
 
 import jakarta.servlet.http.HttpServletResponse;
+
 import java.util.Arrays;
 import java.util.List;
+
 import lombok.RequiredArgsConstructor;
 import movlit.be.auth.application.service.MyOAuth2MemberService;
 import movlit.be.auth.application.service.OAuth2AuthenticationSuccessHandler;
@@ -98,7 +100,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, CorsConfigurat
                         .requestMatchers(HttpMethod.GET, "/api/subscribe/*").authenticated()
                         .requestMatchers("/collect/indices/**", "/collect/movie/**", "/discover",
                                 "/websocket/**", "/echo", "/api/members/login", "/img/**", "/js/**", "/css/**",
-                                "/error/**", "api/books/**", "/ws-stomp/**")
+                                "/error/**", "api/books/**", "/ws-stomp/**", "/notification/**")
                         .permitAll()
                         .requestMatchers(HttpMethod.POST, "/api/follows/*/follow").authenticated()
                         .requestMatchers(HttpMethod.DELETE, "/api/follows/*/follow").authenticated()

be/src/main/java/movlit/be/follow/application/service/FollowReadService.java

@@ -81,6 +81,11 @@ public int getFollowCount(
         // 내가 팔로우하는 사람들(팔로우) 개수 조회
         return (int) followRepository.countFollowsByLoginId(loginId);
     }
+
+    @Transactional(readOnly = true)
+    public boolean isFollowing(MemberId loginId, MemberId otherMemberId){
+        return followRepository.existsByFollowerIdAndFolloweeIdWithoutException(loginId, otherMemberId);
+    }
     private FollowResponse toFollowResponse(Follow follow){
         MemberEntity follower = follow.getFollower(); // 나를 팔로우하는 사람(팔로워) 정보 가져오기
 

be/src/main/java/movlit/be/follow/infra/persistence/FollowRepository.java

@@ -7,6 +7,8 @@
 public interface FollowRepository {
     boolean existsByFollowerIdAndFolloweeId(MemberId followerId, MemberId followeeId);
 
+    boolean existsByFollowerIdAndFolloweeIdWithoutException(MemberId followerId, MemberId followeeId);
+
     Follow save(Follow follow);
 
     Follow findByFollowerIdAndFolloweeId(MemberId followerId, MemberId followeeId);

be/src/main/java/movlit/be/follow/infra/persistence/FollowRepositoryImpl.java

@@ -23,6 +23,11 @@ public boolean existsByFollowerIdAndFolloweeId(MemberId followerId, MemberId fol
         return false;
     }
 
+    @Override
+    public boolean existsByFollowerIdAndFolloweeIdWithoutException(MemberId followerId, MemberId followeeId) {
+        return followJpaRepository.existsByFollowerIdAndFolloweeId(followerId, followeeId);
+    }
+
     @Override
     public Follow save(Follow follow) {
         return followJpaRepository.save(follow);

be/src/main/java/movlit/be/follow/presentation/FollowController.java

@@ -1,6 +1,8 @@
 package movlit.be.follow.presentation;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import movlit.be.auth.application.service.MyMemberDetails;
@@ -87,30 +89,41 @@ public ResponseEntity<List<FollowResponse>> getMyFollowingDetail(
     }
 
     // 나를 팔로우하는 사람들(팔로워) 개수 조회 - 내 팔로워 개수
-    @GetMapping("/my/followers/count")
+    @GetMapping("/{memberId}/followers/count")
     public ResponseEntity<Integer> getMyFollowerCount(
-            @AuthenticationPrincipal MyMemberDetails details
+           @PathVariable MemberId memberId
     ){
-        MemberId loginId = null;
-        if (details != null){
-            loginId = details.getMemberId();
-        }
-        Integer followerCount = followReadService.getFollowerCount(loginId);
+        Integer followerCount = followReadService.getFollowerCount(memberId);
 
         return ResponseEntity.status(HttpStatus.OK).body(followerCount);
     }
 
     // 내가 팔로우하는 사람들(팔로우) 개수 조회 - 내 팔로우 개수
-    @GetMapping("/my/follows/count")
+    @GetMapping("/{memberId}/follows/count")
     public ResponseEntity<Integer> getMyFollowCount(
-            @AuthenticationPrincipal MyMemberDetails details
+            @PathVariable MemberId memberId
+    ){
+        int followCount = followReadService.getFollowCount(memberId);
+
+        return ResponseEntity.status(HttpStatus.OK).body(followCount);
+    }
+
+    // 특정 사용자를 팔로우하고 있는지 여부 확인
+    // 로그인한 유저(MyMemberDetails)가, 특정 사용자(pathvariable)를 팔로우하는지 여부 체크 api
+    @GetMapping("/check/{otherMemberId}")
+    public ResponseEntity<Map<String, Boolean>> checkFollowing(
+            @AuthenticationPrincipal MyMemberDetails details,
+            @PathVariable MemberId otherMemberId
     ){
         MemberId loginId = null;
         if (details != null){
             loginId = details.getMemberId();
         }
-        int followCount = followReadService.getFollowCount(loginId);
+        boolean isFollowing = followReadService.isFollowing(loginId, otherMemberId);
 
-        return ResponseEntity.status(HttpStatus.OK).body(followCount);
+        Map<String, Boolean> response = new HashMap<>();
+        response.put("following", isFollowing);
+
+        return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 }

be/src/main/java/movlit/be/image/application/service/ImageService.java

@@ -25,8 +25,6 @@ public class ImageService {
     private final ImageRepository imageRepository;
     private final S3Service s3Service;
     private final MemberRepository memberRepository;
-    private final GroupChatroomService groupChatroomService;
-    private final RedisMessagePublisher redisMessagePublisher;
 
     private final ApplicationEventPublisher eventPublisher;
 

be/src/main/java/movlit/be/pub_sub/chatMessage/application/service/ChatMessageService.java

@@ -1,10 +1,12 @@
 package movlit.be.pub_sub.chatMessage.application.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import movlit.be.common.exception.RedisStreamOperationReturnNull;
@@ -23,6 +25,7 @@
 import movlit.be.pub_sub.notification.NotificationMessage;
 import movlit.be.pub_sub.notification.NotificationType;
 import org.springframework.beans.factory.annotation.Value;
+import movlit.be.pub_sub.notification.NotificationService;
 import org.springframework.data.redis.connection.stream.RecordId;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -36,8 +39,8 @@ public class ChatMessageService {
     private final ChatMessageRepository chatMessageRepository;
     private final RedisMessagePublisher messagePublisher;
     private final RedisTemplate<String, String> redisTemplate;
-    private final ObjectMapper objectMapper;
     private final RedisNotificationPublisher redisNotificationPublisher;
+    private final NotificationService notificationService;
 
     private static final String MESSAGE_QUEUE = "chat_message_queue";   // 큐 이름 (채팅방마다 별도의 큐를 사용할 수 있음)
     private final MemberReadService memberReadService;
@@ -94,6 +97,8 @@ public void sendMessageForGroup(ChatMessageDto chatMessageDto) {
         produceChatMessage(chatMessageDto);
 
         messagePublisher.sendMessage(chatMessageDto);
+
+        notificationService.groupChatroomMessageNotification(chatMessageDto);   // 그룹 채팅방 메시지 전송 알림
     }
 
     // 해당 채팅방의 읽지 않은 메시지 갯수 return

be/src/main/java/movlit/be/pub_sub/chatRoom/application/service/FetchGroupChatroomUseCase.java

@@ -0,0 +1,34 @@
+package movlit.be.pub_sub.chatRoom.application.service;
+
+import lombok.RequiredArgsConstructor;
+import movlit.be.common.util.ids.MemberId;
+import movlit.be.pub_sub.chatMessage.application.service.ChatMessageService;
+import movlit.be.pub_sub.chatMessage.presentation.dto.response.ChatMessageDto;
+import movlit.be.pub_sub.chatRoom.presentation.dto.GroupChatroomResponseDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@RequiredArgsConstructor
+public class FetchGroupChatroomUseCase {
+
+    private final GroupChatroomService groupChatroomService;
+    private final ChatMessageService chatMessageService;
+
+    // 내가 가입한 그룹채팅 리스트 가져오기
+    public List<GroupChatroomResponseDto> execute(MemberId memberId) {
+        List<GroupChatroomResponseDto> chatroomList = groupChatroomService.fetchMyGroupChatroomList(memberId);
+
+        return chatroomList.stream()
+                .peek(chatroom -> {
+                    ChatMessageDto recentMessage = chatMessageService.fetchRecentMessage(
+                            chatroom.getGroupChatroomId().getValue());
+                    if (Objects.nonNull(recentMessage)) {
+                        chatroom.setRecentMessage(recentMessage);
+                    }
+                })
+                .toList();
+    }
+}

be/src/main/java/movlit/be/pub_sub/chatRoom/application/service/GroupChatroomService.java

@@ -8,6 +8,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import movlit.be.book.application.service.BookDetailReadService;
@@ -40,8 +41,8 @@
 import movlit.be.pub_sub.notification.NotificationDto;
 import movlit.be.pub_sub.notification.NotificationMessage;
 import movlit.be.pub_sub.notification.NotificationType;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
+import movlit.be.pub_sub.notification.NotificationController;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,17 +54,14 @@ public class GroupChatroomService {
 
     private final GroupChatRepository groupChatRepository;
     private final MemberReadService memberReadService;
-    private final ChatMessageService chatMessageService;
-
-    private final BookHeartReadService bookHeartReadService;
-    private final BookDetailReadService bookDetailReadService;
-    private final MovieReadService movieReadService;
-    private final MovieHeartService movieHeartService;
-
     private final RedisTemplate<String, Object> redisTemplate;
     private final ObjectMapper objectMapper;
     private final GroupChatroomCreationWorker worker;
     private final ApplicationEventPublisher eventPublisher;
+    private final MovieReadService movieReadService;
+    private final MovieHeartService movieHeartService;
+    private final BookDetailReadService bookDetailReadService;
+    private final BookHeartReadService bookHeartReadService;
 
     private final RedisNotificationPublisher redisNotificationPublisher;
 
@@ -117,7 +115,8 @@ public GroupChatroomResponse requestCreateGroupChatroom(GroupChatroomRequest req
     /**
      * 찜한 콘텐츠에 대해 새로운 채팅방 생성됨을 알림
      */
-    private void publishNewGroupChatroomNoti(String contentId, String roomName, GroupChatroomResponse createdChatroom) {
+    private void publishNewGroupChatroomNoti(String contentId, String roomName,
+                                             GroupChatroomResponse createdChatroom) {
         log.info("::GroupChatroomService_publishNewGroupChatroomNoti::");
 
         // ContentId : MV_pureContentId 또는 BK_pureContentId -> 책과 영화 구분 필요
@@ -137,14 +136,16 @@ private void publishNewGroupChatroomNoti(String contentId, String roomName, Grou
             BookId bookId = new BookId(pureContentId);
             String bookName = bookDetailReadService.fetchByBookId(bookId).getTitle();
             contentName = bookName.substring(0, bookName.indexOf(" -"));
-            heartingMemberIds = bookHeartReadService.fetchHeartingMemberIdsByBookId(bookId);
+            heartingMemberIds =
+                    bookHeartReadService.fetchHeartingMemberIdsByBookId(bookId);
         }
 
         // 멤버들에게 알림 발송
         if (!heartingMemberIds.isEmpty()) {
             for (MemberId heartigMemberId : heartingMemberIds) {
                 log.info(">> 알림발송할 멤버 " + heartigMemberId.getValue());
-                NotificationDto notification = new NotificationDto(heartigMemberId.getValue(),
+                NotificationDto notification = new NotificationDto(
+                        heartigMemberId.getValue(),
                         NotificationMessage.generateNewGroupChatroomNotiMessage(contentType, contentName, roomName),
                         NotificationType.CONTENT_HEART_CHATROOM,
                         null); // TODO
@@ -153,6 +154,8 @@ private void publishNewGroupChatroomNoti(String contentId, String roomName, Grou
         }
     }
 
+
+
     private Map<String, String> getPureResponse(Optional<Map<String, String>> responseOpt) {
         if (responseOpt.isEmpty()) {
             throw new GroupChatroomAlreadyExistsException();
@@ -264,15 +267,22 @@ private void validateAlreadyJoined(MemberId memberId, GroupChatroom existingGrou
     }
 
     // 내가 가입한 그룹채팅 리스트 가져오기
-    public List<GroupChatroomResponseDto> fetchMyGroupChatList(MemberId memberId) {
-        return groupChatRepository.fetchGroupChatroomByMemberId(memberId).stream().peek(chatRoom -> {
-            // TODO: repository단에서 ChatMessageDto 정보와 join하여 가져오기 -> 이러면 list 돌면서 결합 안 해줘도 됨
-            ChatMessageDto recentMessage = chatMessageService.fetchRecentMessage(
-                    chatRoom.getGroupChatroomId().getValue());
-            if (Objects.nonNull(recentMessage)) {
-                chatRoom.setRecentMessage(recentMessage);
-            }
-        }).toList();
+//    public List<GroupChatroomResponseDto> fetchMyGroupChatList(MemberId memberId) {
+//        return groupChatRepository.fetchGroupChatroomByMemberId(memberId).stream()
+//                .peek(chatRoom -> {
+//                    // TODO: repository단에서 ChatMessageDto 정보와 join하여 가져오기 -> 이러면 list 돌면서 결합 안 해줘도 됨
+//                    ChatMessageDto recentMessage = chatMessageService.fetchRecentMessage(
+//                            chatRoom.getGroupChatroomId().getValue());
+//                    if (Objects.nonNull(recentMessage)) {
+//                        chatRoom.setRecentMessage(recentMessage);
+//                    }
+//                })
+//                .toList();
+//    }
+
+    // 내가 가입한 그룹채팅 리스트만 가져오기
+    public List<GroupChatroomResponseDto> fetchMyGroupChatroomList(MemberId memberId) {
+        return groupChatRepository.fetchGroupChatroomByMemberId(memberId);
     }
 
     // 특정 그룹채팅 안 멤버 정보 update (멤버 정보 redis 1차 캐시)
@@ -313,4 +323,7 @@ public List<GroupChatroomMemberResponse> fetchMembersInGroupChatroom(GroupChatro
         }
     }
 
+    public GroupChatroom fetchGroupChatroomById(GroupChatroomId groupChatroomId) {
+        return groupChatRepository.findByChatroomId(groupChatroomId);
+    }
 }

be/src/main/java/movlit/be/pub_sub/chatRoom/application/service/ProfileImageUpdatedEventListener.java

@@ -3,8 +3,10 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import movlit.be.common.util.ids.GroupChatroomId;
@@ -26,8 +28,8 @@
 @RequiredArgsConstructor
 @Slf4j
 public class ProfileImageUpdatedEventListener {
-    private final GroupChatroomService groupChatroomService;
     private final RedisMessagePublisher redisMessagePublisher;
+    private final FetchGroupChatroomUseCase fetchGroupChatroomUseCase;
 
     private final RedisTemplate<String, Object> redisTemplate;
     private final MemberReadService memberReadService;
@@ -36,20 +38,21 @@ public class ProfileImageUpdatedEventListener {
     private static final String CHATROOM_MEMBERS_KEY_PREFIX = "chatroom:";
     private static final String CHATROOM_MEMBERS_KEY_SUFFIX = ":members";
     private static final long CHATROOM_MEMBERS_CACHE_TTL = 60 * 60; // 1시간
+
     @TransactionalEventListener
     public void handleProfileImageUpdatedEvent(ProfileImageUpdatedEvent event) throws JsonProcessingException {
         MemberId memberId = event.getMemberId();
 
         // 해당 멤버가 속한 모든 그룹채팅방 ID를 조회
-        List<GroupChatroomResponseDto> groupChatroomResponseDtoList = groupChatroomService.fetchMyGroupChatList(memberId);
+        List<GroupChatroomResponseDto> groupChatroomResponseDtoList = fetchGroupChatroomUseCase.execute(memberId);
 
         // 업데이트된 멤버정보 조회
         MemberEntity updatedMember = memberReadService.findEntityById(memberId);
         log.info("RedisMessageSubscriber >>> 프로필업데이트된 멤버정보 : " + updatedMember.toStringExceptLazyLoading());
 
 
         // 각 그룹채팅방 ID에 대해 updatedRoomDto 생성 및 메세지 발행
-        for (GroupChatroomResponseDto groupChatroomResponseDto : groupChatroomResponseDtoList){
+        for (GroupChatroomResponseDto groupChatroomResponseDto : groupChatroomResponseDtoList) {
             GroupChatroomId groupChatroomId = groupChatroomResponseDto.getGroupChatroomId();
 
             // 캐시 키 생성
@@ -59,7 +62,7 @@ public void handleProfileImageUpdatedEvent(ProfileImageUpdatedEvent event) throw
             String cachedJson = (String) redisTemplate.opsForValue().get(cacheKey);
 
             List<GroupChatroomMemberResponse> cachedMembers;
-            if (cachedJson != null){
+            if (cachedJson != null) {
                 // 캐시된 데이터(Json 문자열)를 List<GroupChatroomMemberResponse>로 역직렬화
                 cachedMembers = objectMapper.readValue(cachedJson, new TypeReference<>() {
                 });
@@ -72,8 +75,8 @@ public void handleProfileImageUpdatedEvent(ProfileImageUpdatedEvent event) throw
                 );
 
                 // 기존에 캐시된 멤버리스트에서, 업데이트된 멤버정보만 수정
-                for (int i = 0; i < cachedMembers.size(); i++){
-                    if (cachedMembers.get(i).getMemberId().equals(memberId)){
+                for (int i = 0; i < cachedMembers.size(); i++) {
+                    if (cachedMembers.get(i).getMemberId().equals(memberId)) {
                         cachedMembers.set(i, updatedMemberResponse);
                         break;
                     }
@@ -85,10 +88,10 @@ public void handleProfileImageUpdatedEvent(ProfileImageUpdatedEvent event) throw
 
                 // UpdateRoomDto 생성 및 발행
                 UpdateRoomDto updateRoomDto = new UpdateRoomDto(
-                  groupChatroomId,
-                  MessageType.GROUP,
-                  EventType.MEMBER_PROFILE_UPDATE,
-                  memberId
+                        groupChatroomId,
+                        MessageType.GROUP,
+                        EventType.MEMBER_PROFILE_UPDATE,
+                        memberId
                 );
 
                 redisMessagePublisher.updateRoom(updateRoomDto);