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 9ee545d..db5d627 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -53,15 +53,12 @@ Group testGroup = new Group(gId, uri, name, uId); Session session = SessionManager.getInstance().getSession(); session.save(testGroup); - SessionManager.getInstance().closeSession(); - - session = SessionManager.getSession().getSession(); - testGroup.addMember(uId); - int n = testGroup.getMembers().size(); - - session.update(testGroup); - - SessionManager.getInstance().closeSession(); +// SessionManager.getInstance().closeSession(); +// session = SessionManager.getSession().getSession(); +// testGroup.addMember(uId); +// int n = testGroup.getMembers().size(); +// session.update(testGroup); +// SessionManager.getInstance().closeSession(); return testGroup; } @@ -141,6 +138,18 @@ */ } + //とりあえず作成。あとでaddMember()と統合させる。 + public static void addMemberWhenCreateGroup(Group group, String uId){ + Session session = SessionManager.getInstance().getSession(); +// Group editGroup = session.load(Group.class, "gId");//取得できない + Group editGroup = group; + if(editGroup != null) { + editGroup.addMember(uId); +// int n = testGroup.getMembers().size(); + session.update(editGroup); + } + } + public static HashMap getTestHashMap(){ return testMap; } 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 2714d23..31ab036 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java @@ -1,5 +1,6 @@ package com.example.cosmos_serversb.resources; +import com.example.cosmos_serversb.entities.Group; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.hibernate.Session; @@ -9,6 +10,8 @@ import com.example.cosmos_serversb.models.*; +import java.io.IOException; + @Component @Path("/groups") public class GroupsRest { @@ -22,11 +25,19 @@ } @POST - public String createGroup(@FormParam("name") String name, @FormParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException{ + public String createGroup(@FormParam("name") String name, @FormParam("uId") String uId, @FormParam("token") String token) throws IOException { + //グループの作成 SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Groups.getInstance().createGroup(name, uId)); SessionManager.getInstance().closeSession(); + + //グループにメンバーの追加 + SessionManager.getInstance().getSession(); + Group group = mapper.readValue(json, Group.class); +// Groups.addMemberById(group.getgId(), uId);//どうやってこのgIdを取得する? + Groups.addMemberWhenCreateGroup(group, uId); + SessionManager.getInstance().closeSession(); return json; }