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 9557209..2b2a534 100644
--- a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
+++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java
@@ -5,6 +5,7 @@
 import com.example.cosmos_serversb.entities.Request;
 import com.example.cosmos_serversb.entities.User;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -12,15 +13,15 @@
 public class GroupJson {
     private String gId;
     private String uri, name;
-    private Map<String, String> members = new HashMap<>();//HashSetでいいのかな？
-    private Map<String, String> requests = new HashMap<>();
+    private ArrayList<UidUriJson> members = new ArrayList<>();
+    private ArrayList<RidUriJson> requests = new ArrayList<>();
 
     public GroupJson(Group group){
         setgId(group.getgId());
         setUri(group.getUri());
         setName(group.getName());
-        changeMembersMap(group.getMembers());
-        changeRequestsMap(group.getRequests());
+        createUidUri(group.getMembers());
+        createRidUri(group.getRequests());
     }
 
     public String getgId() {
@@ -55,36 +56,33 @@
         return name;
     }
 
-    public Map<String, String> getMembers() {
+    public ArrayList<UidUriJson> getMembers() {
         return members;
     }
 
-    public void setMembers(Map<String, String> members) {
+    public void setMembers(ArrayList<UidUriJson> members) {
         this.members = members;
     }
 
-    public Map<String, String> getRequests() {
+    public ArrayList<RidUriJson> getRequest() {
         return requests;
     }
 
-    public void setRequests(Map<String, String> requests) {
+    public void setRequests(ArrayList<RidUriJson> requests) {
         this.requests = requests;
     }
 
-    private void changeMembersMap(Set set){
+    private void createUidUri(Set set){
         for ( User user : (Set<User>) set ) {
-            members.put(user.getuId(), getUri());
+            members.add( new UidUriJson(user) );
         }
     }
 
-    private void changeRequestsMap(Set set){
+    private void createRidUri(Set set){
         for ( Request request : (Set<Request>) set ) {
-            requests.put(request.getrId(), getUri());
+            requests.add( new RidUriJson(request) );
         }
     }
 
-
-
-
 }