Fix accidental formatter issue on eloquent

Add formatColumn test for eloquent

Author: yajra

src/Processors/DataProcessor.php

@@ -143,6 +143,7 @@ protected function addColumns(array $data, $row): array
             if ($content instanceof Formatter) {
                 $column = str_replace('_formatted', '', $value['name']);
 
+                $value['content'] = $content->format($data[$column], $row);
                 if (isset($data[$column])) {
                     $value['content'] = $content->format($data[$column], $row);
                 }

tests/Formatters/DateFormatter.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Yajra\DataTables\Tests\Formatters;
+
+use Carbon\Carbon;
+use DateTime;
+use Yajra\DataTables\Contracts\Formatter;
+
+class DateFormatter implements Formatter
+{
+    public string $format;
+
+    public function __construct(string $format = 'Y-m-d h:i a')
+    {
+        $this->format = $format;
+    }
+
+    public function format($value, $row): string
+    {
+        if ($value instanceof DateTime) {
+            return $value->format($this->format);
+        }
+
+        return $value ? Carbon::parse($value)->format($this->format) : '';
+    }
+}

tests/Integration/EloquentDataTableTest.php

@@ -2,11 +2,13 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
 use Yajra\DataTables\DataTables;
 use Yajra\DataTables\EloquentDataTable;
 use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
+use Yajra\DataTables\Tests\Formatters\DateFormatter;
 use Yajra\DataTables\Tests\Models\Post;
 use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\Tests\TestCase;
@@ -20,8 +22,8 @@ public function it_returns_all_records_when_no_parameters_is_passed()
     {
         $crawler = $this->call('GET', '/eloquent/users');
         $crawler->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 20,
         ]);
     }
@@ -34,12 +36,12 @@ public function it_can_perform_global_search()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'email', 'name' => 'email', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'search'  => ['value' => 'Record-19'],
+            'search' => ['value' => 'Record-19'],
         ]);
 
         $crawler->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 1,
         ]);
     }
@@ -99,18 +101,45 @@ public function it_returns_only_the_selected_columns_with_dotted_notation()
         $this->assertArrayHasKey('name', $json['data'][0]['user']);
     }
 
+    /** @test */
+    public function it_can_return_formatted_columns()
+    {
+        $crawler = $this->call('GET', '/eloquent/formatColumn');
+
+        $crawler->assertJson([
+            'draw' => 0,
+            'recordsTotal' => 20,
+            'recordsFiltered' => 20,
+        ]);
+
+        $user = User::find(1);
+        $data = $crawler->json('data')[0];
+
+        $this->assertTrue(isset($data['created_at']));
+        $this->assertTrue(isset($data['created_at_formatted']));
+
+        $this->assertEquals(Carbon::parse($user->created_at)->format('Y-m-d'), $data['created_at_formatted']);
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->app['router']->get('/eloquent/users', function (DataTables $datatables) {
+        $router = $this->app['router'];
+        $router->get('/eloquent/users', function (DataTables $datatables) {
             return $datatables->eloquent(User::query())->toJson();
         });
 
-        $this->app['router']->get('/eloquent/only', function (DataTables $datatables) {
+        $router->get('/eloquent/only', function (DataTables $datatables) {
             return $datatables->eloquent(Post::with('user'))
                               ->only(['title', 'user.name'])
                               ->toJson();
         });
+
+        $router->get('/eloquent/formatColumn', function (DataTables $dataTable) {
+            return $dataTable->eloquent(User::query())
+                             ->formatColumn('created_at', new DateFormatter('Y-m-d'))
+                             ->toJson();
+        });
     }
 }

tests/Integration/QueryDataTableTest.php

@@ -7,10 +7,10 @@
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
-use Yajra\DataTables\Contracts\Formatter;
 use Yajra\DataTables\DataTables;
 use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
 use Yajra\DataTables\QueryDataTable;
+use Yajra\DataTables\Tests\Formatters\DateFormatter;
 use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\Tests\TestCase;
 
@@ -453,22 +453,3 @@ protected function setUp(): void
         });
     }
 }
-
-class DateFormatter implements Formatter
-{
-    protected ?string $format;
-
-    public function __construct(string $format = null)
-    {
-        $this->format = $format;
-    }
-
-    public function format($value, $row)
-    {
-        if ($this->format) {
-            return Carbon::parse($value)->format($this->format);
-        }
-
-        return Carbon::parse($value)->diffForHumans();
-    }
-}