Merge pull request #108 from ThanhSonITNIC/master

fix AggregateFilterable
Lomkit · Feb 22, 2024 · cc1271c · cc1271c
2 parents 460a3d2 + b2142b0
commit cc1271c
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 6 deletions.
diff --git a/src/Rules/AggregateFilterable.php b/src/Rules/AggregateFilterable.php
@@ -63,14 +63,16 @@ public function resource($resource)
      */
     protected function buildValidationRules($attribute, $value)
     {
-        if (is_null($this->resource)) {
+        $aggregateResource = $this->resource->relation($value['relation'])?->resource();
+
+        if (is_null($aggregateResource)) {
             return [];
         }
 
         return (new SearchRules($this->resource, app()->make(RestRequest::class), false))
             ->filtersRules(
-                $this->resource,
-                $attribute
+                $aggregateResource,
+                $attribute.'.filters'
             );
     }
 

diff --git a/src/Rules/IsNestedField.php b/src/Rules/IsNestedField.php
@@ -43,4 +43,9 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
             $fail('The '.$attribute.' field is not valid.');
         }
     }
+
+    public function __toString()
+    {
+        return 'nested_field';
+    }
 }
diff --git a/src/Rules/SearchRules.php b/src/Rules/SearchRules.php
@@ -297,8 +297,6 @@ protected function aggregatesRules(\Lomkit\Rest\Http\Resource $resource, string
             $prefix.'.*' => [
                 AggregateField::make()
                     ->resource($resource),
-            ],
-            $prefix.'.*.filters' => [
                 AggregateFilterable::make()
                     ->resource($resource),
             ],

diff --git a/tests/Feature/Controllers/SearchAggregatesOperationsTest.php b/tests/Feature/Controllers/SearchAggregatesOperationsTest.php
@@ -603,6 +603,54 @@ public function test_getting_a_list_of_resources_aggregating_by_sum_number_with_
         );
     }
 
+    public function test_getting_a_list_of_resources_aggregating_by_sum_number_with_other_number_filter(): void
+    {
+        $matchingModel = ModelFactory::new()
+            ->has(
+                BelongsToManyRelationFactory::new()
+                    ->count(20)
+            )
+            ->create()->fresh();
+        $matchingModel2 = ModelFactory::new()
+            ->has(
+                BelongsToManyRelationFactory::new()
+                    ->count(20)
+            )
+            ->create()->fresh();
+
+        Gate::policy(Model::class, GreenPolicy::class);
+        Gate::policy(BelongsToManyRelation::class, GreenPolicy::class);
+
+        $response = $this->post(
+            '/api/models/search',
+            [
+                'search' => [
+                    'aggregates' => [
+                        [
+                            'relation' => 'belongsToManyRelation',
+                            'type'     => 'sum',
+                            'field'    => 'number',
+                            'filters'  => [
+                                ['field' => 'other_number', 'operator' => '<', 'value' => 200],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            ['Accept' => 'application/json']
+        );
+
+        $this->assertResourcePaginated(
+            $response,
+            [$matchingModel, $matchingModel2],
+            new ModelResource(),
+            [
+                ['belongs_to_many_relation_sum_number' => $matchingModel->belongsToManyRelation()->orderBy('belongs_to_many_relations.number', 'desc')->where('belongs_to_many_relations.other_number', '<', 200)->sum('belongs_to_many_relations.number')],
+                ['belongs_to_many_relation_sum_number' => $matchingModel2->belongsToManyRelation()->orderBy('belongs_to_many_relations.number', 'desc')->where('belongs_to_many_relations.other_number', '<', 200)->sum('belongs_to_many_relations.number')],
+            ]
+        );
+    }
+
     public function test_getting_a_list_of_resources_aggregating_by_count_with_filters(): void
     {
         $matchingModel = ModelFactory::new()

diff --git a/tests/Support/Database/Factories/BelongsToManyRelationFactory.php b/tests/Support/Database/Factories/BelongsToManyRelationFactory.php
@@ -22,7 +22,8 @@ class BelongsToManyRelationFactory extends Factory
     public function definition()
     {
         return [
-            'number' => fake()->numberBetween(-5000, 5000),
+            'number'       => fake()->numberBetween(-5000, 5000),
+            'other_number' => fake()->numberBetween(-5000, 5000),
         ];
     }
 }
diff --git a/.../Support/Database/migrations/2023_02_00_000000_create_belongs_to_many_relations_table.php b/.../Support/Database/migrations/2023_02_00_000000_create_belongs_to_many_relations_table.php
@@ -15,6 +15,7 @@ public function up()
         Schema::create('belongs_to_many_relations', function (Blueprint $table) {
             $table->id();
             $table->integer('number')->default(0);
+            $table->integer('other_number')->default(0);
             $table->timestamps();
         });
     }

diff --git a/tests/Support/Rest/Resources/BelongsToManyResource.php b/tests/Support/Rest/Resources/BelongsToManyResource.php
@@ -26,6 +26,7 @@ public function fields(RestRequest $request): array
         return [
             'id',
             'number',
+            'other_number',
         ];
     }
 }