Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus

src/Repository.php

@@ -177,6 +177,64 @@ class Repository
         }
     }
 
+    public function loadCollectionRelation(EntityCollection $collection, /*array|string*/ $fields) : void
+    {
+        foreach((array) $fields as $name) {
+            if ( null !== ( $relation = $this->entityResolver->searchFieldAnnotation($name, new Annotation\Property\Relation() ) ) ) {
+                $relationType = strtolower(str_replace(['-', '_', ' '], '', $relation->type));
+
+                $order = $this->entityResolver->searchFieldAnnotationList($name, new Annotation\Property\OrderBy() );
+                $where = $this->entityResolver->searchFieldAnnotationList($name, new Annotation\Property\Where() );
+
+                $baseEntity = $relation->entity ?? $relation->bridge ?? $this->entityResolver->properties[$name]['type'];
+                $baseEntityResolver = $baseEntity::resolveEntity();
+
+                $property = ( $baseEntityResolver->field($relation->foreignKey, 01, false) ?: $baseEntityResolver->field($relation->foreignKey, 02) )['name'];
+                $entityProperty = ( $this->entityResolver->field($relation->key, 01, false) ?: $this->entityResolver->field($relation->key, 02) )['name'];
+
+                $repository = $baseEntity::repository();
+
+                foreach($where as $condition) {
+                    $repository->where($condition->field, is_callable($condition->value) ? call_user_func_array($condition->value, [ $this ]) : $condition->value, $condition->operator, $condition->condition);
+                }
+
+                foreach($order as $item) {
+                    $repository->orderBy($item->field, $item->order);
+                }
+
+                $field = $relation->key;
+
+                $values = [];
+
+                $key = is_object($relation->foreignKey) ? $relation->foreignKey : $baseEntity::field($relation->foreignKey);
+
+                foreach($collection as $item) {
+                    $values[] = is_callable($field) ? $field($item) : $item->$entityProperty;
+                }
+
+                $repository->where($key, $values);
+
+                switch( $relationType ) {
+                    case 'onetoone':
+                        $results = call_user_func([ $repository, "loadOne" ]);
+                        $item->$name = $results ?: new $baseEntity();
+                        
+                        break;
+                        
+                    case 'onetomany':
+                        $results = call_user_func([ $repository, $relation->function ]);
+                        
+                        foreach($collection as $item) {
+                            $item->$name = $baseEntity::entityCollection();
+                            $item->$name->mergeWith( $results->filtersCollection(fn($e) => $e->$property === $item->$entityProperty ) );
+                        }
+                        
+                        break;
+                }
+            }
+        }
+    }
+    
     public function truncate(? string $table = null, ? string $alias = null, ? string $schema = null) : self
     {
         $schema = $schema ?: $this->entityResolver->schemaName();