ZIP Imports: Added API examples, finished testing

[bookstack] / app / Entities / Controllers / BookController.php

diff --git a/app/Entities/Controllers/BookController.php b/app/Entities/Controllers/BookController.php
index a1c586f47e7ce9fca429fca433f1e41de07872f2..5d3d67f645c36afbf66599a7cabd0558096835b3 100644 (file)
--- a/app/Entities/Controllers/BookController.php
+++ b/app/Entities/Controllers/BookController.php
@@ -18,6 +18,7 @@ use BookStack\Exceptions\NotFoundException;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;
 use BookStack\Facades\Activity;
 use BookStack\Http\Controller;
 use BookStack\References\ReferenceFetcher;

+use BookStack\Util\DatabaseTransaction;

 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use BookStack\Util\SimpleListOptions;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;


@@ -70,7 +71,7 @@ class BookController extends Controller
     /**
      * Show the form for creating a new book.
      */
     /**
      * Show the form for creating a new book.
      */

-    public function create(string $shelfSlug = null)
+    public function create(?string $shelfSlug = null)

     {
         $this->checkPermission('book-create-all');
 
     {
         $this->checkPermission('book-create-all');
 


@@ -93,7 +94,7 @@ class BookController extends Controller
      * @throws ImageUploadException
      * @throws ValidationException
      */
      * @throws ImageUploadException
      * @throws ValidationException
      */

-    public function store(Request $request, string $shelfSlug = null)
+    public function store(Request $request, ?string $shelfSlug = null)

     {
         $this->checkPermission('book-create-all');
         $validated = $this->validate($request, [
     {
         $this->checkPermission('book-create-all');
         $validated = $this->validate($request, [


@@ -263,7 +264,9 @@ class BookController extends Controller
         $this->checkPermission('bookshelf-create-all');
         $this->checkPermission('book-create-all');
 
         $this->checkPermission('bookshelf-create-all');
         $this->checkPermission('book-create-all');
 

-        $shelf = $transformer->transformBookToShelf($book);
+        $shelf = (new DatabaseTransaction(function () use ($book, $transformer) {
+            return $transformer->transformBookToShelf($book);
+        }))->run();

 
         return redirect($shelf->getUrl());
     }
 
         return redirect($shelf->getUrl());
     }