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..3708bef 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,14 +13,16 @@ public class GroupJson { private String gId; private String uri, name; - private Map members = new HashMap<>();//HashSetでいいのかな? + //private Map members = new HashMap<>();//HashSetでいいのかな? + private ArrayList members = new ArrayList<>(); private Map requests = new HashMap<>(); public GroupJson(Group group){ setgId(group.getgId()); setUri(group.getUri()); setName(group.getName()); - changeMembersMap(group.getMembers()); + //changeMembersMap(group.getMembers()); + createUidUri(group.getMembers()); changeRequestsMap(group.getRequests()); } @@ -55,11 +58,20 @@ return name; } - public Map getMembers() { +// public Map getMembers() { +// return members; +// } + +// public void setMembers(Map members) { +// this.members = members; +// } + + + public ArrayList getMembers() { return members; } - public void setMembers(Map members) { + public void setMembers(ArrayList members) { this.members = members; } @@ -71,12 +83,18 @@ this.requests = requests; } - private void changeMembersMap(Set set){ + private void createUidUri(Set set){ for ( User user : (Set) set ) { - members.put(user.getuId(), getUri()); + members.add( new UidUriJson(user) ); } } +// private void changeMembersMap(Set set){ +// for ( User user : (Set) set ) { +// members.put(user.getuId(), getUri()); +// } +// } + private void changeRequestsMap(Set set){ for ( Request request : (Set) set ) { requests.put(request.getrId(), getUri()); diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java b/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java new file mode 100644 index 0000000..318c6bd --- /dev/null +++ b/src/main/java/com/example/cosmos_serversb/jsons/UidUriJson.java @@ -0,0 +1,34 @@ +package com.example.cosmos_serversb.jsons; + +import com.example.cosmos_serversb.entities.User; + +public class UidUriJson { + private String uId; + private String uri; + + public UidUriJson(){ + + } + + public UidUriJson(User user){ + setuId(user.getuId()); + setUri(user.getUri()); + } + + private void setuId(String uId) { + this.uId = uId; + } + + public String getuId() { + return uId; + } + + private void setUri(String uri){ + this.uri = uri; + } + + public String getUri(){ + return uri; + } + +}