Merge branch 'develop'

common/Alias/Model.php

@@ -6,9 +6,9 @@ use ProVM\Common\Factory\Model as ModelFactory;
 interface Model {
   public function getTable(): string;
   public function setFactory(ModelFactory $factory): Model;
-  public function parentOf(string $child_model_class, array $relation_definitions): array;
+  public function parentOf(string $child_model_class, array $relation_definitions): ?array;
-  public function childOf(string $parent_model_class, array $relation_definitions): Model;
+  public function childOf(string $parent_model_class, array $relation_definitions): ?Model;
-  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): array;
+  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): ?array;
 
   public function toArray(): array;
 }

common/Define/Model.php

@@ -3,6 +3,7 @@ namespace ProVM\Common\Define;
 
 use \Model as BaseModel;
 use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Factory\Model as ModelFactory;
 
 abstract class Model extends BaseModel implements ModelInterface {
   const SELF_KEY = 'self_key';
@@ -36,7 +37,7 @@ abstract class Model extends BaseModel implements ModelInterface {
     }
     return $definitions;
   }
-  public function parentOf(string $child_model_class, array $relation_definitions): array {
+  public function parentOf(string $child_model_class, array $relation_definitions): ?array {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::CHILD_KEY
@@ -53,17 +54,17 @@ abstract class Model extends BaseModel implements ModelInterface {
       ])
       ->many();
   }
-  public function childOf(string $parent_model_class, array $relation_definitions): ModelInterface {
+  public function childOf(string $parent_model_class, array $relation_definitions): ?ModelInterface {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::PARENT_KEY
     ], [
       Model::PARENT_KEY => 'id'
     ]);
-    $parent_table = (new $parent_class())->getTable();
+    $parent_table = (new $parent_model_class())->getTable();
     return $this->factory
       ->find($parent_model_class)
-      ->wherer([
+      ->where([
         [
           $relation_definitions[Model::PARENT_KEY],
           $this->{$relation_definitions[Model::SELF_KEY]}
@@ -71,7 +72,7 @@ abstract class Model extends BaseModel implements ModelInterface {
       ])
       ->one();
   }
-  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): array {
+  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): ?array {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::SIBLING_KEY,
@@ -81,7 +82,7 @@ abstract class Model extends BaseModel implements ModelInterface {
       Model::SELF_KEY => 'id',
       Model::SIBLING_KEY => 'id'
     ]);
-    $sibling_table = (new $sibling_class())->getTable();
+    $sibling_table = (new $sibling_model_class())->getTable();
     return $this->find($sibling_model_class)
       ->select([
         [

common/Factory/Model.php

@@ -22,11 +22,27 @@ class Model {
     }
     return $this;
   }
+  public function create(string $model_class, array $data = null): ModelInterface {
+    if ($data !== null) {
+      $model = $this->find($model_class);
+      foreach ($data as $f => $v) {
+        $model = $model->where([[$f, $v]]);
+      }
+      $model = $model->one();
+      if ($model !== null) {
+        return $model;
+      }
+    }
+    $model = BaseModel::factory($model_class)->create($data);
+    $model->setFactory($this);
+    return $model;
+  }
   protected $class;
   public function find(string $model_class): Model {
     if (!class_exists($model_class)) {
       throw new \InvalidArgumentException('El modelo ' . $model_class . ' no existe.');
     }
+    $this->reset();
     $this->class = $model_class;
     return $this;
   }
@@ -79,14 +95,14 @@ class Model {
     }
     foreach ($conditions as $c) {
       $cond = (object) [
-        'column' => $j['column'] ?? $j[0],
+        'column' => $c['column'] ?? $c[0],
-        'value' => $j['value'] ?? $j[1],
+        'value' => $c['value'] ?? $c[1],
-        'sym' => strtolower($j['sym'] ?? ($j[2] ?? '=')),
+        'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')),
-        'type' => strtolower($j['type']) ?? ''
+        'type' => strtolower($c['type']) ?? ''
       ];
       $this->conditions []= $cond;
     }
-    return $this->conditions;
+    return $this;
   }
   protected $grouping;
   public function group($groups): Model {
@@ -328,20 +344,29 @@ class Model {
     return $orm->offset($this->offset);
   }
 
-  public function one(): ModelInterface {
+  public function one($id = null): ?ModelInterface {
-    $result = $this->build()->findOne();
+    $result = $this->build()->findOne($id);
+    if (!$result) {
+      return null;
+    }
     $result->setFactory($this);
     return $result;
   }
-  public function many(): array {
+  public function many(): ?array {
     $results = $this->build()->findMany();
+    if (!$results) {
+      return null;
+    }
     foreach ($results as &$r) {
       $r->setFactory($this);
     }
     return $results;
   }
-  public function array(): array {
+  public function array(): ?array {
     $results = $this->build()->findArray();
+    if (!$results) {
+      return null;
+    }
     return $results;
   }
 

common/Form/Model.php

@@ -0,0 +1,6 @@
+<?php
+namespace ProVM\Common\Form;
+
+use ProVM\Common\Define\Model as BaseModel;
+
+abstract class Model extends BaseModel {}