Merge branch 'dev' into fix-chat

Author: ces0135-hub

.gitignore

@@ -77,6 +77,7 @@ docker-compose.yaml
 db/
 .docker
 data/
+.dummy
 
 ### secret 프로필
 application-secret.yml

build.gradle.kts

@@ -47,6 +47,9 @@ dependencies {
 
 	//redis
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
+	implementation ("org.redisson:redisson-spring-boot-starter:3.42.0") // redis message broker(lock)
+	implementation ("org.springframework.session:spring-session-data-redis")
+
 
 	// Security
 	implementation("org.springframework.boot:spring-boot-starter-security")
@@ -73,18 +76,6 @@ dependencies {
 	// Spring Security OAuth2
 	implementation ("org.springframework.security:spring-security-oauth2-client:6.4.2") // Or the version you're using
 	implementation ("org.springframework.security:spring-security-oauth2-core:6.4.2") // Or the version you're using
-
-	// Spring Kafka
-	implementation("org.springframework.kafka:spring-kafka")
-
-	// Kafka 클라이언트 (Redpanda와 호환)
-	implementation("org.apache.kafka:kafka-clients:3.6.0")
-
-	// JSON 직렬화/역직렬화 (Kafka 메시지 처리)
-	implementation("com.fasterxml.jackson.core:jackson-databind")
-
-	// 테스트용 Kafka 임베디드 서버 (선택 사항)
-	testImplementation("org.springframework.kafka:spring-kafka-test")
 }
 
 tasks.withType<Test> {

src/main/java/cmf/commitField/CommitFieldApplication.java

@@ -3,11 +3,14 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+// 스케쥴링 활성화
+// 테스트시에만 주석 풀기
+@EnableScheduling
 public class CommitFieldApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(CommitFieldApplication.class, args);
 	}

src/main/java/cmf/commitField/domain/chat/chatMessage/dto/ChatMsgDto.java

@@ -1,16 +1,14 @@
 package cmf.commitField.domain.chat.chatMessage.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class ChatMsgDto {
     private Long chatMsgId;
     private Long userId;

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -8,6 +8,8 @@
 import cmf.commitField.domain.chat.chatMessage.repository.ChatMessageRepository;
 import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import cmf.commitField.domain.chat.chatRoom.repository.ChatRoomRepository;
+import cmf.commitField.domain.chat.userChatRoom.entity.UserChatRoom;
+import cmf.commitField.domain.chat.userChatRoom.repository.UserChatRoomRepository;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import cmf.commitField.global.error.ErrorCode;
@@ -17,8 +19,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Optional;
 
 @Service
 @RequiredArgsConstructor
@@ -28,6 +31,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
     private final UserRepository userRepository;
     private final ChatRoomRepository chatRoomRepository;
     private final ChatMessageCustomRepository chatMessageCustomRepository;
+    private final UserChatRoomRepository userChatRoomRepository;
 
     @Override
     @Transactional
@@ -62,13 +66,24 @@ public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
 
         List<ChatMsg> chatMsgsList = chatMessageCustomRepository.findChatRoomIdByChatMsg(roomId, lastId);
-        return chatMsgsList.stream().map(chatMsg -> new ChatMsgDto(
-                chatMsg.getId(),
-                chatMsg.getUser().getId(),
-                chatMsg.getUser().getNickname(),
-                chatMsg.getMessage(),
-                chatMsg.getCreatedAt()
-                ))
-                .collect(Collectors.toList());
+        Optional<UserChatRoom> joinUser = userChatRoomRepository.findByUserIdAndChatRoomId(userId,roomId);
+        if (joinUser.isEmpty()) {
+            throw new CustomException(ErrorCode.NOT_FOUND_USER);
+        }
+        LocalDateTime joinDt = joinUser.get().getJoinDt();
+        List<ChatMsgDto> chatMsgDtos = new ArrayList<>();
+        for (ChatMsg chatMsg : chatMsgsList) {
+            ChatMsgDto build = ChatMsgDto.builder()
+                    .chatMsgId(chatMsg.getId())
+                    .nickname(chatMsg.getUser().getNickname())
+                    .sendAt(chatMsg.getCreatedAt())
+                    .message(chatMsg.getMessage())
+                    .userId(chatMsg.getUser().getId())
+                    .build();
+            if (build.getSendAt().isAfter(joinDt)) {
+                chatMsgDtos.add(build);
+            }
+        }
+        return chatMsgDtos;
     }
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/ChatRoomController.java

@@ -1,7 +1,9 @@
 package cmf.commitField.domain.chat.chatRoom.controller;
 
 import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomRequest;
+import cmf.commitField.domain.chat.chatRoom.controller.request.ChatRoomUpdateRequest;
 import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomDto;
+import cmf.commitField.domain.chat.chatRoom.dto.ChatRoomUserDto;
 import cmf.commitField.domain.chat.chatRoom.service.ChatRoomService;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.global.error.ErrorCode;
@@ -11,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.web.bind.annotation.*;
@@ -41,13 +44,13 @@ public GlobalResponse<Object> createRoom(
 
     //채팅방 입장
     @PostMapping("/room/join/{roomId}")
-    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId) {
+    public GlobalResponse<Object> joinRoom(@PathVariable Long roomId, @RequestBody ChatRoomRequest chatRoomRequest) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication instanceof OAuth2AuthenticationToken) {
             CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
             Long userId = principal.getId();  // getId()를 통해 userId를 추출
-            chatRoomService.joinRoom(roomId, userId);  // userId를 전달
+            chatRoomService.joinRoom(roomId, userId, chatRoomRequest);  // userId를 전달
             return GlobalResponse.success("해당 채팅방에 입장하셨습니다");
         } else {
             throw new IllegalArgumentException("로그인 후에 이용해 주세요.");
@@ -113,6 +116,24 @@ public GlobalResponse<Object> getByUserRoomPartList(Pageable pageable) {
         }
     }
 
+    //채팅방 제목 수정
+    @PutMapping("/room/update/{roomId}")
+    @LoginCheck
+    public GlobalResponse<Object> updateRoom(
+            @PathVariable Long roomId,
+            @RequestBody @Valid ChatRoomUpdateRequest chatRoomUpdateRequest) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // getId()를 통해 userId를 추출
+            chatRoomService.updateRoom(roomId, chatRoomUpdateRequest, userId);  // userId를 전달
+            return GlobalResponse.success("채팅방을 업데이트 했습니다.");
+        } else {
+            throw new IllegalArgumentException("로그인 후에 이용해 주세요.");
+        }
+    }
+
     // 채팅방 나가기
     @DeleteMapping("/room/out/{roomId}")
     @LoginCheck
@@ -147,4 +168,53 @@ public GlobalResponse<Object> deleteRoom(
         }
     }
 
+    //채팅방 유저 목록 조회
+    @GetMapping("/room/users/{roomId}")
+    @LoginCheck
+    public GlobalResponse<Object> getRoomUsers(
+            @PathVariable Long roomId) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            CustomOAuth2User principal = (CustomOAuth2User) authentication.getPrincipal();
+            Long userId = principal.getId();  // Extract userId from the principal
+            List<ChatRoomUserDto> roomUsers = chatRoomService.getRoomUsers(roomId, userId);
+            return GlobalResponse.success(roomUsers);
+        } else {
+            throw new IllegalArgumentException("로그인 후에 이용해 주세요.");
+        }
+    }
+
+    // 전체 리스트에서 좋아요 순으로 정렬
+    @GetMapping("/room/heart")
+    @LoginCheck
+    public GlobalResponse<Object> roomHeartSort(Pageable pageable) {
+        List<ChatRoomDto> roomList = chatRoomService.getRoomHeartSortList(pageable);
+        if (roomList.isEmpty()) {
+            return GlobalResponse.error(ErrorCode.NO_ROOM);
+        } else {
+            return GlobalResponse.success(roomList);
+        }
+    }
+
+    // 사용자(자신)가 좋아요 누른 방 리스트 조회
+    @GetMapping("/room/myHeart/list")
+    @LoginCheck
+    public GlobalResponse<Object> getMyHeartRoomList(
+            Pageable pageable,
+            @AuthenticationPrincipal CustomOAuth2User principal) { // 인증된 사용자 정보 주입
+
+        Long userId = principal.getId(); // 현재 로그인된 사용자 ID 가져오기
+        List<ChatRoomDto> list = chatRoomService.myHeartRoomList(userId, pageable);
+
+        if (list.isEmpty()) {
+            return GlobalResponse.error(ErrorCode.NO_ROOM_FOUND);
+        }
+        return GlobalResponse.success("좋아요 누른 채팅방 리스트 조회 완료", list);
+    }
+
+
+
+
+
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/request/ChatRoomRequest.java

@@ -21,5 +21,7 @@ public class ChatRoomRequest {
     @Max(100)
     private Integer userCountMax;
 
+    @Length(min = 4, max = 20)
+    private String password;
 
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/controller/request/ChatRoomUpdateRequest.java

@@ -0,0 +1,16 @@
+package cmf.commitField.domain.chat.chatRoom.controller.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChatRoomUpdateRequest {
+    @NotEmpty
+    @Length(min = 2, max = 20)
+    private String title;
+}

src/main/java/cmf/commitField/domain/chat/chatRoom/dto/ChatRoomDto.java

@@ -1,5 +1,6 @@
 package cmf.commitField.domain.chat.chatRoom.dto;
 
+import cmf.commitField.domain.chat.chatRoom.entity.ChatRoom;
 import lombok.*;
 
 @Getter
@@ -15,4 +16,16 @@ public class ChatRoomDto {
     private Long currentUserCount;
 
     private Integer userCountMax;
+
+    private Integer heartCount;
+
+    public static ChatRoomDto of(ChatRoom chatRoom) {
+        return ChatRoomDto.builder()
+                .id(chatRoom.getId())
+                .title(chatRoom.getTitle())
+                .currentUserCount((long) chatRoom.getUserChatRooms().size())
+                .userCountMax(chatRoom.getUserCountMax())
+                .heartCount(chatRoom.getHearts().size())
+                .build();
+    }
 }

src/main/java/cmf/commitField/domain/chat/chatRoom/dto/ChatRoomUserDto.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.chat.chatRoom.dto;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ChatRoomUserDto {
+    private String nickname;
+    private Boolean status;
+}