diff --git a/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java b/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java index 008907d..5990081 100644 --- a/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java +++ b/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java @@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.HashMap; + @Path("/accounts") @Component public class TodoRest { @@ -19,7 +21,7 @@ this.todoManager = todoManager; todoManager = tm; } - + //test用 @Path("/TodoTest") @GET @Produces(MediaType.TEXT_PLAIN) @@ -32,9 +34,9 @@ @Path("/{account_id}/books/{book_id}/todos") @GET @Produces(MediaType.APPLICATION_JSON) - public Todo getName(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @QueryParam("token") Integer token) { - Todo todo = todoManager.getAllTodos(account_id, book_id, token); - return todo;//account部分のリスト名要変更 + public HashMap>>> getName(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @QueryParam("token") String token) { + return todoManager.getAllTodos(account_id, book_id, token); + //account部分のリスト名要変更 //ドット部分以降打合せ(相手の関数名に合わせる) } @@ -43,18 +45,17 @@ @Path("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}") @GET @Produces(MediaType.APPLICATION_JSON) - public Todo getTodoMonth(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @QueryParam("token") String token) { - Todo todo = todoManager.getTodosByMonth(account_id, book_id, year, month,token); - return todo; + public HashMap getTodoMonth(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @QueryParam("token") String token) { + return todoManager.getTodosByMonth(account_id, book_id, year, month,token); } //指定された本の指定された年と月と日のtodoをすべて返す @Path("/{account_id}/books/{book_id}/todos/{year}/{month}/{day}") @GET @Produces(MediaType.APPLICATION_JSON) - public Todo getTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day, @QueryParam("token") String token) { - Todo todo = todoManager.getTodosByDay(account_id, book_id, year, month, day, token); - return todo; + public HashMap getTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day, @QueryParam("token") String token) { + return todoManager.getTodosByDay(account_id, book_id, year, month, day, token); + } //本のtodoを年月日とtodo_idを指定してtodoを一つ返す @@ -70,9 +71,9 @@ @POST @Path("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - public Todo putTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day, @QueryParam("token") String token) { - Todo todo = todoManager.createTodo(account_id, book_id, year, month, day, token); - return todo; + public void putTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day, @FormParam("title") String title,@QueryParam("token") String token) { + todoManager.createTodo(account_id, book_id, year, month, day, title,token); + } //todoを選んで達成状態を変更する @@ -80,11 +81,13 @@ @PUT @Path("/accounts/{account_id}/books/{book_id}/todos/{year}/{month}/{day}/{todo_id}/check") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - public Todo putTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day,@PathParam("todo_id") Integer todo_id, @FormParam("check") boolean check){ - Todo todo = todoManager.setCheck(account_id, book_id, year, month, day, todo_id,check); - return todo; + public void putTodo(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @PathParam("day") Integer day,@PathParam("todo_id") Integer todo_id, @FormParam("check") boolean check, @QueryParam("token") String token){ + todoManager.setCheck(account_id, book_id, year, month, day, todo_id,check,token); } + //delete追加必要 + +