- Fixed query builder select fields

Author: dash8x

Diff for: src/QueryBuilder.php

@@ -250,18 +250,14 @@ protected function getAllAppends(): array
      */
     protected function addRequestedModelFieldsToQuery()
     {
-        $modelTableName = $this->getSubject()->getModel()->getTable();
-        $prepend_table_name = true;
+        $modelTableName = $this->getModel()->getTable();
 
-        if ($this->request->has('fields')) {
-            $modelFields = $this->request->fields()->get($modelTableName);
+        $fields = $this->request->fields();
 
-            if (!$modelFields) {
-                $modelFields = $this->request->fields()->get(0);
-            }
-        } else {
-            //$prepend_table_name = false;
-            $modelFields = $this->allowedFields->all();
+        $modelFields = $fields->has($modelTableName) ? $fields->get($modelTableName) : $fields->get('_');
+
+        if (empty($modelFields)) {
+            return;
         }
 
         // get all append fields to include
@@ -288,7 +284,7 @@ protected function addRequestedModelFieldsToQuery()
             return;
         }
 
-        $prependedFields = $prepend_table_name ? $this->prependFieldsWithTableName($modelFields, $modelTableName) : $modelFields;
+        $prependedFields = $this->prependFieldsWithTableName($modelFields, $modelTableName);
 
         // get rid of any appended fields present
         $prependedFields = array_diff(

Diff for: tests/Feature/ApiControllerTest.php

@@ -110,4 +110,24 @@ public function it_can_load_api_model_appends(): void
                 'slug' => 'orange',
             ]);
     }
+
+    /** @test */
+    public function it_can_list_only_specific_api_model_fields(): void
+    {
+        $this->withoutExceptionHandling();
+
+        $product = Product::factory()->create([
+            'name' => 'Apple',
+            'slug' => 'orange',
+        ]);
+
+        $this->getJson('/products?fields=id,name&append=')
+            ->assertSuccessful()
+            ->assertJsonFragment([
+                'name' => 'Apple',
+            ])
+            ->assertJsonMissing([
+                'slug' => 'orange',
+            ]);
+    }
 }