Merge pull request #116 from Team-FAB/develop

Develop
Team-FAB · Jun 30, 2023 · f344771 · f344771
2 parents af93b83 + 202aff4
commit f344771
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -70,5 +70,6 @@ jobs:
             echo "${{ secrets.API_ENV }}" | base64 --decode > api.env
             echo "${{ secrets.MONGO_ENV }}" | base64 --decode > mongo.env
             sudo chmod 666 /var/run/docker.sock
+            sudo docker pull yjjjwww/banggabgo
             sudo docker compose up -d --build
             sudo docker image prune -f
diff --git a/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java b/src/main/java/com/fab/banggabgo/dto/chat/ChatDto.java
@@ -14,15 +14,16 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class ChatDto {
+
   private String roomId;
-  private String userName;
+  private String userEmail;
   private String msg;
   private LocalDateTime createDate;
 
-  public static ChatDto toDto(Chat chat){
+  public static ChatDto toDto(Chat chat) {
     return ChatDto.builder()
         .roomId(chat.getRoomId())
-        .userName(chat.getUserEmail())
+        .userEmail(chat.getUserEmail())
         .msg(chat.getMsg())
         .createDate(chat.getCreateDate())
         .build();

diff --git a/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java b/src/main/java/com/fab/banggabgo/dto/chat/RequestChatDto.java
@@ -12,6 +12,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class RequestChatDto {
-  private String username;
+  private String userEmail;
   private String msg;
 }
diff --git a/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java b/src/main/java/com/fab/banggabgo/service/impl/ChatServiceImpl.java
@@ -27,7 +27,7 @@ public List<ChatDto> getChatLogs(String roomId){
   public Chat saveMsg(String roomId,RequestChatDto dto){
     var chat =Chat.builder()
         .roomId(roomId)
-        .userEmail(dto.getUsername())
+        .userEmail(dto.getUserEmail())
         .msg(dto.getMsg())
         .build();
     return chatRepository.save(chat);