System CLI: Updated to 126de5599c state

[bookstack] / app / Permissions / JointPermissionBuilder.php

diff --git a/app/Permissions/JointPermissionBuilder.php b/app/Permissions/JointPermissionBuilder.php
index 945909631b7312934fb8f00ec3c91e0eae82aa91..c2922cdc9611481b1ba58a64d968f6e9d6dd18a8 100644 (file)
--- a/app/Permissions/JointPermissionBuilder.php
+++ b/app/Permissions/JointPermissionBuilder.php
@@ -4,10 +4,10 @@ namespace BookStack\Permissions;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\BookChild;

-use BookStack\Entities\Models\Bookshelf;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Page;

+use BookStack\Entities\Queries\EntityQueries;

 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Builder;
 use BookStack\Permissions\Models\JointPermission;
 use BookStack\Users\Models\Role;
 use Illuminate\Database\Eloquent\Builder;


@@ -20,6 +20,12 @@ use Illuminate\Support\Facades\DB;
  */
 class JointPermissionBuilder
 {
  */
 class JointPermissionBuilder
 {

+    public function __construct(
+        protected EntityQueries $queries,
+    ) {
+    }
+
+

     /**
      * Re-generate all entity permission from scratch.
      */
     /**
      * Re-generate all entity permission from scratch.
      */


@@ -36,7 +42,7 @@ class JointPermissionBuilder
         });
 
         // Chunk through all bookshelves
         });
 
         // Chunk through all bookshelves

-        Bookshelf::query()->withTrashed()->select(['id', 'owned_by'])
+        $this->queries->shelves->start()->withTrashed()->select(['id', 'owned_by'])

             ->chunk(50, function (EloquentCollection $shelves) use ($roles) {
                 $this->createManyJointPermissions($shelves->all(), $roles);
             });
             ->chunk(50, function (EloquentCollection $shelves) use ($roles) {
                 $this->createManyJointPermissions($shelves->all(), $roles);
             });


@@ -83,13 +89,13 @@ class JointPermissionBuilder
         $role->load('permissions');
 
         // Chunk through all books
         $role->load('permissions');
 
         // Chunk through all books

-        $this->bookFetchQuery()->chunk(20, function ($books) use ($roles) {
+        $this->bookFetchQuery()->chunk(10, function ($books) use ($roles) {

             $this->buildJointPermissionsForBooks($books, $roles);
         });
 
         // Chunk through all bookshelves
             $this->buildJointPermissionsForBooks($books, $roles);
         });
 
         // Chunk through all bookshelves

-        Bookshelf::query()->select(['id', 'owned_by'])
-            ->chunk(50, function ($shelves) use ($roles) {
+        $this->queries->shelves->start()->select(['id', 'owned_by'])
+            ->chunk(100, function ($shelves) use ($roles) {

                 $this->createManyJointPermissions($shelves->all(), $roles);
             });
     }
                 $this->createManyJointPermissions($shelves->all(), $roles);
             });
     }


@@ -99,7 +105,7 @@ class JointPermissionBuilder
      */
     protected function bookFetchQuery(): Builder
     {
      */
     protected function bookFetchQuery(): Builder
     {

-        return Book::query()->withTrashed()
+        return $this->queries->books->start()->withTrashed()

             ->select(['id', 'owned_by'])->with([
                 'chapters' => function ($query) {
                     $query->withTrashed()->select(['id', 'owned_by', 'book_id']);
             ->select(['id', 'owned_by'])->with([
                 'chapters' => function ($query) {
                     $query->withTrashed()->select(['id', 'owned_by', 'book_id']);