diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java index 714ca25..0218046 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -69,6 +69,54 @@ this.uId = uId; } + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIconUri() { + return iconUri; + } + + public void setIconUri(String iconUri) { + this.iconUri = iconUri; + } + + public boolean getLogin() { + return login; + } + + public void setLogin(boolean login) { + this.login = login; + } + +// public void setToken(Set token) { +// this.token = token; +// } +// +// public String getToken() { +// return token; +// } + + public Set getGroups() { + return groups; + } + + public void setGroups(Set groups) { + this.groups = groups; + } + public void addGroups(Group group){ groups.add(group); } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java index 0c9fe54..4f634df 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java @@ -19,7 +19,7 @@ setUri(user.getUri()); setName(user.getName()); setIconUri(user.getIconUri()); - setToken(user.getToken()); + //setToken(user.getToken()); this.login = true; } 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 28f67bf..9e8965f 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -83,14 +83,14 @@ return null; } - public static UsersMapJson addMember(String gId, String uId){ + public static Group addMember(String gId, String uId){ Session session = SessionManager.getInstance().getSession(); - Group editGroup = session.load(Group.class, gId); + Group editGroup = session.get(Group.class, gId); if(editGroup != null) { editGroup.addMember(uId); session.update(editGroup); - UsersMapJson usersMapJson = new UsersMapJson(editGroup); - return usersMapJson; + //UsersMapJson usersMapJson = new UsersMapJson(editGroup); + return editGroup; }else{ //例外処理 return null; 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 bd30720..b2c1024 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java @@ -86,7 +86,8 @@ public String addMember(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException{ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(Groups.getInstance().addMember(gId, uId)); + Group editGroup = Groups.getInstance().addMember(gId, uId); + String json = mapper.writeValueAsString(new GroupJson(editGroup)); SessionManager.getInstance().closeSession(); return json; }