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 e5ca799..7557139 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, String deadline, int location, boolean done){
+    public void update(String uId, String product, Date deadline, int location, boolean done){
         setIssuerUid(uId);
         setProduct(product);
         setDeadline(deadline);
@@ -97,11 +97,16 @@
     }
 
     public void setDeadline(Date deadline) {
+        if(deadline == null){
+            return;
+        }
         this.deadline = deadline;
     }
 
     public void setDeadline(String deadline) {
-        if(deadline == null) return;
+        if(deadline == null){
+            return;
+        }
         //String型をDate型に変換
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
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 811fec5..178e40b 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -126,7 +126,7 @@
         return null;
     }
 
-    public static Request addRequests(String gId, String uId, String product, String deadline, int location){
+    public static Request addRequests(String gId, String uId, String product, Date 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);
@@ -146,7 +146,7 @@
         return null;
     }
 
-    public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){
+    public static Request updateRequest(String gId, String rId, String uId, String product, Date 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 f5080bb..b2c1024 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") String 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") Date 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") String 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") Date 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));