fix: batch operations - attempting to fetch entities using query builder with previously applied constraints of other entities

Author: alexzarbn

src/Concerns/HandlesRelationStandardBatchOperations.php

@@ -60,8 +60,6 @@ protected function batchStoreWithTransaction(Request $request, $parentKey)
 
         $requestedRelations = $this->relationsResolver->requestedRelations($request);
 
-        $entityQuery = $this->buildStoreFetchQuery($request, $parentEntity, $requestedRelations);
-
         foreach ($resources as $resource) {
             /** @var Model $entity */
             $entity = new $resourceModelClass;
@@ -77,12 +75,16 @@ protected function batchStoreWithTransaction(Request $request, $parentKey)
                 Arr::get($resource, 'pivot', [])
             );
 
+            $entityQuery = $this->buildStoreFetchQuery(
+                $request, $parentEntity, $requestedRelations
+            );
             $entity = $this->runStoreFetchQuery(
                 $request,
                 $entityQuery,
                 $parentEntity,
                 $entity->{$this->keyName()}
             );
+
             $entity->wasRecentlyCreated = true;
 
             $entity = $this->cleanupEntity($entity);
@@ -198,8 +200,6 @@ protected function batchUpdateWithTransaction(Request $request, $parentKey)
         $query = $this->buildBatchUpdateFetchQuery($request, $parentEntity, $requestedRelations);
         $entities = $this->runBatchUpdateFetchQuery($request, $query, $parentEntity);
 
-        $entityQuery = $this->buildUpdateFetchQuery($request, $parentEntity, $requestedRelations);
-
         foreach ($entities as $entity) {
             /** @var Model $entity */
             $this->authorize($this->resolveAbility('update'), [$entity, $parentEntity]);
@@ -219,6 +219,9 @@ protected function batchUpdateWithTransaction(Request $request, $parentKey)
                 Arr::get($resource, 'pivot', [])
             );
 
+            $entityQuery = $this->buildUpdateFetchQuery(
+                $request, $parentEntity, $requestedRelations
+            );
             $entity = $this->runUpdateFetchQuery(
                 $request, $entityQuery, $parentEntity, $entity->{$this->keyName()}
             );
@@ -400,8 +403,6 @@ protected function batchDestroyWithTransaction(Request $request, $parentKey)
         $query = $this->buildBatchDestroyFetchQuery($request, $parentEntity, $requestedRelations, $softDeletes);
         $entities = $this->runBatchDestroyFetchQuery($request, $query, $parentEntity);
 
-        $entityQuery = $this->buildStoreFetchQuery($request, $parentEntity, $requestedRelations);
-
         foreach ($entities as $entity) {
             /** @var Model $entity */
             $this->authorize($this->resolveAbility($forceDeletes ? 'forceDelete' : 'delete'), [$entity, $parentEntity]);
@@ -412,6 +413,9 @@ protected function batchDestroyWithTransaction(Request $request, $parentKey)
                 $this->performDestroy($entity);
 
                 if ($softDeletes) {
+                    $entityQuery = $this->buildDestroyFetchQuery(
+                        $request, $parentEntity, $requestedRelations, $softDeletes
+                    );
                     $entity = $this->runDestroyFetchQuery(
                         $request, $entityQuery, $parentEntity, $entity->{$this->keyName()}
                     );
@@ -569,8 +573,6 @@ protected function batchRestoreWithTransaction(Request $request, $parentKey)
         $query = $this->buildBatchRestoreFetchQuery($request, $parentEntity, $requestedRelations);
         $entities = $this->runBatchRestoreFetchQuery($request, $query, $parentEntity);
 
-        $entityQuery = $this->buildRestoreFetchQuery($request, $parentEntity, $requestedRelations);
-
         foreach ($entities as $entity) {
             /** @var Model $entity */
             $this->authorize($this->resolveAbility('restore'), [$entity, $parentEntity]);
@@ -579,6 +581,9 @@ protected function batchRestoreWithTransaction(Request $request, $parentKey)
 
             $this->performRestore($entity);
 
+            $entityQuery = $this->buildRestoreFetchQuery(
+                $request, $parentEntity, $requestedRelations
+            );
             $entity = $this->runRestoreFetchQuery(
                 $request, $entityQuery, $parentEntity, $entity->{$this->keyName()}
             );

src/Concerns/HandlesStandardBatchOperations.php

@@ -53,8 +53,6 @@ protected function batchStoreWithTransaction(Request $request)
 
         $requestedRelations = $this->relationsResolver->requestedRelations($request);
 
-        $entityQuery = $this->buildStoreFetchQuery($request, $requestedRelations);
-
         foreach ($resources as $resource) {
             /**
              * @var Model $entity
@@ -68,7 +66,9 @@ protected function batchStoreWithTransaction(Request $request)
 
             $this->beforeStoreFresh($request, $entity);
 
+            $entityQuery = $this->buildStoreFetchQuery($request, $requestedRelations);
             $entity = $this->runStoreFetchQuery($request, $entityQuery, $entity->{$this->keyName()});
+
             $entity->wasRecentlyCreated = true;
 
             $this->afterSave($request, $entity);
@@ -146,8 +146,6 @@ protected function batchUpdateWithTransaction(Request $request)
         $query = $this->buildBatchUpdateFetchQuery($request, $requestedRelations);
         $entities = $this->runBatchUpdateFetchQuery($request, $query);
 
-        $entityQuery = $this->buildUpdateFetchQuery($request, $requestedRelations);
-
         foreach ($entities as $entity) {
             /** @var Model $entity */
             $this->authorize($this->resolveAbility('update'), $entity);
@@ -165,6 +163,7 @@ protected function batchUpdateWithTransaction(Request $request)
 
             $this->beforeUpdateFresh($request, $entity);
 
+            $entityQuery = $this->buildUpdateFetchQuery($request, $requestedRelations);
             $entity = $this->runUpdateFetchQuery($request, $entityQuery, $entity->{$this->keyName()});
 
             $this->afterSave($request, $entity);
@@ -297,8 +296,6 @@ protected function batchDestroyWithTransaction(Request $request)
         $query = $this->buildBatchDestroyFetchQuery($request, $requestedRelations, $softDeletes);
         $entities = $this->runBatchDestroyFetchQuery($request, $query);
 
-        $entityQuery = $this->buildDestroyFetchQuery($request, $requestedRelations, $softDeletes);
-
         foreach ($entities as $entity) {
             /**
              * @var Model $entity
@@ -313,6 +310,7 @@ protected function batchDestroyWithTransaction(Request $request)
                 if ($softDeletes) {
                     $this->beforeDestroyFresh($request, $entity);
 
+                    $entityQuery = $this->buildDestroyFetchQuery($request, $requestedRelations, $softDeletes);
                     $entity = $this->runDestroyFetchQuery($request, $entityQuery, $entity->{$this->keyName()});
                 }
             } else {
@@ -421,8 +419,6 @@ protected function batchRestoreWithTransaction(Request $request)
         $query = $this->buildBatchRestoreFetchQuery($request, $requestedRelations);
         $entities = $this->runBatchRestoreFetchQuery($request, $query);
 
-        $entityQuery = $this->buildRestoreFetchQuery($request, $requestedRelations);
-
         foreach ($entities as $entity) {
             /**
              * @var Model $entity
@@ -435,6 +431,7 @@ protected function batchRestoreWithTransaction(Request $request)
 
             $this->beforeRestoreFresh($request, $entity);
 
+            $entityQuery = $this->buildRestoreFetchQuery($request, $requestedRelations);
             $entity = $this->runRestoreFetchQuery($request, $entityQuery, $entity->{$this->keyName()});
 
             $this->afterRestore($request, $entity);