Merge branch 'main' into create-bookCreate

NaviBook · Feb 3, 2023 · 38205d6 · 38205d6
2 parents 2f6fa79 + 9c90f7e
commit 38205d6
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/java/KNU/Navibook/server/controller/BookInfoController.java b/src/main/java/KNU/Navibook/server/controller/BookInfoController.java
@@ -16,19 +16,18 @@ public class BookInfoController {
     BookInfoService bookInfoService;
     @GetMapping("")
     @ResponseBody
-    public List<BookInfo> returnBookInfoAll(){
-        return bookInfoService.findAll();
+    public Object returnBookInfoAll(@RequestParam(value="bookInfoId", required=false) Long id){
+        if(id==null)
+            return bookInfoService.findAll();
+        else
+            return bookInfoService.findOne(id);
     }
+
     @GetMapping("/{bookName}")
     @ResponseBody
     public List<BookInfo> returnBookInfo(@PathVariable("bookName") String name){
         return bookInfoService.findByBookNameContaining(name);
     }
-    @GetMapping("")
-    @ResponseBody
-    public BookInfo returnBookInfoById(@RequestParam(value="bookInfoId") Long id){
-        return bookInfoService.findOne(id);
-    }
 
     @GetMapping("/random/{count}")
     @ResponseBody