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 dcb5509..eb1d9a9 100644 --- a/app/src/main/java/com/example/citrusclient/models/Todo.java +++ b/app/src/main/java/com/example/citrusclient/models/Todo.java @@ -1,10 +1,40 @@ package com.example.citrusclient.models; public class Todo { + + String accountId; + Integer bookId; String title; boolean check; int year; int month; int day; Integer todoId; + + //セッター + 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;} + public void setMonth(int m) {month = m;} + public void setDay(int d) {day = d;} + 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;} + + public int getYear() {return year;} + + public int getMonth() {return month;} + + public int getDay() {return day;} + + 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 42a1eed..2e7cf82 100644 --- a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java @@ -1,7 +1,11 @@ package com.example.citrusclient.rest; +import com.example.citrusclient.models.Todo; + +import java.util.ArrayList; import java.util.HashMap; + import retrofit2.Call; import retrofit2.Response; import retrofit2.http.DELETE; @@ -15,15 +19,15 @@ public interface TodosRest { - @GET - Call getAllTodos( + @GET("/accounts/{account_id}/books/{book_id}/todos") + Call> getAllTodos( @Path("account_id") String accountId, @Path("book_id") String bookId, @Query("token") String token ); - @GET - Call getTodosByMonth( + @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}") + Call> getTodosByMonth( @Path("account_id") String accountId, @Path("book_id") String bookId, @Path("year") Integer year, @@ -31,8 +35,8 @@ @Query("token") String token ); - @GET - Call getTodosByDay( + @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}") + Call> getTodosByDay( @Path("account_id") String accountId, @Path("book_id") String bookId, @Path("year") Integer year, @@ -41,8 +45,8 @@ @Query("token") String token ); - @GET - Call getTodoById( + @GET("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}/{todo_id}") + Call getTodoById( @Path("account_id") String accountId, @Path("book_id") String bookId, @Path("year") Integer year, @@ -53,8 +57,8 @@ ); @FormUrlEncoded - @POST - Call createTodo( + @POST("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}") + Call createTodo( @Path("account_id") String accountId, @Path("book_id") String bookId, @Path("year") Integer year, @@ -64,7 +68,7 @@ @Field("token") String token ); @FormUrlEncoded - @PUT + @PUT("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}/{todo_id}/check") Call setCheck( @Path("account_id") String accountId, @Path("book_id") String bookId, @@ -76,7 +80,7 @@ @Field("token") String token ); - @DELETE + @DELETE("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}/{todo_id}") Call deleteTodoById( @Path("account_id") String accountId, @Path("book_id") String bookId,