wip

Author: binaryk

docs/docs/3.0/repository-pattern/repository-pattern.md

@@ -671,19 +671,6 @@ As the store bulk, the update bulk uses DB transaction to perform the action. So
 ->updateBulkRules('required', Rule::in('posts:id'))
 ```
 
-Sometimes you may need to know the current row in `fieldsForStoreBulk` for some complex validations, this will be passed for bulk update and store:
-
-```php
-public function fieldsForStoreBulk(RestifyRequest $request, int $bulkRow)
-{
-return [
-    Field::new()->rules(Rule::unique('users')->where(function ($query) use ($request, $bulkRow) {
-                            return $query->where('account_id', data_get($request->all(), $bulkRow . '.account_id'));
-                        }))
-];
-}
-```
-
 ### Bulk Payload
 
 The payload for a bulk update should contain an array of objects. Each object SHOULD contain an `id` key, based on this, the Laravel Restify will find the entity: 

src/Repositories/Repository.php

@@ -235,10 +235,9 @@ public function filters(RestifyRequest $request)
 
     /**
      * @param RestifyRequest $request
-     * @param int|null $bulkRow
      * @return FieldCollection
      */
-    public function collectFields(RestifyRequest $request, int $bulkRow = null)
+    public function collectFields(RestifyRequest $request)
     {
         $method = 'fields';
 
@@ -266,7 +265,7 @@ public function collectFields(RestifyRequest $request, int $bulkRow = null)
             $method = 'fieldsForUpdateBulk';
         }
 
-        $fields = FieldCollection::make(array_values($this->filter($this->{$method}($request, $bulkRow))));
+        $fields = FieldCollection::make(array_values($this->filter($this->{$method}($request))));
 
         if ($this instanceof Mergeable) {
             $fillable = collect($this->resource->getFillable())
@@ -300,9 +299,9 @@ private function updateFields(RestifyRequest $request)
             ->authorizedUpdate($request);
     }
 
-    private function updateBulkFields(RestifyRequest $request, int $bulkRow)
+    private function updateBulkFields(RestifyRequest $request)
     {
-        return $this->collectFields($request, $bulkRow)
+        return $this->collectFields($request)
             ->forUpdateBulk($request, $this)
             ->authorizedUpdateBulk($request);
     }
@@ -314,9 +313,9 @@ private function storeFields(RestifyRequest $request)
             ->authorizedStore($request);
     }
 
-    private function storeBulkFields(RestifyRequest $request, int $bulkRow)
+    private function storeBulkFields(RestifyRequest $request)
     {
-        return $this->collectFields($request, $bulkRow)
+        return $this->collectFields($request)
             ->forStoreBulk($request, $this)
             ->authorizedStore($request);
     }
@@ -621,17 +620,13 @@ public function storeBulk(RepositoryStoreBulkRequest $request)
                 ->map(function (array $input, $row) use ($request) {
                     $this->resource = static::newModel();
 
-                    $request->merge([
-                        'bulk_row' => $row,
-                    ]);
-
                     static::fillBulkFields(
-                        $request, $this->resource, $this->storeBulkFields($request, $row), $row
+                        $request, $this->resource, $this->storeBulkFields($request), $row
                     );
 
                     $this->resource->save();
 
-                    $this->storeBulkFields($request, $row)->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));
+                    $this->storeBulkFields($request)->each(fn (Field $field) => $field->invokeAfter($request, $this->resource));
 
                     return $this->resource;
                 });
@@ -662,7 +657,7 @@ public function update(RestifyRequest $request, $repositoryId)
 
     public function updateBulk(RestifyRequest $request, $repositoryId, int $row)
     {
-        $fields = $this->updateBulkFields($request, $row);
+        $fields = $this->updateBulkFields($request);
 
         static::fillBulkFields($request, $this->resource, $fields, $row);
 
@@ -739,11 +734,11 @@ public function allowToStore(RestifyRequest $request, $payload = null): self
         return $this;
     }
 
-    public function allowToBulkStore(RestifyRequest $request, $payload = null): self
+    public function allowToBulkStore(RestifyRequest $request, $payload = null, $row = null): self
     {
         static::authorizeToStoreBulk($request);
 
-        $validator = static::validatorForStoringBulk($request, $payload);
+        $validator = static::validatorForStoringBulk($request, $payload, $row);
 
         $validator->validate();
 

tests/Controllers/RepositoryStoreBulkControllerTest.php

@@ -22,6 +22,7 @@ public function test_basic_validation_works()
                 'title' => null,
             ],
         ])
+            ->dump()
             ->assertStatus(400)
             ->assertJson([
                 'errors' => [