diff --git a/src/main/java/com/example/cosmos_serversb/entities/Request.java b/src/main/java/com/example/cosmos_serversb/entities/Request.java index 7557139..f18b8db 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -138,4 +138,8 @@ public void setDone(boolean done) { this.done = done; } + + public boolean equals(Request request) { + return this.rId.equals(request.getrId()); + } } \ No newline at end of file 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 0691c3e..c7f4b8e 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -179,6 +179,13 @@ } public static Request getRequestDetailByGidAndRid(String gId, String rId){ + Session session = SessionManager.getInstance().getSession(); + Request request = session.get(Request.class, rId); + Group group = session.get(Group.class, gId); + if(group.getRequests().contains(request)) { + return request; + } + //違うグループのリクエストは返せない。 return null; } @@ -199,7 +206,13 @@ } public static DeleteResult deleteRequest(String gId, String rId){ - return DeleteResult.SUCCESS; + Session session = SessionManager.getInstance().getSession(); + Request request = session.get(Request.class, rId); + if(request != null) { + session.delete(request); + return DeleteResult.SUCCESS; + } + return DeleteResult.FAILURE; } /*