diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GidUriJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GidUriJson.java
new file mode 100644
index 0000000..a7a9b12
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/jsons/GidUriJson.java
@@ -0,0 +1,34 @@
+package com.example.cosmos_serversb.jsons;
+
+import com.example.cosmos_serversb.entities.Group;
+
+public class GidUriJson {
+    private String gId;
+    private String uri;
+
+    public GidUriJson(){
+
+    }
+
+    public GidUriJson(Group group){
+        setgId(group.getgId());
+        setUri(group.getUri());
+    }
+
+    private void setgId(String gId) {
+        this.gId = gId;
+    }
+
+    public String getgId() {
+        return gId;
+    }
+
+    private void setUri(String uri){
+        this.uri = uri;
+    }
+
+    public String getUri(){
+        return uri;
+    }
+
+}
diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
index 2b2a534..3d53ca4 100644
--- a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
+++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
@@ -1,4 +1,3 @@
-//このクラスは仮です
 package com.example.cosmos_serversb.jsons;
 
 import com.example.cosmos_serversb.entities.Group;
diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GroupsMapJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GroupsMapJson.java
index 532f336..0398fbd 100644
--- a/src/main/java/com/example/cosmos_serversb/jsons/GroupsMapJson.java
+++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupsMapJson.java
@@ -7,15 +7,24 @@
 import java.util.*;
 
 public class GroupsMapJson {
-    private Map<String, String> groups = new HashMap<>();
+    private ArrayList<GidUriJson> groups = new ArrayList<>();
 
     public GroupsMapJson(User user){
         changeGroupsMap(user.getGroups());
     }
 
+
+    public ArrayList<GidUriJson> getGroups(){
+        return groups;
+    }
+
+    public void setGroups(ArrayList<GidUriJson> groups){
+        this.groups = groups;
+    }
+
     private void changeGroupsMap(Set set){
         for ( Group group : (Set<Group>) set ) {
-            groups.put(group.getgId(), group.getUri());
+            groups.add(new GidUriJson(group));
         }
     }
 }
diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java
index 78bc89c..db5cd0b 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -40,8 +40,7 @@
         String rId = UUID.randomUUID().toString();
         return rId;
     }
-
-    //getGroupsListByUidは現状うまく処理されない
+    
     public static GroupsMapJson getGroupsListByUid(String uId){
         return getGroupsHashMap(uId);
     }
diff --git a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
index 7c92b29..70f42fd 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
@@ -2,7 +2,7 @@
 
 import com.example.cosmos_serversb.entities.Group;
 import com.example.cosmos_serversb.entities.User;
-import com.example.cosmos_serversb.jsons.GroupJson;
+import com.example.cosmos_serversb.jsons.*;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hibernate.Session;
@@ -19,7 +19,7 @@
 public class GroupsRest {
     @GET
     public String getGroupsListByUid(@QueryParam("uId") String uId, @QueryParam("token") String token) throws JsonProcessingException{
-        SessionManager.getInstance().getSession();
+        Session session = SessionManager.getInstance().getSession();
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(Groups.getInstance().getGroupsListByUid(uId));
         SessionManager.getInstance().closeSession();