Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-12 14:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start re-implementing conditional handling

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-13 23:57:42 +01:00
parent 250bb48c9c
commit b1e3eac74c
1 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
DataStorage/Database/DataMapperAbstract.php
View File

@ -363,32 +363,64 @@ class DataMapperAbstract implements DataMapperInterface
/** /**
* Find data. * Find data.
* *
* @param string $search Search for * @param string $search Search for
* @param int $searchDepth Depth of the search * @param int $searchDepth Depth of the search
* @param int $popDepth Population depth * @param Builder $query Query
* *
* @return array * @return array
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function find(string $search, int $searchDepth = 2, int $popDepth = 3) : array public static function find(string $search, int $searchDepth = 2, Builder $query = null) : array
{ {
self::extend(__CLASS__); self::extend(__CLASS__);
$query = self::findQuery($search, $searchDepth, $query);
$query = static::getQuery(); return static::getAllByQuery($query, RelationType::ALL, $searchDepth);
}
foreach (static::$columns as $col) { /**
// @todo also handle conditionals!!! e.g. localization * Find data query.
if (isset($col['autocomplete']) && $col['autocomplete']) { *
$query->where(static::$table . '.' . $col['name'], 'LIKE', '%' . $search . '%', 'OR'); * @param string $search Search for
* @param int $searchDepth Depth of the search
* @param Builder $query Query
*
* @return Builder
*
* @since 1.0.0
*/
public static function findQuery(string $search, int $searchDepth = 2, Builder $query = null) : Builder
{
$query ??= static::getQuery(null, [], RelationType::ALL, $searchDepth);
foreach (self::$conditionals as $condKey => $condValue) {
if (($column = self::getColumnByMember($condKey)) !== null) {
$query->andWhere(static::$table . '_' . $searchDepth . '.' . $column, '=', $condValue);
} }
// @todo 222
// $mapper::findOwnsOne($query, $search);
// $mapper::findHasMany($query, $search);
} }
return static::getAllByQuery($query, RelationType::ALL, $popDepth); foreach (static::$columns as $col) {
if (isset($col['autocomplete']) && $col['autocomplete']) {
$query->where(static::$table . '_' . $searchDepth . '.' . $col['name'], 'LIKE', '%' . $search . '%', 'OR');
}
}
if ($searchDepth > 2) {
foreach (static::$ownsOne as $one) {
$one['mapper']::findQuery($search, $searchDepth - 1, $query);
}
foreach (static::$belongsTo as $belongs) {
$belongs['mapper']::findQuery($search, $searchDepth - 1, $query);
}
foreach (static::$hasMany as $many) {
$many['mapper']::findQuery($search, $searchDepth - 1, $query);
}
}
return $query;
} }
/** /**
@ -2898,6 +2930,12 @@ class DataMapperAbstract implements DataMapperInterface
$query->fromAs(static::$table, static::$table . '_' . $depth); $query->fromAs(static::$table, static::$table . '_' . $depth);
} }
foreach (self::$conditionals as $condKey => $condValue) {
if (($column = self::getColumnByMember($condKey)) !== null) {
$query->andWhere(static::$table . '_' . $depth . '.' . $column, '=', $condValue);
}
}
// get OwnsOneQuery // get OwnsOneQuery
if ($depth > 1 && $relations === RelationType::ALL) { if ($depth > 1 && $relations === RelationType::ALL) {
foreach (static::$ownsOne as $member => $rel) { foreach (static::$ownsOne as $member => $rel) {