diff --git a/app/src/main/java/com/example/citrusclient/models/Todo.java b/app/src/main/java/com/example/citrusclient/models/Todo.java
index eb1d9a9..69b4eff 100644
--- a/app/src/main/java/com/example/citrusclient/models/Todo.java
+++ b/app/src/main/java/com/example/citrusclient/models/Todo.java
@@ -2,8 +2,6 @@
 
 public class Todo {
 
-    String accountId;
-    Integer bookId;
     String title;
     boolean check;
     int year;
@@ -11,9 +9,17 @@
     int day;
     Integer todoId;
 
+    //コンストラクタ
+    public Todo(String t, boolean c, int y, int m, int d, Integer tid) {
+        title = t;
+        check = c;
+        year = y;
+        month = m;
+        day = d;
+        todoId = tid;
+    }
+
     //セッター
-    public void setAccountId(String aid) {accountId = aid;}
-    public void setBookId(Integer bid) {bookId = bid;}
     public void setTitle(String t) {title = t;}
     public void setCheck(boolean c) {check = c;}
     public void setYear(int y) {year = y;}
@@ -22,8 +28,6 @@
     public void setTodoId(Integer t) {todoId = t;}
 
     //ゲッター
-    public String getAccountId() {return accountId;}
-    public Integer getBookId(){return bookId;}
     public String getTitle() {return title;}
 
     public boolean getCheck() {return check;}
@@ -37,4 +41,6 @@
     public Integer getTodoId() {
         return todoId;
     }
+
+
 }
diff --git a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java
index 88c6ad8..52f8fab 100644
--- a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java
+++ b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java
@@ -20,14 +20,14 @@
 public interface TodosRest {
 
     @GET("/accounts/{account_id}/books/{book_id}/todos")
-    Call<ArrayList<Todo>> getAllTodos(
+    Call<HashMap<Integer, HashMap<Integer, HashMap<Integer, HashMap<Integer, Todo>>>>> getAllTodos(
             @Path("account_id") String accountId,
             @Path("book_id") Integer bookId,
             @Query("token") String token
     );
 
     @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}")
-    Call<ArrayList<Todo>> getTodosByMonth(
+    Call<HashMap<Integer, HashMap<Integer, Todo>>> getTodosByMonth(
             @Path("account_id") String accountId,
             @Path("book_id") Integer bookId,
             @Path("year") Integer year,
@@ -36,7 +36,7 @@
     );
 
     @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}")
-    Call<ArrayList<Todo>> getTodosByDay(
+    Call<HashMap<Integer, Todo>> getTodosByDay(
             @Path("account_id") String accountId,
             @Path("book_id") Integer bookId,
             @Path("year") Integer year,