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 f97a025..5261857 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -217,15 +217,15 @@ // return testRequest; } - public static DeleteResult deleteRequest(String gId, String rId){ + public static String deleteRequest(String gId, String rId){ Session session = SessionManager.getInstance().getSession(); Request request = session.get(Request.class, rId); if(request != null) { session.get(Group.class, gId).updateRequestHash(request); session.delete(request); - return DeleteResult.SUCCESS; + return "SUCCESS"; } - return DeleteResult.FAILURE; + return "FAILURE"; } /* 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 f5080bb..4ceaef6 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java @@ -154,7 +154,7 @@ @Path("{gId}/requests/{rId}") @DELETE - public String deleteRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @FormParam("token") String token) throws JsonProcessingException{ + public String deleteRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @QueryParam("token") String token) throws JsonProcessingException{ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Groups.getInstance().deleteRequest(gId, rId));