Merge branch 'develop' into master

common/Alias/Model.php

@@ -2,7 +2,7 @@
 namespace ProVM\Common\Alias;
 
 use \Model as BaseModel;
-use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Define\Model as ModelInterface;
 use ProVM\Common\Factory\Model as ModelFactory;
 
 abstract class Model extends BaseModel implements ModelInterface {
@@ -122,4 +122,34 @@ abstract class Model extends BaseModel implements ModelInterface {
   public function toArray(): array {
     return $this->asArray();
   }
+
+  protected static function parseInput($input): array {
+    return array_intersect_key((array) $input, array_combine(static::$fields, static::$fields));
+  }
+  public static function add(ModelFactory $factory, $input): ?ModelInterface {
+    $data = static::parseInput($input);
+    $class = get_called_class();
+    if (method_exists($class, 'find')) {
+      $obj = static::find($factory, $input);
+    } else {
+      $where = $data;
+      $where = array_values(array_walk($where, function(&$item, $key) {
+        $item = [$key, $item];
+      }));
+      $obj = $factory->find($class)->where($where)->one();
+    }
+    if ($obj === null) {
+      $obj = $factory->create($class, $data);
+    }
+    return $obj;
+  }
+  public function edit($input): bool {
+    $data = static::parseInput($input);
+    foreach (static::$fields as $field) {
+      if ($this->{$field} != $data[$field]) {
+        $this->{$field} = $data[$field];
+      }
+    }
+    return $this->save();
+  }
 }

common/Define/Model.php

@@ -11,4 +11,7 @@ interface Model {
   public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): ?array;
 
   public function toArray(): array;
+
+  public static function add(ModelFactory $factory, $input): ?Model;
+  public function edit($input): bool;
 }

common/Define/Model/Date.php

@@ -0,0 +1,13 @@
+<?php
+namespace ProVM\Common\Define\Model;
+
+use Carbon\Carbon;
+
+trait Date {
+  public function date(\DateTime $date = null) {
+    if ($date === null) {
+      return Carbon::parse($this->date);
+    }
+    $this->date = $data->format('Y-m-d');
+  }
+}

common/Define/Model/DateTime.php

@@ -0,0 +1,13 @@
+<?php
+namespace ProVM\Common\Define\Model;
+
+use Carbon\Carbon;
+
+trait DateTime {
+  public function dateTime(\DateTime $date_time = null) {
+    if ($date_time === null) {
+      return Carbon::parse($this->date_time);
+    }
+    $this->date_time = $date_time->format('c');
+  }
+}

common/Define/Model/Time.php

@@ -0,0 +1,13 @@
+<?php
+namespace ProVM\Common\Define\Model;
+
+use Carbon\Carbon;
+
+trait Time {
+  public function time(\DateTime $time = null) {
+    if ($time === null) {
+      return Carbon::parse($this->time);
+    }
+    $this->time = $time->format('H:i:s e');
+  }
+}

common/Factory/Model.php

@@ -3,7 +3,7 @@ namespace ProVM\Common\Factory;
 
 use ORM;
 use Model as BaseModel;
-use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Define\Model as ModelInterface;
 
 class Model {
   public function reset(): Model {

common/Form/Model.php

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