diff --git a/src/main/java/org/ntlab/citrusserver/resources/BooksRest.java b/src/main/java/org/ntlab/citrusserver/resources/BooksRest.java index 1a65b7b..2fd6a5c 100644 --- a/src/main/java/org/ntlab/citrusserver/resources/BooksRest.java +++ b/src/main/java/org/ntlab/citrusserver/resources/BooksRest.java @@ -67,7 +67,9 @@ public Book getBook(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @QueryParam("token") String token){ accountCheck(account_id); - tokenCheck(account_id, token); + if (!bookManager.getPublicity(account_id, book_id)){ + tokenCheck(account_id, token); + } return bookManager.getBook(account_id, book_id); } /// 本の削除 diff --git a/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java b/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java index b94a8bc..50bdee9 100644 --- a/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java +++ b/src/main/java/org/ntlab/citrusserver/resources/TodoRest.java @@ -6,6 +6,7 @@ import org.apache.coyote.http11.upgrade.UpgradeServletOutputStream; import org.ntlab.citrusserver.entities.Todo; import org.ntlab.citrusserver.repositories.AccountManager; +import org.ntlab.citrusserver.repositories.BookManager; import org.ntlab.citrusserver.repositories.TodoManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -18,11 +19,13 @@ private final TodoManager todoManager; private final AccountManager accountManager; + private final BookManager bookManager; @Autowired - public TodoRest(TodoManager todoManager, AccountManager accountManager) { + public TodoRest(TodoManager todoManager, AccountManager accountManager, BookManager bookManager) { this.todoManager = todoManager; this.accountManager = accountManager; + this.bookManager = bookManager; } //test用 @@ -39,7 +42,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public HashMap>>> getAllTodos(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @QueryParam("token") String token) { - if (accountManager.checkToken(account_id, token)) { + if (accountManager.checkToken(account_id, token) || bookManager.getPublicity(account_id, book_id)) { return todoManager.getAllTodos(account_id, book_id); } return null; @@ -50,7 +53,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public HashMap> getTodosByMonth(@PathParam("account_id") String account_id, @PathParam("book_id") Integer book_id, @PathParam("year") Integer year, @PathParam("month") Integer month, @QueryParam("token") String token) { - if (accountManager.checkToken(account_id, token)) { + if (accountManager.checkToken(account_id, token) || bookManager.getPublicity(account_id, book_id)) { return todoManager.getTodosByMonth(account_id, book_id, year, month); } return null; @@ -61,7 +64,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public HashMap getTodosByDay(@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) { - if (accountManager.checkToken(account_id, token)) { + if (accountManager.checkToken(account_id, token) || bookManager.getPublicity(account_id, book_id)) { return todoManager.getTodosByDay(account_id, book_id, year, month, day); } return null; @@ -72,7 +75,7 @@ @GET @Produces(MediaType.APPLICATION_JSON) public Todo getTodoById(@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, @QueryParam("token") String token) { - if (accountManager.checkToken(account_id, token)) { + if (accountManager.checkToken(account_id, token) || bookManager.getPublicity(account_id, book_id)) { Todo todo = todoManager.getTodoById(account_id, book_id, year, month, day, todo_id); return todo; }