Merge pull request #16 from catchroom/develop

채팅방 나가기, 등장하기 기능 배포

src/main/java/com/catchroom/chat/chatroom/controller/ChatRoomController.java

@@ -1,8 +1,9 @@
 package com.catchroom.chat.chatroom.controller;
 
-import com.catchroom.chat.chatroom.dto.ChatRoomCreateRequest;
+import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
 import com.catchroom.chat.chatroom.service.ChatRoomService;
 import com.catchroom.chat.global.common.ApiResponse;
+import com.catchroom.chat.message.dto.AccommodationResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -13,15 +14,10 @@
 @CrossOrigin(origins = "http://localhost:3000", allowedHeaders = "*")
 public class ChatRoomController {
     private final ChatRoomService chatRoomService;
-    @GetMapping("/{userId}")
-    public ResponseEntity<?> findChatRoomListByMemberId(@PathVariable Long userId) {
-        return ResponseEntity.ok(
-            ApiResponse.create(6000, chatRoomService.findChatRoomListByMemberId(userId)));
-    }
 
-    @PostMapping("/create")
-    public ResponseEntity<?> createRoom(@RequestBody ChatRoomCreateRequest chatRoomCreateRequest) {
-        return ResponseEntity.ok(
-            ApiResponse.create(6002,chatRoomService.createChatRoom(chatRoomCreateRequest)));
+    //TODO 토큰 헤더에 담을 것
+    @GetMapping("/list")
+    public ChatRoomListGetResponse getChatRoomList() {
+        return chatRoomService.getChatRoomList();
     }
 }

src/main/java/com/catchroom/chat/chatroom/dto/ChatRoomListGetResponse.java

@@ -1,25 +1,20 @@
 package com.catchroom.chat.chatroom.dto;
 
-import com.catchroom.chat.chatroom.entity.ChatRoom;
+import com.catchroom.chat.message.type.UserIdentity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Builder
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
 public class ChatRoomListGetResponse {
-    private List<ChatRoom> ChatRoomListUserIsBuyer;
-    private List<ChatRoom> ChatRoomListUserIsSeller;
+    private String chatRoomNumber;
+    private Long buyerId;
+    private Long sellerId;
+    private Long productId;
+    private UserIdentity loginUserIdentity;
 
-    public static ChatRoomListGetResponse of(List<ChatRoom> ChatRoomListUserIsBuyer, List<ChatRoom> ChatRoomListUserIsSeller) {
-        return ChatRoomListGetResponse.builder()
-            .ChatRoomListUserIsBuyer(ChatRoomListUserIsBuyer)
-            .ChatRoomListUserIsSeller(ChatRoomListUserIsSeller)
-            .build();
-    }
 }

src/main/java/com/catchroom/chat/chatroom/entity/ChatRoom.java

@@ -1,9 +1,6 @@
 package com.catchroom.chat.chatroom.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -26,18 +23,7 @@ public class ChatRoom implements Serializable {
     private Long buyerId;
     private Long productId;
     private String chatRoomNumber;
-
-    public ChatRoom(Long sellerId, Long buyerId, Long productId, String chatRoomNumber) {
-        this.sellerId = sellerId;
-        this.buyerId = buyerId;
-        this.productId = productId;
-        this.chatRoomNumber = chatRoomNumber;
-    }
-
-    public static ChatRoom create(Long sellerId, Long buyerId, Long productId) {
-        String chatRoomNumber = UUID.randomUUID().toString();
-        ChatRoom chatRoom = new ChatRoom(sellerId,buyerId,productId,chatRoomNumber);
-        return chatRoom;
-    }
+    @Transient
+    private Boolean is_buyer;
 
 }

src/main/java/com/catchroom/chat/chatroom/repository/ChatRoomRepositoryJPA.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 public interface ChatRoomRepositoryJPA extends JpaRepository<ChatRoom,Long> {
-    List<ChatRoom> findAllByBuyerId(Long buyerId);
+
     List<ChatRoom> findAllBySellerId(Long sellerId);
 
 }

src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java

@@ -1,42 +1,25 @@
 package com.catchroom.chat.chatroom.service;
 
-import com.catchroom.chat.chatroom.dto.ChatRoomCreateRequest;
-import com.catchroom.chat.chatroom.dto.ChatRoomCreateResponse;
 import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
 import com.catchroom.chat.chatroom.entity.ChatRoom;
 import com.catchroom.chat.chatroom.repository.ChatRoomRepositoryJPA;
+import com.catchroom.chat.message.feign.MainFeignClient;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 @RequiredArgsConstructor
 @Service
 public class ChatRoomService {
     private final ChatRoomRepositoryJPA chatRoomRepository;
+    private final MainFeignClient mainFeignClient;
     @Resource(name = "redisTemplate") //redisTemplate bean 주입.
     private HashOperations<String, String, ChatRoom> opsHashChatRoom;
     private static final String CHAT_ROOMS = "CHAT_ROOM_REDIS";
 
-    @Transactional(readOnly = true)
-    public ChatRoomListGetResponse findChatRoomListByMemberId(Long userId) {
-        List<ChatRoom> ChatRoomListUserIsBuyer = chatRoomRepository.findAllByBuyerId(userId);
-
-        List<ChatRoom> ChatRoomListUserIsSeller = chatRoomRepository.findAllBySellerId(userId);
-        return ChatRoomListGetResponse.of(ChatRoomListUserIsBuyer, ChatRoomListUserIsSeller);
-    }
 
-    @Transactional
-    public ChatRoomCreateResponse createChatRoom(ChatRoomCreateRequest chatRoomCreateRequest) {
-        ChatRoom chatRoom = ChatRoom.create(
-            chatRoomCreateRequest.getSellerId(),
-            chatRoomCreateRequest.getBuyerId(),
-            chatRoomCreateRequest.getProductId());
-        chatRoomRepository.save(chatRoom);
-        opsHashChatRoom.put(CHAT_ROOMS, chatRoom.getChatRoomNumber(), chatRoom);
-        return ChatRoomCreateResponse.fromEntity(chatRoom);
+    public ChatRoomListGetResponse getChatRoomList() {
+        return mainFeignClient.getChatRoomList();
     }
 }

src/main/java/com/catchroom/chat/message/feign/MainFeignClient.java → src/main/java/com/catchroom/chat/feign/client/MainFeignClient.java

@@ -1,8 +1,10 @@
 package com.catchroom.chat.message.feign;
 
+import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
 import com.catchroom.chat.global.config.FeignConfig;
 import com.catchroom.chat.message.dto.AccommodationResponse;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -23,6 +25,6 @@ public interface MainFeignClient {
     @RequestMapping(method = RequestMethod.GET, value = "/accommodation/{accommodationId}")
     AccommodationResponse getAccommodationDto(@PathVariable Long accommodationId);
 
-
-
+    @GetMapping(value = "/chat/room/list")
+    ChatRoomListGetResponse getChatRoomList();
 }

src/main/java/com/catchroom/chat/message/controller/MainFeignController.java → src/main/java/com/catchroom/chat/feign/controller/MainFeignController.java

@@ -1,7 +1,7 @@
-package com.catchroom.chat.message.controller;
+package com.catchroom.chat.feign.controller;
 
+import com.catchroom.chat.feign.service.MainFeignService;
 import com.catchroom.chat.message.dto.AccommodationResponse;
-import com.catchroom.chat.message.service.MainFeignService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

src/main/java/com/catchroom/chat/message/service/MainFeignService.java → src/main/java/com/catchroom/chat/feign/service/MainFeignService.java

@@ -1,7 +1,7 @@
-package com.catchroom.chat.message.service;
+package com.catchroom.chat.feign.service;
 
+import com.catchroom.chat.feign.client.MainFeignClient;
 import com.catchroom.chat.message.dto.AccommodationResponse;
-import com.catchroom.chat.message.feign.MainFeignClient;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -19,3 +19,4 @@ public AccommodationResponse getAccommodationResponse(Long accommodationId) {
     }
 
 }
+

src/main/java/com/catchroom/chat/global/handler/StompHandler.java

@@ -26,23 +26,12 @@ public class StompHandler implements ChannelInterceptor {
     @Override
     public Message<?> preSend(Message<?> message, MessageChannel channel) {
         StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
-        log.info("StompHandler : {}, command : {}", message.getPayload(), accessor.getCommand());
-        if (StompCommand.CONNECT == accessor.getCommand()) {
-            // websocket 연결요청
-            /** JWT token 존재 x */
-
-//            String jwtToken = accessor.getFirstNativeHeader("token");
-//            log.info("CONNECT {}", jwtToken);
-//            // Header의 jwt token 검증
-//            jwtTokenProvider.validateToken(jwtToken);
-
-        } else if (StompCommand.SEND == accessor.getCommand()) {
-
-        } else if (StompCommand.SUBSCRIBE == accessor.getCommand()) { // 채팅룸 구독요청
+        if (StompCommand.SUBSCRIBE == accessor.getCommand()) { // 채팅룸 구독요청
 
             // header 정보에서 구독 destination 정보를 얻고, roomId를 추출한다. destination = uri
             String roomId = chatService.getRoomId(
-                    Optional.ofNullable((String) message.getHeaders().get("simpDestination")).orElse("InvalidRoomId")
+                    Optional.ofNullable((String) message.getHeaders().get("simpDestination"))
+                            .orElse("InvalidRoomId")
             );
 
             // 채팅방에 들어온 클라이언트 sessionId를 roomId와 맵핑해 놓는다.(나중에 특정 세션이 어떤 채팅방에 들어가 있는지 알기 위함)

src/main/java/com/catchroom/chat/message/service/ChatService.java

@@ -32,14 +32,14 @@ public String getRoomId(String destination) {
     public void sendChatMessage(ChatMessageDto chatMessage) {
         chatMessage.setUserCount(chatRoomRepository.getUserCount(chatMessage.getRoomId()));
 
-        if (MessageType.ENTER.equals(chatMessage.getType())) {
-            chatMessage.setMessage(chatMessage.getSender() + "님이 방에 입장했습니다.");
-            chatMessage.setSender("[알림]");
-
-        } else if (MessageType.QUIT.equals(chatMessage.getType())) {
-            chatMessage.setMessage(chatMessage.getSender() + "님이 방에서 나갔습니다.");
-            chatMessage.setSender("[알림]");
-        }
+//        if (MessageType.ENTER.equals(chatMessage.getType())) {
+//            chatMessage.setMessage(chatMessage.getSender() + "님이 방에 입장했습니다.");
+//            chatMessage.setSender("[알림]");
+//
+//        } else if (MessageType.QUIT.equals(chatMessage.getType())) {
+//            chatMessage.setMessage(chatMessage.getSender() + "님이 방에서 나갔습니다.");
+//            chatMessage.setSender("[알림]");
+//        }
 
         redisPublisher.publish(chatMessage);
     }

src/main/java/com/catchroom/chat/message/type/UserIdentity.java

@@ -0,0 +1,5 @@
+package com.catchroom.chat.message.type;
+
+public enum UserIdentity {
+    NONLOGINUSER,BUYER,SELLER
+}