diff --git a/src/main/java/org/ntlab/tampoposerver/models/UserDTO.java b/src/main/java/org/ntlab/tampoposerver/models/UserDTO.java
new file mode 100644
index 0000000..a8379d3
--- /dev/null
+++ b/src/main/java/org/ntlab/tampoposerver/models/UserDTO.java
@@ -0,0 +1,29 @@
+package org.ntlab.tampoposerver.models;
+
+public class UserDTO {
+    private String name;
+    private String icon;
+
+    public UserDTO(User user) {
+        this.name = user.getName();
+        this.icon = user.getIcon();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+
+}
diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
index f4e34eb..c695d39 100644
--- a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
+++ b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
@@ -27,10 +27,11 @@
         return userMap.get(userId);
     }
 
-    public ArrayList<User> getAllUsers() {//全アカウントのuserIdを取得
-        ArrayList<User> u = new ArrayList<>();
+    public ArrayList<String> getAllUsers() {//全アカウントのuserIdを取得
+        ArrayList<String> u = new ArrayList<>();
         for (String key : userMap.keySet()) {
-            u.add(userMap.get(key));
+            User user = userMap.get(key);
+            u.add(user.getUserId());
         }
         return u;
     }
diff --git a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java
index 30a951c..5e632de 100644
--- a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java
+++ b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java
@@ -4,6 +4,7 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.ntlab.tampoposerver.models.FriendPair;
+import org.ntlab.tampoposerver.models.UserDTO;
 import org.ntlab.tampoposerver.repositories.UserRepository;
 import org.ntlab.tampoposerver.models.User;
 import org.ntlab.tampoposerver.services.FriendService;
@@ -61,7 +62,7 @@
     repositoryのメソッド名：add, get, delete
     本来の流れはインターフェースだけ決めておく　メソッド名と引数名*/
     public Response getUsers() {
-        List<User> users = userRepository.getAllUsers();
+        List<String> users = userRepository.getAllUsers();
         if (users.isEmpty()) {
             return Response.noContent().build();
         }
@@ -121,7 +122,8 @@
         if (user == null) {
             throw new WebApplicationException(Response.Status.NOT_FOUND);
         }
-        return Response.ok(user, MediaType.APPLICATION_JSON).build();
+        UserDTO userDTO = new UserDTO(user);
+        return Response.ok(userDTO, MediaType.APPLICATION_JSON).build();
     }
 
     //ユーザの削除 ok
diff --git a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
index 3bbeee6..43e550b 100644
--- a/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
+++ b/src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java
@@ -18,15 +18,15 @@
         User u2 = userRepository.addUser("u02", "zcv", "abc","dfgdf@gmail.com","123a876bca878d125");
         User u3 = userRepository.addUser("u03", "ghj", "yyi","yijdh@gmail.com","143a876bca878d125");
 //        User u = userRepository.getUser("u02");
-        //getAllUsersテスト
-//        ArrayList<User> users = userRepository.getAllUsers();
-//        for (User u : users) {
-//            System.out.println(u.getUserId());
-//        }
-        ArrayList<String> emails = userRepository.getAllEmails();
-        for (String email : emails) {
-            System.out.println(email);
+//       getAllUsersテスト
+        ArrayList<String> users = userRepository.getAllUsers();
+        for (String u : users) {
+            System.out.println(u);
         }
+//        ArrayList<String> emails = userRepository.getAllEmails();
+//        for (String email : emails) {
+//            System.out.println(email);
+//        }
 //        System.out.println(users);
 //        assertEquals(u2, u);
 //        assertNotEquals(u1, u);