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 f18b8db..c863127 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -44,7 +44,7 @@ this.done = false; } - public void update(String uId, String product, Date deadline, int location, boolean done){ + public void update(String uId, String product, String deadline, int location, boolean done){ setIssuerUid(uId); setProduct(product); setDeadline(deadline); @@ -109,7 +109,7 @@ } //String型をDate型に変換 try { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.deadline = sdf.parse(deadline); }catch (ParseException e){ e.printStackTrace(); 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 c7f4b8e..1b145a1 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -162,7 +162,7 @@ return null; } - public static Request addRequests(String gId, String uId, String product, Date deadline, int location){ + public static Request addRequests(String gId, String uId, String product, String deadline, int location){ String rId = getInstance().createRId(); String uri = baseURI + AppName + "/groups/" + gId + "/requests/" + rId; Request request = new Request(rId, uri, new Date(), uId, product, deadline, location); @@ -189,7 +189,7 @@ return null; } - public static Request updateRequest(String gId, String rId, String uId, String product, Date deadline, int location, boolean done){ + public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){ Session session = SessionManager.getInstance().getSession(); Request editRequest = session.get(Request.class, rId); if(editRequest != null){ 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 b2c1024..f5080bb 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/GroupsRest.java @@ -124,7 +124,7 @@ @Path("/{gId}/requests") @POST - public String addRequests(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") Date deadline, @FormParam("location") int location, @FormParam("token") String token) throws JsonProcessingException{ + public String addRequests(@PathParam("gId") String gId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") String deadline, @FormParam("location") int location, @FormParam("token") String token) throws JsonProcessingException{ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Groups.getInstance().addRequests(gId, uId, product, deadline, location)); @@ -144,7 +144,7 @@ @Path("{gId}/requests/{rId}") @PUT - public String updateRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") Date deadline, @FormParam("location") int location, @FormParam("done") boolean done, @FormParam("token") String token) throws JsonProcessingException{ + public String updateRequest(@PathParam("gId") String gId, @PathParam("rId") String rId, @FormParam("uId") String uId, @FormParam("product") String product, @FormParam("deadline") String deadline, @FormParam("location") int location, @FormParam("done") boolean done, @FormParam("token") String token) throws JsonProcessingException{ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Groups.getInstance().updateRequest(gId, rId, uId, product, deadline, location, done));