mcndave/ulmus
1
0 Fork 0
Code Issues 15 Pull Requests Projects 1 Releases Wiki Activity

- Added support for Ignore attribute in dataset export of EntityTrait

Browse Source 
- Work done on JSONification of entity
This commit is contained in:
mcndave committed 2023-11-17 22:40:21 -05:00
1 parent 7f8780d328
commit 3a80fee9c3
5 files changed
+60 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/EntityTrait.php
+32 -18
View File
@@ -168,24 +168,41 @@ trait EntityTrait {
}
}
# @TODO Must fix recursive bug !
if ($includeRelations) {
foreach($entityResolver->properties as $name => $field){
$relation = $entityResolver->searchFieldAnnotation($name, [ Attribute\Property\Relation::class, Relation::class ] );
$relation = $entityResolver->searchFieldAnnotation($name, [ Attribute\Property\Relation::class ] );
if ( $relation && isset($this->$name) && ($relation->entity ?? $relation->bridge) !== static::class ) {
if ( null !== $value = $this->$name ?? null ) {
if ( is_iterable($value) ) {
$list = [];
if ($relation) {
$ignore = $entityResolver->searchFieldAnnotation($name, [ Attribute\Property\Relation\Ignore::class ] );
foreach($value as $entity) {
$list[] = $entity->entityGetDataset(false);
}
$dataset[$name] = $list;
if ($ignore && $ignore->ignoreExport) {
if ( $relation->isOneToOne() ) {
# empty object
$dataset[$name] = ( new \ReflectionClass($field['type']) )->newInstanceWithoutConstructor();
}
elseif ( is_object($value) ) {
$dataset[$name] = $value->entityGetDataset(false);
else {
# empty collection
$dataset[$name] = [];
}
continue;
}
# @TODO Must fix recursive bug.. this last check is way too basic to work
if ( isset($this->$name) && ($relation->entity ?? $relation->bridge) !== static::class ) {
if ( null !== $value = $this->$name ?? null ) {
if ( is_iterable($value) ) {
$list = [];
foreach($value as $entity) {
$list[] = $entity->entityGetDataset(false);
}
$dataset[$name] = $list;
}
elseif ( is_object($value) ) {
$dataset[$name] = $value->entityGetDataset(false);
}
}
}
}
@@ -240,10 +257,7 @@ trait EntityTrait {
#[Ignore]
public function __isset(string $name) : bool
{
#if ( null !== $relation = static::resolveEntity()->searchFieldAnnotation($name, new Relation() ) ) {
# return isset($this->{$relation->key});
#}
$rel = static::resolveEntity()->searchFieldAnnotation($name, [ Attribute\Property\Relation::class, Relation::class ]);
$rel = static::resolveEntity()->searchFieldAnnotation($name, [ Attribute\Property\Relation::class ]);
if ( $this->isLoaded() && $rel ) {
return true;
@@ -327,7 +341,7 @@ trait EntityTrait {
#[Ignore]
public static function searchRequest(...$arguments) : SearchRequestInterface
{
return new class() implements SearchRequestInterface
return new class() implements SearchRequestInterface, \JsonSerializable
{
use SearchRequestPaginationTrait;