Update QueryBuilder and Eloquent

1. Change create file command
2. Add Custom Query method to Eloquent
3. Add Translatable relations to Eloquent
4. Add Translatable to search methods

Author: yazan-alnugnugh

src/Commands/DataTableCommand.php

@@ -19,7 +19,7 @@ class DataTableCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Create a new Data Grid class' ;
+    protected $description = 'Create a new Data Grid class';
 
     /**
      * Create a new command instance.
@@ -38,36 +38,30 @@ public function __construct()
      */
     public function handle()
     {
-
         $content = "<?php
 
-
 namespace App\DataGrid;
 
-use Yazan\DataTable\DataGrid;
+use Yazan\DataTable\Mysql\Eloquent\Eloquent;
 
-class {$this->argument('name')} extends DataGrid
+class {$this->argument('name')}
 {
-
+    use Eloquent;
     public \$model = \"\";
-
-
 }
 ";
-        if(!File::isDirectory('app/DataGrid')) File::makeDirectory('app/DataGrid');
-
-
-
 
+        if (!File::isDirectory('app/DataGrid')) {
+            File::makeDirectory('app/DataGrid');
+        }
 
-        if(File::exists("app/DataGrid/{$this->argument('name')}.php")){
+        $filePath = "app/DataGrid/{$this->argument('name')}.php";
 
-            $this->error('this file is exist');
-        }else{
-            File::put("app/DataGrid/{$this->argument('name')}.php", $content);
+        if (File::exists($filePath)) {
+            $this->error('This file already exists: ' . $filePath);
+        } else {
+            File::put($filePath, $content);
+            $this->info('File created successfully: ' . $filePath);
         }
-//
-
-//        return 'hello';
     }
 }

src/Mysql/Eloquent/Search.php

@@ -62,4 +62,22 @@ public function translatable($columns)
 
     }
 
+    public function translatableRelations($relations)
+    {
+
+        $search = $this->request->search;
+        foreach ($relations as $relation => $columns):
+
+                $this->model->orWhereHas($relation, function ($query) use ($columns, $search) {
+
+                    foreach ($columns as $column):
+                        $query->whereTranslation( $column, $search);
+                    endforeach;
+
+                });
+
+        endforeach;
+
+    }
+
 }

src/Mysql/Eloquent/Select.php

@@ -37,6 +37,12 @@ public function normal($select)
 
     }
 
+    public function translatable($select)
+    {
+        $this->model->whereTranslation($select['searchColumn'] ?? 'id', $select['value']);
+
+    }
+
     public function relational($select)
     {
 
@@ -50,13 +56,7 @@ public function relational($select)
 
     }
 
-    public function translatable($select)
-    {
-        $this->model->whereTranslation($select['searchColumn'] ?? 'id', $select['value']);
-
-    }
-
-    public function relationalTranslatable($select)
+    public function translatableRelations($select)
     {
 
         $this->model->WhereHas($select['relation'], function ($query) use ($select) {

src/Mysql/QueryBuilder/Helper.php

@@ -11,6 +11,11 @@ public function isMapping()
         return method_exists($this, 'reMapping');
     }
 
+    public function isCustomQuery()
+    {
+        return method_exists($this, 'setCustomQuery');
+    }
+
     public function resultHandling()
     {
         return $this->isMapping() ?$this->model : $this->model->toArray();

src/Mysql/QueryBuilder/QueryBuilder.php

@@ -46,7 +46,7 @@ protected function join(){
         if(isset($this->join) && count($this->join))
 
         foreach ($this->join as $key => $value):
-            $this->model->join($key, ...$value);
+            $this->model->leftJoin($key, ...$value);
         endforeach;
 
     }
@@ -107,6 +107,11 @@ protected function paginate()
         return $this->model = $this->model->paginate($this->request->perPage);
 
     }
+
+    protected function runCustomQuery(callable $callback)
+    {
+        $callback($this->model);
+    }
     protected function mapping(callable $callback)
     {
         $this->model = $this->model->toArray();
@@ -130,14 +135,14 @@ protected function mapping(callable $callback)
     public function render()
     {
 
-        $this->create();
+        $this->create(); 
         $this->columns();
         $this->join();
         $this->search();
         $this->select();
+        if($this->isCustomQuery()) $this->setCustomQuery();
         $this->orderBy();
         $this->paginate();
-
         if($this->isMapping()) $this->reMapping();
 
 

src/Mysql/QueryBuilder/Select.php

@@ -37,6 +37,12 @@ public function normal($select)
 
     }
 
+    public function translatable($select)
+    {
+        $this->model->where($select['searchColumn'], $select['value']);
+
+    }
+
     public function relational($select)
     {
 
@@ -46,9 +52,14 @@ public function relational($select)
 
     }
 
-    public function translatable($select)
+    public function translatableRelations($select)
     {
-        $this->model->where($select['searchColumn'], $select['value']);
+
+        $this->model->WhereHas($select['relation'], function ($query) use ($select) {
+
+            $query->whereTranslation($select['searchColumn'] ?? 'id', $select['value']);
+
+         });
 
     }