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 e011e46..11285ca 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/UserJsonForRequests.java @@ -17,7 +17,6 @@ setUri(user.getUri()); setName(user.getName()); setIconUri(user.getIconUri()); - } public String getuId() { 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; }