updated package structure

Author: hamidrezarj

composer.json

@@ -72,13 +72,13 @@
     "extra": {
         "laravel": {
             "providers": [
-                "HamidRrj\\LaravelDatatable\\LaravelDatatableServiceProvider"
+                "HamidRrj\\LaravelDatatable\\DatatableServiceProvider"
             ],
             "aliases": {
-                "LaravelDatatable": "HamidRrj\\LaravelDatatable\\Facades\\LaravelDatatable"
+                "LaravelDatatable": "HamidRrj\\LaravelDatatable\\Facades\\DatatableFacade"
             }
         }
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

config/datatable.php

@@ -1,6 +1,6 @@
 <?php
 
-// config for HamidRrj/LaravelDatatable
+// config for HamidRrj/DatatableFacade
 return [
 
 ];

database/factories/ModelFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace HamidRrj\LaravelDatatable\Database\Factories;
+
+use HamidRrj\LaravelDatatable\Tests\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+
+class UserFactory extends Factory
+{
+    protected $model = User::class;
+
+    public function definition()
+    {
+        return [
+            'name' => $this->faker->name(),
+            'username' => $this->faker->userName(),
+            'email' => $this->faker->email,
+//            'position' => $this->faker->randomElement(['boss']),
+//            'city_id' => City::factory(),
+//            'province_id' => function (array $attributes) {
+//                return City::find($attributes['city_id'])->province_id;
+//            },
+//            'city_name' => function (array $attributes) {
+//                return City::find($attributes['city_id'])->name;
+//            },
+
+        ];
+
+    }
+}
+

database/factories/UserFactory.php

@@ -8,11 +8,11 @@ return new class extends Migration
 {
     public function up()
     {
-        Schema::create('laravel_datatable_table', function (Blueprint $table) {
+        Schema::create('users', function (Blueprint $table) {
             $table->id();
-
-            // add fields
-
+            $table->string('name');
+            $table->string('username')->unique();
+            $table->string('email')->unique();
             $table->timestamps();
         });
     }

…grations/create_datatable_table.php.stub …e/migrations/create_users_table.php.stubdatabase/migrations/create_datatable_table.php.stub renamed to database/migrations/create_users_table.php.stub database/migrations/create_datatable_table.php.stub renamed to database/migrations/create_users_table.php.stub

@@ -5,7 +5,7 @@
 use HamidRrj\LaravelDatatable\Filter\Filter;
 use HamidRrj\LaravelDatatable\Sort\Sort;
 
-class DataTableInput
+class DatatableInput
 {
     /**
      * @param int $start

src/Commands/LaravelDatatableCommand.php

@@ -6,7 +6,7 @@
 use HamidRrj\LaravelDatatable\Sort\ApplySort;
 use Illuminate\Contracts\Database\Query\Builder;
 
-class DataTableService
+class DatatableService
 {
 
     protected array $allowedFilters;
@@ -17,30 +17,30 @@ class DataTableService
 
     public function __construct(
         protected Builder      $query,
-        private DataTableInput $dataTableInput
+        private DatatableInput $dataTableInput
     )
     {
     }
 
-    public function setAllowedFilters(array $allowedFilters): DataTableService
+    public function setAllowedFilters(array $allowedFilters): DatatableService
     {
         $this->allowedFilters = $allowedFilters;
         return $this;
     }
 
-    public function setAllowedRelations(array $allowedRelations): DataTableService
+    public function setAllowedRelations(array $allowedRelations): DatatableService
     {
         $this->allowedRelations = $allowedRelations;
         return $this;
     }
 
-    public function setAllowedSortings(array $allowedSortings): DataTableService
+    public function setAllowedSortings(array $allowedSortings): DatatableService
     {
         $this->allowedSortings = $allowedSortings;
         return $this;
     }
 
-    public function setAllowedSelects(array $allowedSelects): DataTableService
+    public function setAllowedSelects(array $allowedSelects): DatatableService
     {
         $this->allowedSelects = $allowedSelects;
         return $this;

src/DataTableInput.php src/DatatableInput.phpsrc/DataTableInput.php renamed to src/DatatableInput.php

@@ -6,7 +6,7 @@
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class LaravelDatatableServiceProvider extends PackageServiceProvider
+class DatatableServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
@@ -17,9 +17,6 @@ public function configurePackage(Package $package): void
          */
         $package
             ->name('laravel-datatable')
-            ->hasConfigFile()
-            ->hasViews()
-            ->hasMigration('create_laravel-datatable_table')
-            ->hasCommand(LaravelDatatableCommand::class);
+            ->hasConfigFile();
     }
 }

src/DataTableService.php src/DatatableService.phpsrc/DataTableService.php renamed to src/DatatableService.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace HamidRrj\LaravelDatatable\Facades;
+
+use HamidRrj\LaravelDatatable\DatatableInput;
+use HamidRrj\LaravelDatatable\DatatableService;
+use HamidRrj\LaravelDatatable\Exceptions\InvalidParameterInterface;
+use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+
+class Datatable
+{
+    /**
+     * Extracts data from request, passes to datatable service and prepares data for response.
+     * @param Model|Builder $mixed
+     * @param Request $request
+     * @param array $allowedFilters
+     * @param array $allowedRelations
+     * @param array $allowedSortings
+     * @param array $allowedSelects
+     * @return array
+     * @throws InvalidParameterInterface if input parameters are invalid.
+     */
+    public function run(
+        Model|Builder $mixed,
+        Request       $request,
+        array         $allowedFilters = [],
+        array         $allowedRelations = [],
+        array         $allowedSortings = [],
+        array         $allowedSelects = []
+    ): array
+    {
+
+        $filters = json_decode($request->filters);
+        $sorting = json_decode($request->sorting);
+        $rels = $request->rels ?: array();
+
+        $dataTableInput = new DataTableInput(
+            $request->start,
+            $request->size,
+            $filters,
+            $sorting,
+            $rels,
+            $allowedFilters,
+            $allowedSortings
+        );
+
+        $query = $this->makeQueryFromModel($mixed);
+
+        $dataTableService = (new DataTableService($query, $dataTableInput))
+            ->setAllowedFilters($allowedFilters)
+            ->setAllowedRelations($allowedRelations)
+            ->setAllowedSortings($allowedSortings)
+            ->setAllowedSelects($allowedSelects);
+
+        return $dataTableService->getData();
+    }
+
+    protected function makeQueryFromModel(Model|Builder $mixed): Builder
+    {
+        return ($mixed instanceof Model) ? $mixed->query() : $mixed;
+    }
+}