Merge pull request #100 from catchroom/develop

Develop
catchroom · Feb 1, 2024 · 2501c16 · 2501c16
2 parents f86cbf8 + 50f75f6
commit 2501c16
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 57 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -49,6 +49,10 @@ jobs:
           username: ${{ secrets.USER_NAME }}
           key: ${{ secrets.PRIVATE_KEY }}
           script: |
+            sudo docker image prune -af
             sudo docker pull ${{ secrets.DOCKER_IMAGE_NAME }}
-            sudo docker stop chat-server
-            sudo docker run -d --rm --name chat-server -p 8080:8080 ${{ secrets.DOCKER_IMAGE_NAME }}
+            sudo docker stop chat-server1
+            sudo docker run -d --rm --name chat-server-1 -p 8080:8080 ${{ secrets.DOCKER_IMAGE_NAME }}
+            sleep 30
+            sudo docker stop chat-server2
+            sudo docker run -d --rm --name chat-server-2 -p 8081:8081 ${{ secrets.DOCKER_IMAGE_NAME }}
diff --git a/src/main/java/com/catchroom/chat/chatroom/dto/ChatRoomListGetResponse.java b/src/main/java/com/catchroom/chat/chatroom/dto/ChatRoomListGetResponse.java
@@ -5,15 +5,13 @@
 import com.catchroom.chat.message.dto.ChatMessageDto;
 import com.catchroom.chat.message.type.UserIdentity;
 import java.io.Serializable;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+
+import lombok.*;
 
 @Builder
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
-@NoArgsConstructor
 public class ChatRoomListGetResponse implements Serializable {
     private String chatRoomNumber;
 

diff --git a/src/main/java/com/catchroom/chat/chatroom/entity/ChatRoom.java b/src/main/java/com/catchroom/chat/chatroom/entity/ChatRoom.java
diff --git a/src/main/java/com/catchroom/chat/message/repository/ChatRoomRedisRepository.java b/src/main/java/com/catchroom/chat/message/repository/ChatRoomRedisRepository.java
@@ -5,37 +5,27 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
 
 /** redis 와 관련된 메소드들 */
 
 
-@Service
+@Repository
 @RequiredArgsConstructor
 @Slf4j
 public class ChatRoomRedisRepository {
 
     private static final String CHAT_ROOM_KEY = "_CHAT_ROOM_RESPONSE_LIST";
-
     private static final String CHAT_ROOM = "CHAT_ROOM_LAST_MSG"; //채팅방 마지막 메시지 저장
-
-
-
     private final RedisTemplate<String, Object> redisTemplate;
-
     private final ObjectMapper objectMapper;
 
     @Resource(name = "redisTemplate")

diff --git a/src/main/java/com/catchroom/chat/message/service/ChatService.java b/src/main/java/com/catchroom/chat/message/service/ChatService.java
@@ -2,19 +2,13 @@
 
 import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
 import com.catchroom.chat.chatroom.service.ChatRoomService;
-import com.catchroom.chat.feign.client.MainFeignClient;
-import com.catchroom.chat.global.common.SuccessMessage;
 import com.catchroom.chat.message.dto.ChatMessageDto;
 import com.catchroom.chat.global.pubsub.RedisPublisher;
 import com.catchroom.chat.message.dto.MessageSubDto;
-import com.catchroom.chat.message.entity.ChatMessage;
-import com.catchroom.chat.message.repository.ChatMessageRepository;
 import com.catchroom.chat.message.repository.ChatRoomRedisRepository;
 import com.catchroom.chat.message.type.MessageType;
 import com.catchroom.chat.message.type.UserIdentity;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Comparator;
+
 import java.util.List;
 
 import lombok.RequiredArgsConstructor;

diff --git a/src/test/java/com/catchroom/chat/message/repository/ChatRoomRedisRepositoryTest.java b/src/test/java/com/catchroom/chat/message/repository/ChatRoomRedisRepositoryTest.java
@@ -1,9 +1,6 @@
 package com.catchroom.chat.message.repository;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import org.junit.jupiter.api.Test;