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

add conditionals filter for specific models

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-08 22:39:59 +02:00
parent 50743fecf0
commit 2ef8f17eb2
2 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
DataStorage/Database/DataMapperAbstract.php
View File

@ -130,7 +130,7 @@ class DataMapperAbstract implements DataMapperInterface
* *
* Most often used for localizations * Most often used for localizations
* *
* @var array<string, array<string, string>> * @var array<string, array{value:mixed, models:null|string[]}>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $conditionals = []; protected static array $conditionals = [];
@ -291,16 +291,21 @@ class DataMapperAbstract implements DataMapperInterface
/** /**
* Create a conditional value * Create a conditional value
* *
* @param string $id Id of the conditional * @param string $id Id of the conditional
* @param mixed $value Value of the conditional * @param mixed $value Value of the conditional
* @param string[] $models Models to apply the conditional on
* *
* @return static * @return static
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function withConditional(string $id, $value) /** @todo: return : static */ public static function withConditional(string $id, $value, array $models = []) /** @todo: return : static */
{ {
self::$conditionals[$id] = $value; self::$conditionals[$id] = [
'value' => $value,
'models' => empty($models) ? null : $models,
];
return static::class; return static::class;
} }
@ -358,12 +363,18 @@ class DataMapperAbstract implements DataMapperInterface
$where1 = new Where(self::$db); $where1 = new Where(self::$db);
$where2 = new Where(self::$db); $where2 = new Where(self::$db);
$modelName = self::getModelName();
$hasConditionals = false; $hasConditionals = false;
foreach (self::$conditionals as $condKey => $condValue) { foreach (self::$conditionals as $condKey => $condValue) {
if (($column = self::getColumnByMember($condKey)) !== null) { if (($column = self::getColumnByMember($condKey)) === null
$where1->andWhere(static::$table . '_' . $searchDepth . '.' . $column, '=', $condValue); || ($condValue['models'] !== null && !\in_array($modelName, $condValue['models']))
$hasConditionals = true; ) {
continue;
} }
$where1->andWhere(static::$table . '_' . $searchDepth . '.' . $column, '=', $condValue['value']);
$hasConditionals = true;
} }
$hasAutocompletes = false; $hasAutocompletes = false;
@ -2388,7 +2399,7 @@ class DataMapperAbstract implements DataMapperInterface
* @param int $relations Load relations * @param int $relations Load relations
* @param int $depth Relation depth * @param int $depth Relation depth
* *
* @return mixed * @return array
* *
* @since 1.0.0 * @since 1.0.0
*/ */
@ -2398,7 +2409,8 @@ class DataMapperAbstract implements DataMapperInterface
int $limit = 50, int $limit = 50,
string $order = 'ASC', string $order = 'ASC',
int $relations = RelationType::ALL, int $relations = RelationType::ALL,
int $depth = 3) int $depth = 3
) : array
{ {
$query = self::getQuery(); $query = self::getQuery();
$query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '>', $pivot) $query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '>', $pivot)
@ -2418,7 +2430,7 @@ class DataMapperAbstract implements DataMapperInterface
* @param int $relations Load relations * @param int $relations Load relations
* @param int $depth Relation depth * @param int $depth Relation depth
* *
* @return mixed * @return array
* *
* @since 1.0.0 * @since 1.0.0
* *
@ -2432,7 +2444,8 @@ class DataMapperAbstract implements DataMapperInterface
int $limit = 50, int $limit = 50,
string $order = 'ASC', string $order = 'ASC',
int $relations = RelationType::ALL, int $relations = RelationType::ALL,
int $depth = 3) int $depth = 3
) : array
{ {
$query = self::getQuery(); $query = self::getQuery();
$query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '<', $pivot) $query->where(static::$table . '_' . $depth . '.' . ($column !== null ? self::getColumnByMember($column) : static::$primaryField), '<', $pivot)
@ -2975,12 +2988,15 @@ class DataMapperAbstract implements DataMapperInterface
->from($value['table']) ->from($value['table'])
->where($value['table'] . '.' . $value['external'], '=', $primaryKey); ->where($value['table'] . '.' . $value['external'], '=', $primaryKey);
$modelName = $value['mapper']::getModelName();
foreach (self::$conditionals as $condKey => $condValue) { foreach (self::$conditionals as $condKey => $condValue) {
if (($column = $value['mapper']::getColumnByMember($condKey)) === null) { if (($column = $value['mapper']::getColumnByMember($condKey)) === null
|| ($condValue['models'] !== null && !\in_array($modelName, $condValue['models']))
) {
continue; continue;
} }
$query->andWhere($value['table'] . '.' . $column, '=', $condValue); $query->andWhere($value['table'] . '.' . $column, '=', $condValue['value']);
} }
} }
@ -3027,12 +3043,15 @@ class DataMapperAbstract implements DataMapperInterface
} }
// handle conditional // handle conditional
$modelName = self::getModelName();
foreach (self::$conditionals as $condKey => $condValue) { foreach (self::$conditionals as $condKey => $condValue) {
if (($column = self::getColumnByMember($condKey)) === null) { if (($column = self::getColumnByMember($condKey)) === null
|| ($condValue['models'] !== null && !\in_array($modelName, $condValue['models']))
) {
continue; continue;
} }
$query->andWhere(static::$table . '_' . $depth . '.' . $column, '=', $condValue); $query->andWhere(static::$table . '_' . $depth . '.' . $column, '=', $condValue['value']);
} }
// get OwnsOneQuery // get OwnsOneQuery
@ -3331,6 +3350,18 @@ class DataMapperAbstract implements DataMapperInterface
*/ */
return new $class(); return new $class();
} }
/**
* Get model from mapper
*
* @return string
*
* @since 1.0.0
*/
private static function getModelName() : string
{
return empty(static::$model) ? \substr(static::class, 0, -6) : static::$model;
}
} }
/* C0: setup for C1 /* C0: setup for C1

8
Localization/Localization.php
View File

@ -50,7 +50,7 @@ class Localization implements \JsonSerializable
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected string $language = ISO639x1Enum::_EN; protected string $lang = ISO639x1Enum::_EN;
/** /**
* Currency. * Currency.
@ -381,7 +381,7 @@ class Localization implements \JsonSerializable
*/ */
public function getLanguage() : string public function getLanguage() : string
{ {
return $this->language; return $this->lang;
} }
/** /**
@ -403,7 +403,7 @@ class Localization implements \JsonSerializable
throw new InvalidEnumValue($language); throw new InvalidEnumValue($language);
} }
$this->language = $language; $this->lang = $language;
} }
/** /**
@ -769,7 +769,7 @@ class Localization implements \JsonSerializable
'id' => $this->id, 'id' => $this->id,
'country' => $this->country, 'country' => $this->country,
'timezone' => $this->timezone, 'timezone' => $this->timezone,
'language' => $this->language, 'language' => $this->lang,
'currency' => $this->currency, 'currency' => $this->currency,
'currencyformat' => $this->currencyFormat, 'currencyformat' => $this->currencyFormat,
'decimal' => $this->decimal, 'decimal' => $this->decimal,