diff --git a/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java b/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
index a5849b5..eae2bce 100644
--- a/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
+++ b/src/main/java/org/ntlab/tampoposerver/models/ChatRooms.java
@@ -1,13 +1,10 @@
 package org.ntlab.tampoposerver.models;
 
-import org.apache.logging.log4j.message.Message;
-
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 public class ChatRooms {
-    private Integer chatRoomId;
+    private String chatRoomId;
     private String user0Id;
     private String user1Id;
     private String newContent;
@@ -15,7 +12,7 @@
     private List<Message> messages = new ArrayList<>();
     private List<String> users = new ArrayList<>();
 
-    public ChatRooms(Integer chatRoomId, String user0Id, String user1Id) {
+    public ChatRooms(String chatRoomId, String user0Id, String user1Id) {
 
         this.chatRoomId = chatRoomId;
         this.user0Id = user0Id;
@@ -25,19 +22,19 @@
         this.users.add(user1Id);
     }
 
-    public String getUser0Id(){
+    public String getUser0Id() {
         return user0Id;
     }
 
-    public String getUser1Id(){
+    public String getUser1Id() {
         return user1Id;
     }
 
-    public Integer getChatRoomId() {
+    public String getChatRoomId() {
         return chatRoomId;
     }
 
-    public void setChatRoomId(Integer chatRoomId) {
+    public void setChatRoomId(String chatRoomId) {
         this.chatRoomId = chatRoomId;
     }
 
@@ -54,14 +51,16 @@
     public void put(Integer chatRoomId, String chatRoomNumber) {
     }
 
-    public Integer updateMessage() {
-        return chatRoomId;
-    }
+//    public Integer updateMessage() {
+//        return chatRoomId;
+//    }
 
-    public ChatRooms updateMessage(Integer chatRoomId, String userId, String newContent) {this.chatRoomId = chatRoomId;
-    this.user0Id = userId;
-    this.newContent = newContent;
-    return this;}
+    public ChatRooms updateMessage(String chatRoomId, String userId, String newContent) {
+        this.chatRoomId = chatRoomId;
+        this.user0Id = userId;
+        this.newContent = newContent;
+        return this;
+    }
 
     public ChatRooms addMessage(String senderId, String content) {
         messages.add(new Message(senderId, content));
@@ -71,7 +70,10 @@
     public List<Message> getMessages() {
         return messages;
     }
-    public List<Message> getMessage() { return messages; }
+
+    public List<Message> getMessage() {
+        return messages;
+    }
 
     public static class Message {
         private String senderId;
@@ -81,8 +83,14 @@
             this.senderId = senderId;
             this.content = content;
         }
-        public String getSenderId() { return senderId;}
-        public String getContent() { return content;}
+
+        public String getSenderId() {
+            return senderId;
+        }
+
+        public String getContent() {
+            return content;
+        }
     }
 
     public boolean removeUser(String userId) {