esoko/soko-web
esoko/soko-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

withRelations in methods of PersistentDataManager should contain relation names instead of types

Browse Source
This commit is contained in:
Bence Pőcze 2023-04-30 19:19:00 +02:00
parent 445774e59a
commit ad7ea0de9d
Signed by: bence
GPG Key ID: DC5BD6E95A333E6D
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interfaces/PersistentData/IPersistentDataManager.php
View File

@ -10,9 +10,9 @@ interface IPersistentDataManager
public function selectMultipleFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Generator; public function selectMultipleFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Generator;
public function selectFromDbById($id, string $type, bool $useRelations = false); public function selectFromDbById($id, string $type, bool $useRelations = false, array $withRelations = []);
public function loadRelationsFromDb(Model $model, bool $recursive): void; public function loadRelationsFromDb(Model $model, bool $recursive = false, array $withRelations = []): void;
public function saveToDb(Model $model): void; public function saveToDb(Model $model): void;

27
src/PersistentData/PersistentDataManager.php
View File

@ -50,19 +50,19 @@ class PersistentDataManager implements IPersistentDataManager
} }
} }
public function selectFromDbById($id, string $type, bool $useRelations = false) public function selectFromDbById($id, string $type, bool $useRelations = false, array $withRelations = [])
{ {
$select = new Select($this->dbConnection); $select = new Select($this->dbConnection);
$select->whereId($id); $select->whereId($id);
return $this->selectFromDb($select, $type, $useRelations); return $this->selectFromDb($select, $type, $useRelations, $withRelations);
} }
public function fillWithData(array &$data, Model $model, array $withRelations = [], ?string $modelKey = null): void public function fillWithData(array &$data, Model $model, array $withRelations = [], ?string $modelKey = null): void
{ {
$relations = $model::getRelations(); $relations = $model::getRelations();
if (count($withRelations)) { if (count($withRelations)) {
$relations = array_intersect($relations, $withRelations); $relations = array_intersect_key($relations, array_flip($withRelations));
} }
while (key($data)) { while (key($data)) {
@ -105,9 +105,14 @@ class PersistentDataManager implements IPersistentDataManager
$model->saveSnapshot(); $model->saveSnapshot();
} }
public function loadRelationsFromDb(Model $model, bool $recursive): void public function loadRelationsFromDb(Model $model, bool $recursive = false, array $withRelations = []): void
{ {
foreach ($model::getRelations() as $relation => $relationType) { $relations = $model::getRelations();
if (count($withRelations)) {
$relations = array_intersect_key($relations, array_flip($withRelations));
}
foreach ($relations as $relation => $relationType) {
$camel = str_replace('_', '', ucwords($relation, '_')); $camel = str_replace('_', '', ucwords($relation, '_'));
$methodGet = 'get' . $camel . 'Id'; $methodGet = 'get' . $camel . 'Id';
@ -116,7 +121,7 @@ class PersistentDataManager implements IPersistentDataManager
$relationId = $model->$methodGet(); $relationId = $model->$methodGet();
if ($relationId !== null) { if ($relationId !== null) {
$relationModel = $this->selectFromDbById($relationId, $relationType, $recursive); $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive, $withRelations);
$model->$methodSet($relationModel); $model->$methodSet($relationModel);
} }
@ -187,7 +192,7 @@ class PersistentDataManager implements IPersistentDataManager
if ($useRelations) { if ($useRelations) {
$relations = call_user_func([$type, 'getRelations']); $relations = call_user_func([$type, 'getRelations']);
if (count($withRelations)) { if (count($withRelations)) {
$relations = array_intersect($relations, $withRelations); $relations = array_intersect_key($relations, array_flip($withRelations));
} }
$columns = array_merge($columns, $this->getRelationColumns($relations, $withRelations)); $columns = array_merge($columns, $this->getRelationColumns($relations, $withRelations));
@ -211,11 +216,11 @@ class PersistentDataManager implements IPersistentDataManager
$columns[] = [$relationTable, $relationField, $relation . '__' . $relationField]; $columns[] = [$relationTable, $relationField, $relation . '__' . $relationField];
} }
$nextOrderRelations = call_user_func([$relationType, 'getRelations']); $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
if (count($withRelations)) { if (count($withRelations)) {
$nextOrderRelations = array_intersect($nextOrderRelations, $withRelations); $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
} }
$columns = array_merge($columns, $this->getRelationColumns($nextOrderRelations, $withRelations)); $columns = array_merge($columns, $this->getRelationColumns($relationsOfRelation, $withRelations));
} }
return $columns; return $columns;
@ -229,7 +234,7 @@ class PersistentDataManager implements IPersistentDataManager
$nextOrderRelations = call_user_func([$relationType, 'getRelations']); $nextOrderRelations = call_user_func([$relationType, 'getRelations']);
if (count($withRelations)) { if (count($withRelations)) {
$nextOrderRelations = array_intersect($nextOrderRelations, $withRelations); $nextOrderRelations = array_intersect_key($nextOrderRelations, array_flip($withRelations));
} }
$this->leftJoinRelations($select, $relationTable, $nextOrderRelations, $withRelations); $this->leftJoinRelations($select, $relationTable, $nextOrderRelations, $withRelations);
} }