diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index 4450341..b853230 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -19,35 +19,43 @@
         return theInstance;
     }
 
-    public static User createUser(String name, String pw, String iconImage) {
-        User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
-        testUser.token.add(getInstance().createToken(testUser.uId));
-        testUser.token.add(getInstance().createToken(testUser.uId));
-        return testUser;
-    }
-
     public static String createToken(String uId) {
         //Tokenを作成しuIdと関連付けしDBに保存し作成したTokenを返す
         String token = UUID.randomUUID().toString();
         return token;
     }
 
+    public static String createUId() {
+        //uIdを作成し既存していないかチェック後DBに保存し作成したuIdを返す
+        String uId = UUID.randomUUID().toString();
+        return uId;
+    }
+
+    public static User createUser(String name, String pw, String iconImage) {
+        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        return testUser;
+    }
+
     public static User setUser(String uId, String name, String pw, String iconImage) {
-        User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
     public static User getUserById(String uId) {
-        User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        //与えられたuIdのUser情報を返す
+        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
     public static User getUserByToken(String token) {
-        User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
+        //与えられたTokenに紐づくUser情報を返す
+        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
         testUser.token.add(getInstance().createToken(testUser.uId));
         testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
@@ -58,6 +66,7 @@
     }
 
     public static String login(String uId) {
+        //tokenを作成後値を返す
         return getInstance().createToken(uId);//testToken
     }
 
@@ -66,10 +75,12 @@
     }
 
     public static boolean checkToken(String uId, String token) {
+        //与えられたtokenとUserのtokenを比較し結果を返す
         return true;
     }
 
     public static boolean checkPassword(String uId, String pw) {
+        //与えられたパスワードとUserのパスワードを比較し結果を返す
         return true;
     }
 }