Added created to db tables, new edge/data syntax, others (#8)

* Added created to db tables, new edge/data syntax, others

* [CodeFactor] Apply fixes

* Added unit test, updated some examples of new edge syntax

.phpcs.xml

@@ -7,18 +7,35 @@
     </properties>
 
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
+    <rule ref="Squiz.Arrays.ArrayDeclaration"/>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.DoubleArrowNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.ValueNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.KeyNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.SingleLineNotAllowed">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Arrays.ArrayDeclaration.CloseBraceNotAligned">
+        <severity>0</severity>
+    </rule>
     <rule ref="Squiz.Classes.ClassFileName"/>
     <rule ref="Squiz.Classes.ValidClassName"/>
     <rule ref="Squiz.ControlStructures.ControlSignature">
         <properties>
             <property name="requiredSpacesBeforeColon" value="0" />
         </properties>
         <exclude-pattern>/app/views/**</exclude-pattern>
-        <exclude-pattern>/sample_app/views/**</exclude-pattern>
     </rule>
     <rule ref="Squiz.ControlStructures.ElseIfDeclaration">
         <exclude-pattern>/app/views/**</exclude-pattern>
-        <exclude-pattern>/sample_app/views/**</exclude-pattern>
     </rule>
     <rule ref="Squiz.Commenting.BlockComment"/>
     <rule ref="Squiz.Commenting.DocCommentAlignment"/>
@@ -47,11 +64,17 @@
     </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Arrays.ArrayIndent">
+        <properties>
+            <property name="indent" value="2" />
+        </properties>
+    </rule>
     <rule ref="Generic.Classes.OpeningBraceSameLine"/>
     <rule ref="Generic.Commenting.Todo"/>
     <rule ref="Generic.ControlStructures.InlineControlStructure"/>
     <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
     <rule ref="Generic.Formatting.SpaceAfterCast"/>
+    <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
     <rule ref="Generic.NamingConventions.ConstructorName"/>
     <rule ref="Generic.PHP.DeprecatedFunctions"/>
     <rule ref="Generic.PHP.LowerCaseKeyword"/>
@@ -67,7 +90,6 @@
     <rule ref="PSR2.Files.EndFileNewline"/>
     <rule ref="Zend.Files.ClosingTag">
         <exclude-pattern>/app/views/**</exclude-pattern>
-        <exclude-pattern>/sample_app/views/**</exclude-pattern>
     </rule>
 
     <!-- PEAR uses warnings for inline control structures, so switch back to errors -->
@@ -77,5 +99,14 @@
         </properties>
     </rule>
 
+    <!-- <arg name="tab-width" value="2"/> -->
 
+    <rule ref="PEAR.WhiteSpace.ScopeIndent">
+        <properties>
+            <property name="indent" value="2" />
+            <property name="ignoreIndentationTokens" type="array"
+                value="T_COMMENT,T_DOC_COMMENT_OPEN_TAG"/>
+        </properties>
+        <exclude-pattern>/app/views/**</exclude-pattern>
+    </rule>
 </ruleset>

README.md

@@ -27,12 +27,12 @@ Define nodes (your model) with minimum boilerplate
 class User extends GPNode {
   protected static function getDataTypesImpl() {
     return [
-      new GPDataType('name', GPDataType::GP_STRING, true),
+      GPDataType::string('name', $indexed = true),
     ];
   }
   protected static function getEdgeTypesImpl() {
     return [
-      new GPEdgeType(BankAccount::class),
+      BankAccount::edge(),
     ];
   }
 }

graphp/core/GPConfig.php

@@ -27,7 +27,7 @@ public function __get($name) {
     if (isset($this->config[$name])) {
       return $this->config[$name];
     }
-    throw new Exception($name.' is not in '.$this->name.' config' , 1);
+    throw new Exception($name.' is not in '.$this->name.' config', 1);
   }
 
   public static function from_file($file) {

graphp/core/GPDatabase.php

@@ -2,7 +2,10 @@
 
 class GPDatabase extends GPObject {
 
-  const LIMIT = 100;
+  public const LIMIT = 100;
+
+  private const NODE_SELECT =
+    'SELECT id, type, data, UNIX_TIMESTAMP(created) AS created, UNIX_TIMESTAMP(updated) AS updated';
 
   private static $dbs = [];
   private $connection;
@@ -103,15 +106,15 @@ public function updateNodeData(GPNode $node) {
   public function getNodeByID($id) {
     return queryfx_one(
       $this->getConnection(),
-      'SELECT * FROM node WHERE id = %d;',
+      self::NODE_SELECT.' FROM node WHERE id = %d;',
       $id
     );
   }
 
   public function getNodeByIDType($id, $type) {
     return queryfx_one(
       $this->getConnection(),
-      'SELECT * FROM node WHERE id = %d AND type = %d;',
+      self::NODE_SELECT.' FROM node WHERE id = %d AND type = %d;',
       $id,
       $type
     );
@@ -125,11 +128,19 @@ public function multigetNodeByIDType(array $ids, $type = null) {
     $args = array_filter([$ids, $type]);
     return queryfx_all(
       $this->getConnection(),
-      'SELECT * FROM node WHERE id IN (%Ld) '.$type_fragment,
+      self::NODE_SELECT.' FROM node WHERE id IN (%Ld) '.$type_fragment,
       ...$args
     );
   }
 
+  public function getNodeIDsByTypeDataAll(int $type): array {
+    return ipull(queryfx_all(
+      $this->getConnection(),
+      'SELECT node_id FROM node_data WHERE type = %d;',
+      $type
+    ), 'node_id');
+  }
+
   public function getNodeIDsByTypeData($type, array $data) {
     if (!$data) {
       return [];
@@ -315,7 +326,7 @@ public function getConnectedNodeCount(array $nodes, array $edges) {
   public function getAllByType($type, $limit, $offset) {
     return queryfx_all(
       $this->getConnection(),
-      'SELECT * FROM node WHERE type = %d ORDER BY updated DESC LIMIT %d, %d;',
+      self::NODE_SELECT.' FROM node WHERE type = %d ORDER BY updated DESC LIMIT %d, %d;',
       $type,
       $offset,
       $limit

graphp/core/GPLoader.php

@@ -109,6 +109,8 @@ public static function return404() {
     $config = GPConfig::get();
     if (GP::isAjax() || GP::isJSONRequest()) {
       GP::ajax(['error_code' => 404, 'error' => 'Resource Not Found']);
+    } else if ($config->redirect_404) {
+      header('Location: '.$config->redirect_404, true);
     } else if ($config->view_404 && $config->layout_404) {
       GP::viewWithLayout($config->view_404, $config->layout_404);
     } else if ($config->view_404) {
@@ -138,6 +140,12 @@ public static function ajax(array $data) {
     header('Pragma: no-cache');
     header('Content-type: application/json');
     echo json_encode($data);
+    GP::exit();
+  }
+
+  public static function exit() {
+    GPDatabase::disposeALl();
+    exit();
   }
 
   public static function addGlobal($key, $val) {

graphp/db/mysql_schema.sql

@@ -1,5 +1,5 @@
 
-CREATE DATABASE IF NOT EXISTS  graphp;
+CREATE DATABASE IF NOT EXISTS graphp;
 
 USE graphp;
 
@@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS `edge` (
   `from_node_id` bigint(20) unsigned NOT NULL,
   `to_node_id` bigint(20) unsigned NOT NULL,
   `type` bigint(20) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`from_node_id`,`to_node_id`,`type`),
   KEY `from_type_updated` (`from_node_id`,`type`,`updated`),
@@ -42,6 +43,7 @@ CREATE TABLE IF NOT EXISTS `node` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `type` bigint(20) unsigned NOT NULL,
   `data` text COLLATE utf8_unicode_ci NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `type_updated` (`type`,`updated`)
@@ -57,6 +59,7 @@ CREATE TABLE IF NOT EXISTS `node_data` (
   `node_id` bigint(20) unsigned NOT NULL,
   `type` bigint(20) unsigned NOT NULL,
   `data` text COLLATE utf8_unicode_ci NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`node_id`,`type`),
   KEY `type_data` (`type`,`data`(128)),
@@ -82,4 +85,4 @@ ALTER TABLE `node_data`
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

graphp/lib/GPRouteGenerator.php

@@ -1,6 +1,6 @@
 <?php
 
-  class GPRouteGenerator extends GPObject {
+class GPRouteGenerator extends GPObject {
 
   private $path;
   private $controller;

graphp/model/GPDataType.php

@@ -2,6 +2,8 @@
 
 class GPDataType extends GPObject {
 
+  use GPDataTypeCreator;
+
   const GP_INT = 'is_int';
   const GP_NODE_ID = 'is_int';
   const GP_FLOAT = 'is_float';

graphp/model/GPEdgeType.php

@@ -22,7 +22,7 @@ public function setFromClass($from_class) {
 
   public function getType() {
     if (!$this->type) {
-     $this->type = STRUtils::to64BitInt($this->getStorageKey());
+      $this->type = STRUtils::to64BitInt($this->getStorageKey());
     }
     return $this->type;
   }

graphp/model/GPNode.php

@@ -5,11 +5,13 @@ abstract class GPNode extends GPObject {
   use GPNodeLoader;
   use GPNodeMagicMethods;
   use GPBatchLoader;
+  use GPNodeEdgeCreator;
 
   private
     $data,
     $id,
     $updated,
+    $created,
     // array([edge_type] => [array of nodes indexed by id])
     $connectedNodeIDs = [],
     $connectedNodes = [],
@@ -35,10 +37,18 @@ public function getID() {
     return (int) $this->id;
   }
 
+  public function isSaved(): bool {
+    return $this->getID() > 0;
+  }
+
   public function getUpdated() {
     return $this->updated;
   }
 
+  public function getCreatedTimestamp() {
+    return $this->created;
+  }
+
   public static function getType() {
     return STRUtils::to64BitInt(static::getStorageKey());
   }

graphp/model/GPNodeLoader.php

@@ -14,6 +14,7 @@ private static function nodeFromArray(array $data) {
     $node = new $class(json_decode($data['data'], true));
     $node->id = $data['id'];
     $node->updated = $data['updated'];
+    $node->created = $data['created'];
     return $node;
   }
 
@@ -70,22 +71,37 @@ public static function __callStatic($name, array $arguments) {
     } else if (substr_compare($name, 'getOneBy', 0, 8) === 0) {
       $type_name = strtolower(mb_substr($name, 8));
       $only_one = true;
+    } else if (substr_compare($name, 'getAllWith', 0, 10) === 0) {
+      $type_name = strtolower(mb_substr($name, 10));
+      $get_all_with_type = true;
     }
+
     if (isset($type_name)) {
       $class = get_called_class();
       $data_type = static::getDataTypeByName($type_name);
       Assert::truthy($data_type, $name.' is not a method on '.$class);
+      if (isset($range)) {
+        $required_args = 2;
+      } else if (isset($get_all_with_type)) {
+        $required_args = 0;
+      } else {
+        $required_args = 1;
+      }
       Assert::truthy(
-        isset($range) ? count($arguments) >= 2 : count($arguments) === 1,
-        GPErrorText::wrongArgs($class, $name, 1, count($arguments))
+        count($arguments) >= $required_args,
+        GPErrorText::wrongArgs($class, $name, $required_args, count($arguments))
       );
-      $arg = idx0($arguments);
-      foreach (make_array($arg) as $val) {
-        $data_type->assertValueIsOfType($val);
+      if ($arguments) {
+        $arg = idx0($arguments);
+        foreach (make_array($arg) as $val) {
+          $data_type->assertValueIsOfType($val);
+        }
       }
       if (isset($range)) {
         array_unshift($arguments, $data_type->getIndexedType());
         $results = self::getByIndexDataRange($arguments);
+      } else if (isset($get_all_with_type)) {
+        $results = self::getByIndexDataAll($data_type->getIndexedType());
       } else {
         $results = self::getByIndexData($data_type->getIndexedType(), $arg);
       }
@@ -113,6 +129,11 @@ public static function unsetFromCache($id) {
     unset(self::$cache[$id]);
   }
 
+  private static function getByIndexDataAll($data_type) {
+    $node_ids = GPDatabase::get()->getNodeIDsByTypeDataAll($data_type);
+    return self::multiGetByID($node_ids);
+  }
+
   private static function getByIndexData($data_type, $data) {
     $db = GPDatabase::get();
     $node_ids = $db->getNodeIDsByTypeData($data_type, make_array($data));

graphp/model/traits/GPDataTypeCreator.php

@@ -0,0 +1,32 @@
+<?php
+
+trait GPDataTypeCreator {
+
+  public static function array($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_ARRAY, ...$args);
+  }
+
+  public static function string($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_STRING, ...$args);
+  }
+
+  public static function bool($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_BOOL, ...$args);
+  }
+
+  public static function int($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_INT, ...$args);
+  }
+
+  public static function float($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_FLOAT, ...$args);
+  }
+
+  public static function number($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_NUMBER, ...$args);
+  }
+
+  public static function any($name, ...$args) {
+    return new GPDataType($name, GPDataType::GP_ANY, ...$args);
+  }
+}

graphp/model/traits/GPNodeEdgeCreator.php

@@ -0,0 +1,15 @@
+<?php
+
+trait GPNodeEdgeCreator {
+
+  public static function edge(string $name = null) {
+    return new GPEdgeType(get_called_class(), $name ?: STR::pluralize(get_called_class()));
+  }
+
+  public static function singleEdge(string $single_name = null, string $plural_name = null) {
+    $defaulted_single_name = $single_name ?: get_called_class();
+    $defaulted_plural_name = $plural_name ?: STR::pluralize($defaulted_single_name);
+    return (new GPEdgeType(get_called_class(), $defaulted_plural_name))
+      ->setSingleNodeName($defaulted_single_name);
+  }
+}