tests; lu dbo array; data access and sp modifications

.gitignore

@@ -1,3 +1,4 @@
 /.idea
 /vendor
 composer.lock
+/tests/config.json

src/Utils/DataAccess/LuDataAccess.php

@@ -15,7 +15,7 @@ abstract class LuDataAccess {
     protected static $_table = "mydb_table";
     protected static $_table_as = "__t__";
     protected static $_dboClass = LuDbo::class;
-    protected static $_dboArrayClass = LuDbo::class;
+    protected static $_dboArrayClass = null;
     protected static $_dboIgnoreList = [];
 
     public static function transact(\Closure $function)
@@ -55,6 +55,14 @@ abstract class LuDataAccess {
         return static::getConnection()->table(static::$_table);
     }
 
+    public static function getDboClassArray()
+    {
+        if (is_null(static::$_dboArrayClass)) {
+            return static::$_dboClass . "[]";
+        }
+        return static::$_dboArrayClass;
+    }
+
     /**
      * @param $query Builder|callable
      * @return Builder
@@ -95,7 +103,7 @@ abstract class LuDataAccess {
         }
         $data = LuStringUtils::convertJsonString($string);
         
-        return call_user_func([static::$_dboArrayClass, 'jsonDeserialize'], $data)->getArray();
+        return LuDbo::deserializeValue($data, static::$_dboClass . "[]");
     }
 
     /**
@@ -109,13 +117,12 @@ abstract class LuDataAccess {
         if (is_null($string)) {
             return null;
         }
-        $json = json_decode($string, true);
-        $data = LuArrayUtils::snakeToCamelCase($json);
+        $data = LuStringUtils::convertJsonString($string);
         if (count($data) < 1) {
             return null;
         }
 
-        return call_user_func([static::$_dboClass, 'jsonDeserialize'], $data[0]);
+        return LuDbo::deserializeValue($data[0], static::$_dboClass);
     }
 
     /**

src/Utils/DataAccess/LuStoredProcedure.php

@@ -12,13 +12,15 @@ use Illuminate\Database\Connection;
 use Luticate\Utils\Business\LuStringUtils;
 use Luticate\Utils\Dbo\LuDbo;
 use Illuminate\Database\Capsule\Manager as Capsule;
-use Luticate\Utils\Dbo\LuMultipleDbo;
+use Luticate\Utils\Dbo\LuDboArray;
+use Luticate\Utils\Dbo\LuPaginatedDbo;
 
 abstract class LuStoredProcedure
 {
     protected static $_connection = "mydb";
     protected static $_storedProcedure = "mydb_table";
-    protected static $_dboArrayClass = LuDbo::class;
+    protected static $_dboClass = LuDbo::class;
+    protected static $_dboArrayClass = null;
 
     /**
      * @return Connection
@@ -27,6 +29,14 @@ abstract class LuStoredProcedure
     {
         return Capsule::connection(static::$_connection);
     }
+    
+    public static function getDboClassArray()
+    {
+        if (is_null(static::$_dboArrayClass)) {
+            return static::$_dboClass . "[]";
+        }
+        return static::$_dboArrayClass;
+    }
 
     public static function getArgsArray($args)
     {
@@ -60,7 +70,10 @@ abstract class LuStoredProcedure
 
         $value = $values[0]->data;
         $json = LuStringUtils::convertJsonString($value);
-        $dboValues = call_user_func([static::$_dboArrayClass, 'jsonDeserialize'], $json)->getArray();
+        $dboValues = LuDbo::deserializeValue($json, static::getDboClassArray());
+        if ($dboValues instanceof LuDboArray) {
+            return $dboValues->getArray();
+        }
         return $dboValues;
     }
 
@@ -79,15 +92,15 @@ abstract class LuStoredProcedure
         if (count($json) < 1 || is_null($json[0])) {
             return null;
         }
-        $dboValue = call_user_func([static::$_dboArrayClass, 'jsonDeserialize'], $json)->getArray()[0];
-        return $dboValue;
+        $dboValue = LuDbo::deserializeValue($json, static::getDboClassArray());
+        return $dboValue[0];
     }
 
     /**
      * @param $args array
      * @param $page int The page number, 0 based
      * @param $perPage int The number of items per page
-     * @return LuMultipleDbo
+     * @return LuPaginatedDbo
      */
     public static function getMultiplePaginated($args, $page, $perPage)
     {
@@ -111,7 +124,10 @@ abstract class LuStoredProcedure
             $value->data = '[]';
         }
         $json = LuStringUtils::convertJsonString($value->data);
-        $dboValues = call_user_func([static::$_dboArrayClass, 'jsonDeserialize'], $json)->getArray();
-        return new LuMultipleDbo($value->count, $dboValues);
+        $dboValues = LuDbo::deserializeValue($json, static::getDboClassArray());
+        if ($dboValues instanceof LuDboArray) {
+            $dboValues = $dboValues->getArray();
+        }
+        return new LuPaginatedDbo($value->count, $dboValues);
     }
 }

src/Utils/Dbo/LuBoolDboArray.php

@@ -8,7 +8,7 @@
 
 namespace Luticate\Utils\Dbo;
 
-class LuBoolDboArray extends LuDbo
+class LuBoolDboArray extends LuDboArray
 {
     /**
      * @var int[]

src/Utils/Dbo/LuDateTimeDboArray.php

@@ -10,7 +10,7 @@ namespace Luticate\Utils\Dbo;
 
 use Carbon\Carbon;
 
-class LuDateTimeDboArray extends LuDbo
+class LuDateTimeDboArray extends LuDboArray
 {
     /**
      * @var Carbon[]

src/Utils/Dbo/LuDbo.php

@@ -27,33 +27,8 @@ abstract class LuDbo implements \JsonSerializable {
             $name = LuStringUtils::snakeToCamelCase($property->getName(), true);
             $property->setAccessible(true);
             $value = $property->getValue($this);
-            if (is_array($value)) {
-                $array = [];
-                foreach ($value as $key => $v) {
-                    if ($v instanceof LuDbo) {
-                        $array[$key] = $v->jsonSerialize();
-                    }
-                    else if ($v instanceof Carbon) {
-                        $array[$key] = $v->__toString();
-                    }
-                    else {
-                        $array[$key] = $v;
-                    }
-                }
-                $json[$name] = $array;
-            }
-            else {
-                $value = $property->getValue($this);
-                if ($value instanceof LuDbo) {
-                    $json[$name] = $value->jsonSerialize();
-                }
-                else if ($value instanceof Carbon) {
-                    $json[$name] = $value->__toString();
-                }
-                else {
-                    $json[$name] = $value;
-                }
-            }
+            $json[$name] = static::serializeValue($value);
+            
         }
         return $json;
     }
@@ -70,6 +45,28 @@ abstract class LuDbo implements \JsonSerializable {
         return $obj;
     }
 
+    public static function serializeValue($value)
+    {
+        if (is_array($value)) {
+            $array = [];
+            foreach ($value as $key => $v) {
+                $array[$key] = static::serializeValue($v);
+            }
+            return $array;
+        }
+        else {
+            if ($value instanceof LuDbo) {
+                return $value->jsonSerialize();
+            }
+            else if ($value instanceof Carbon) {
+                return $value->__toString();
+            }
+            else {
+                return $value;
+            }
+        }
+    }
+
     public static function deserializeValue($value, $type, $constraints = []) {
         if (is_null($value)) {
             return null;

src/Utils/Dbo/LuDboArray.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: robin
+ * Date: 6/16/16
+ * Time: 1:48 PM
+ */
+
+namespace Luticate\Utils\Dbo;
+
+
+class LuDboArray extends LuDbo
+{
+    protected static $_dboClass = LuDbo::class;
+
+    /**
+     * @var mixed[]
+     */
+    protected $_array;
+    public function getArray()
+    {
+        return $this->_array;
+    }
+    public function setArray($value)
+    {
+        $this->_array = $value;
+    }
+
+    public function jsonSerialize()
+    {
+        $array = [];
+        foreach ($this->_array as $dbo) {
+            $array[] = is_null($dbo) ? null : $dbo->jsonSerialize();
+        }
+        return $array;
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        if (!is_array($json)) {
+            throw new LuDboDeserializeException("Invalid array value");
+        }
+        $dbo = new self();
+        $array = [];
+        foreach ($json as $data) {
+            $array[] = LuDbo::deserializeValue($data, static::$_dboClass);
+        }
+        $dbo->setArray($array);
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        return [
+            call_user_func([static::$_dboClass, "generateSample"]),
+            call_user_func([static::$_dboClass, "generateSample"])
+        ];
+    }
+}

src/Utils/Dbo/LuFloatDboArray.php

@@ -9,7 +9,7 @@
 namespace Luticate\Utils\Dbo;
 
 
-class LuFloatDboArray extends LuDbo
+class LuFloatDboArray extends LuDboArray
 {
     /**
      * @var float[]

src/Utils/Dbo/LuIntDboArray.php

@@ -9,7 +9,7 @@
 namespace Luticate\Utils\Dbo;
 
 
-class LuIntDboArray extends LuDbo
+class LuIntDboArray extends LuDboArray
 {
     /**
      * @var int[]

src/Utils/Dbo/LuMiddlewareDboArray.php

@@ -9,7 +9,7 @@
 namespace Luticate\Utils\Dbo;
 
 
-class LuMiddlewareDboArray extends LuDbo
+class LuMiddlewareDboArray extends LuDboArray
 {
     /**
      * @var LuMiddlewareDbo[]

src/Utils/Dbo/LuMultipleDbo.php → src/Utils/Dbo/LuPaginatedDbo.php

@@ -2,7 +2,7 @@
 
 namespace Luticate\Utils\Dbo;
 
-class LuMultipleDbo extends LuDbo {
+class LuPaginatedDbo extends LuDbo {
 
     /**
      * @var int
@@ -50,7 +50,7 @@ class LuMultipleDbo extends LuDbo {
         foreach ($this->_data as $data) {
             $values[] = $callback($data);
         }
-        return new LuMultipleDbo($this->_count, $values);
+        return new LuPaginatedDbo($this->_count, $values);
     }
     
     public static function jsonDeserialize($json)

src/Utils/Dbo/LuRouteDboArray.php

@@ -9,7 +9,7 @@
 namespace Luticate\Utils\Dbo;
 
 
-class LuRouteDboArray extends LuDbo
+class LuRouteDboArray extends LuDboArray
 {
     /**
      * @var LuRouteDbo[]

src/Utils/Dbo/LuStringDboArray.php

@@ -8,7 +8,7 @@
 
 namespace Luticate\Utils\Dbo;
 
-class LuStringDboArray extends LuDbo
+class LuStringDboArray extends LuDboArray
 {
     /**
      * @var string[]

tests/DatabaseTest.php

@@ -155,7 +155,6 @@ class SpTest extends LuStoredProcedure {
     protected static $_connection = "mydb";
     protected static $_storedProcedure = "sp_test";
     protected static $_dboClass = LuIntDbo::class;
-    protected static $_dboArrayClass = LuIntDboArray::class;
 
     public static function execute($an_int) {
         return self::getSingle([$an_int]);
@@ -185,42 +184,60 @@ class TestTableDataAccess extends LuDataAccess
     protected static $_connection = "mydb";
     protected static $_table = "test_table";
     protected static $_dboClass = TestTableDbo::class;
-    protected static $_dboArrayClass = TestTableDboArray::class;
 }
 
 class DatabaseTest extends \PHPUnit_Framework_TestCase
 {
-    public function testSetup()
-    {
-//        $config = ['databases' => [
-//            [
-//                'name'      => 'mydb',
-//                'driver'    => 'pgsql',
-//                'host'      => '172.17.0.1',
-//                'database'  => 'luticate2',
-//                'username'  => 'dev',
-//                'password'  => 'dev'
-//            ]
-//        ]];
-//        $app = new LuticateApplication($config);
-//        $app->setupDatabases();
-
-//        var_dump(SpTest::execute(42));
-//        var_dump(SpTest::execute(4));
-//        var_dump(SpTest2::execute(42));
-//        var_dump(SpTest2::executePaginated(42, 0, 2)->jsonSerialize());
-//        var_dump(SpTest2::executePaginated(42, 1, 2)->jsonSerialize());
-//
+    public function testSpGetSingle()
+    {
+        $this->assertSame(42, LuDbo::serializeValue(SpTest::execute(42)));
+    }
+
+    public function testSpGetSingleNull()
+    {
+        $this->assertNull(SpTest::execute(4));
+    }
+
+    public function testSpGetMultiple()
+    {
+        $this->assertSame(range(0, 15), SpTest2::execute(42));
+    }
+
+    public function testSpGetMultiplePaginated1()
+    {
+        $this->assertSame(["Count" => 16, "Data" => range(0, 1)], SpTest2::executePaginated(42, 0, 2)->jsonSerialize());
+    }
+
+    public function testSpGetMultiplePaginated2()
+    {
+        $this->assertSame(["Count" => 16, "Data" => range(2, 3)], SpTest2::executePaginated(42, 1, 2)->jsonSerialize());
+    }
+
+    public function testDaGetMultiple()
+    {
+        $this->assertSame([
+            ["Id" => 1, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"]
+        ],
+            LuDbo::serializeValue(TestTableDataAccess::getMultiple(function(Builder $q)
+            {
+                return $q->where("id", "=", 1);
+            })));
+    }
+
+    public function testDaGetSingleById()
+    {
+        $this->assertSame(["Id" => 1, "SomeText" => "lol2", "SomeIntegerArray" => [], "CreatedAt" => "2016-06-15 13:45:23"],
+            LuDbo::serializeValue(TestTableDataAccess::getSingleById(1)));
+    }
+    
+    public function testDatabase()
+    {
+
 //        $dbo = new TestTableDbo();
 //        $dbo->setId(11);
 //        $dbo->setSomeIntegerArray('{}');
 //        $dbo->setSomeText("lol2");
 //
-//        var_dump(TestTableDataAccess::getMultiple(function(Builder $q)
-//        {
-//            return $q->where("id", "=", 1);
-//        })[0]->jsonSerialize());
-//        var_dump(TestTableDataAccess::getSingleById(1));
 //        var_dump(TestTableDataAccess::deleteMultiple(function($q)
 //        {
 //            return $q->where("some_text", "=", "lol");

tests/bootstrap.php

@@ -6,15 +6,9 @@
  * Time: 2:59 PM
  */
 
-class AbortException extends \Exception
-{
-    public function __construct($code, $reason)
-    {
-        parent::__construct($reason, $code, null);
-    }
-}
+use Luticate\Utils\Controller\LuticateApplication;
 
-function abort($code, $reason)
-{
-    throw new AbortException($code, $reason);
-}
+$json = file_get_contents(__DIR__ . '/config.json');
+$config = json_decode($json, true);
+$app = new LuticateApplication($config);
+$app->setupDatabases();

tests/config.example.json

@@ -0,0 +1,14 @@
+{
+  "logs": "storage/logs/luticate.log",
+  "websocket": {
+    "address": "0.0.0.0",
+    "port": 8180
+  },
+  "databases": [
+    {
+      "name": "default", "driver": "pgsql",
+      "host": "127.0.0.1", "database": "project",
+      "username": "project", "password": "password"
+    }
+  ]
+}