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 6a6db20..6e1da04 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -120,8 +120,12 @@
public static RequestsJson getRequestsListByGid(String gId, boolean detail, int quantity){
Session session = SessionManager.getInstance().getSession();
- Group group = session.load(Group.class, gId);
- RequestsJson requestsJson = new RequestsJson(group.getRequests());
+ Group group = session.get(Group.class, gId);
+ if(group != null) {
+ RequestsJson requestsJson = new RequestsJson(group.getRequests());
+ return requestsJson;
+ }
+ //例外処理
return null;
}
@@ -129,8 +133,17 @@
//テスト用
String rId = getInstance().createRId();
String uri = baseURI + AppName + "/groups/" + gId + "/requests/" + rId;
- Request testRequest = new Request(rId, uri, new Date(1999,01,01), uId, product, new Date(1999,12,01), 999);
- return testRequest;
+ Request request = new Request(rId, uri, new Date(1999,01,01), uId, product, deadline, location);
+
+ Session session = SessionManager.getInstance().getSession();
+ Group editGroup = session.get(Group.class, gId);
+ if(editGroup != null) {
+ editGroup.addRequests(request);
+ session.update(editGroup);
+ return request;
+ }
+ //例外処理
+ return null;
}
public static Request getRequestDetailByGidAndRid(String gId, String rId){
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..c541c3e 100644
--- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
+++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
@@ -127,7 +127,7 @@
SessionManager.getInstance().getSession();
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(Groups.getInstance().addRequests(gId, uId, product, deadline, location));
- SessionManager.getInstance().closeSession();
+ SessionManager.getInstance().closeSession();//だめ
return json;
}
diff --git a/src/main/resources/Request.hbm.xml b/src/main/resources/Request.hbm.xml
index 010d45a..2d3fc7e 100644
--- a/src/main/resources/Request.hbm.xml
+++ b/src/main/resources/Request.hbm.xml
@@ -16,10 +16,10 @@
-
+
-
+