deleteRequest()のレスポンスをString型に変更しました。 tokenパラメータをQueryにしました #108

Merged a-hongo merged 1 commit into nitta-lab-2019:master from nitta-lab-2019:fixGetRequests on 15 Nov 2019

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          src/main/java/com/example/cosmos_serversb/models/Groups.java
 //
//        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 DeleteResult.FAILURE;
            return "SUCCESS";
        }
        return "FAILURE";
    }
 
    /*
    //テスト用にHashMapの作成
 //
 //        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 DeleteResult.FAILURE;
+            return "SUCCESS";
+        }
+        return "FAILURE";
     }
     /*
     //テスト用にHashMapの作成

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java
     }
 
    @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));
        SessionManager.getInstance().closeSession();
     }
     @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));
         SessionManager.getInstance().closeSession();