cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-22 14:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert changes for join table

Browse Source
This commit is contained in:
omair saleh
2021-09-14 12:32:18 +08:00
parent a7c6c29c25
commit 41554be892
2 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/Eloquent/AbstractGetRecord.php
+3 -15
View File
@@ -12,8 +12,6 @@ abstract class AbstractGetRecord
/** @var array */
private const DECORATION_FILTERS = ['per_page', 'order_by'];
private const JOIN_FILTERS = ['joins'];
/** @var Collection */
private $filters;
@@ -22,7 +20,7 @@ abstract class AbstractGetRecord
* @return Collection
*/
private function getQueryFilters(){
return $this->filters->except(array_merge(self::DECORATION_FILTERS, self::JOIN_FILTERS));
return $this->filters->except(self::DECORATION_FILTERS);
}
/**
@@ -32,10 +30,6 @@ abstract class AbstractGetRecord
return $this->filters->only(self::DECORATION_FILTERS);
}
public function getJoinFilters(){
return $this->filters->only(self::JOIN_FILTERS);
}
/**
* @param null|string $json
* @return array
@@ -49,13 +43,7 @@ abstract class AbstractGetRecord
*/
private function applyFiltersToQuery(): Builder
{
$table = $this->getRepository()->getModel()->getTable();
$a = $this->getQueryFilters()->toArray();
$r=[];
array_walk($a, function ($v, $k) use ($table, &$r) { $r[$table.".".$k]=$v; });
return (new ApplyFiltersToQuery())->execute($this->getRepository(), $r);
return (new ApplyFiltersToQuery())->execute($this->getRepository(), $this->getQueryFilters()->toArray());
}
/**
@@ -79,4 +67,4 @@ abstract class AbstractGetRecord
*/
abstract function getResults(Builder $query);
}
}
app/Classes/General/Eloquent/AbstractListRecord.php
+1 -28
View File
@@ -6,7 +6,6 @@ namespace App\Classes\General\Eloquent;
use App\Classes\Exceptions\MalformedRequestException;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Schema;
abstract class AbstractListRecord extends AbstractGetRecord
{
@@ -34,36 +33,10 @@ abstract class AbstractListRecord extends AbstractGetRecord
* @return mixed
*/
public function getResults(Builder $query) {
$filters = $this->getJoinFilters();
$table = $query->getModel()->getTable();
$selects = [];
$selects[] = $table.".*,";
if($filters->has('joins')){
foreach($filters->get('joins') as $join){
$join_table = $join->table;
$columns = Schema::getColumnListing($join_table);
$r=[];
array_walk($columns, function ($v, $k) use ($join_table, &$r) { $r[] = $join_table.".".$v." ".$join_table."_".$v; });
$selects[] = implode(",",$r);
$query = $query->join($join->table, function($q) use($join, $query) {
$q->on($query->getModel()->getTable().'.id', '=', $join->table.'.owner_id');
});
};
$query = $query->selectRaw(implode("",$selects));
}
$filters = $this->getDecorationFilters();
if($filters->has('order_by')){
$orderByTable = (strpos($filters->get('order_by')->column,".")===false) ? $query->getModel()->getTable()."." : "";
$query = $query->orderBy($orderByTable.$filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
$query = $query->orderBy($filters->get('order_by')->column, $filters->get('order_by')->DESC ? 'DESC': 'ASC');
}
return $filters->has('per_page') ? $query->paginate($filters->get('per_page')) : $query->get();