updated generator

composer.lock

@@ -51,13 +51,187 @@
             "homepage": "https://github.com/firebase/php-jwt",
             "time": "2015-06-22 23:26:39"
         },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "~1.0",
+                "guzzlehttp/psr7": "~1.1",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "~4.0",
+                "psr/log": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2015-11-23 00:47:50"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2015-10-15 22:28:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/4d0bdbe1206df7440219ce14c972aa57cc5e4982",
+                "reference": "4d0bdbe1206df7440219ce14c972aa57cc5e4982",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "PSR-7 message implementation",
+            "keywords": [
+                "http",
+                "message",
+                "stream",
+                "uri"
+            ],
+            "time": "2015-11-03 01:34:55"
+        },
         {
             "name": "luticate/utils",
-            "version": "0.1.1",
+            "version": "0.1.3",
             "source": {
                 "type": "git",
                 "url": "https://git.rthoni.com/luticate/utils.git",
-                "reference": "8965564e6a6b329918ba7e4e9ebcfc9e98f71edc"
+                "reference": "c76d9e46c4388bbecf6274f5361d8e71df79bfda"
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.1"
             },
             "type": "library",
             "autoload": {
@@ -72,17 +246,66 @@
                 }
             ],
             "description": "Luticate user management system utils",
-            "time": "2015-11-12 14:55:00"
+            "time": "2016-01-10 23:00:22"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2015-05-04 20:22:00"
         }
     ],
     "packages-dev": [
         {
             "name": "luticate/generator",
-            "version": "0.1.2",
+            "version": "0.1.3",
             "source": {
                 "type": "git",
                 "url": "https://git.rthoni.com/luticate/generator.git",
-                "reference": "5940633ab6ea37df3999e00d0819ead21925e710"
+                "reference": "c279bf6e2e92789be374012ff49fb38f531dfd76"
             },
             "require": {
                 "luticate/utils": "0.1.x",
@@ -102,20 +325,20 @@
                 }
             ],
             "description": "Luticate user management system code generator",
-            "time": "2015-11-12 15:21:28"
+            "time": "2016-01-13 22:10:56"
         },
         {
             "name": "twig/twig",
-            "version": "v1.23.1",
+            "version": "v1.23.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
+                "reference": "ae53fc2c312fdee63773b75cb570304f85388b08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
-                "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08",
+                "reference": "ae53fc2c312fdee63773b75cb570304f85388b08",
                 "shasum": ""
             },
             "require": {
@@ -163,7 +386,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2015-11-05 12:49:06"
+            "time": "2016-01-11 14:02:19"
         },
         {
             "name": "vlucas/phpdotenv",

src/Auth/DBO/LuticateGroupsDbo.php

@@ -19,6 +19,26 @@ class LuticateGroupsDbo extends LuDbo {
         );
     }
 
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new LuticateGroupsDbo();
+        if (isset($json["Id"])) {
+            $dbo->setId($json["Id"]);
+        }
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new LuticateGroupsDbo();
+        $dbo->setId(42);
+        $dbo->setName("sample string");
+        return $dbo;
+    }
+
     /**
      * @var integer
      */

src/Auth/DBO/LuticatePermissionsDbo.php

@@ -19,6 +19,26 @@ class LuticatePermissionsDbo extends LuDbo {
         );
     }
 
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new LuticatePermissionsDbo();
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["Value"])) {
+            $dbo->setValue($json["Value"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new LuticatePermissionsDbo();
+        $dbo->setName("sample string");
+        $dbo->setValue(true);
+        return $dbo;
+    }
+
     /**
      * @var string
      */

src/Auth/DBO/LuticatePermissionsGroupsDbo.php

@@ -20,6 +20,30 @@ class LuticatePermissionsGroupsDbo extends LuDbo {
         );
     }
 
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new LuticatePermissionsGroupsDbo();
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["Value"])) {
+            $dbo->setValue($json["Value"]);
+        }
+        if (isset($json["GroupId"])) {
+            $dbo->setGroupId($json["GroupId"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new LuticatePermissionsGroupsDbo();
+        $dbo->setName("sample string");
+        $dbo->setValue(true);
+        $dbo->setGroupId(42);
+        return $dbo;
+    }
+
     /**
      * @var string
      */

src/Auth/DBO/LuticatePermissionsUsersDbo.php

@@ -20,6 +20,30 @@ class LuticatePermissionsUsersDbo extends LuDbo {
         );
     }
 
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new LuticatePermissionsUsersDbo();
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["Value"])) {
+            $dbo->setValue($json["Value"]);
+        }
+        if (isset($json["UserId"])) {
+            $dbo->setUserId($json["UserId"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new LuticatePermissionsUsersDbo();
+        $dbo->setName("sample string");
+        $dbo->setValue(true);
+        $dbo->setUserId(42);
+        return $dbo;
+    }
+
     /**
      * @var string
      */

src/Auth/DBO/LuticateUsersDbo.php

@@ -25,6 +25,50 @@ class LuticateUsersDbo extends LuDbo {
         );
     }
 
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new LuticateUsersDbo();
+        if (isset($json["Id"])) {
+            $dbo->setId($json["Id"]);
+        }
+        if (isset($json["Username"])) {
+            $dbo->setUsername($json["Username"]);
+        }
+        if (isset($json["Email"])) {
+            $dbo->setEmail($json["Email"]);
+        }
+        if (isset($json["Password"])) {
+            $dbo->setPassword($json["Password"]);
+        }
+        if (isset($json["Salt"])) {
+            $dbo->setSalt($json["Salt"]);
+        }
+        if (isset($json["ProfileId"])) {
+            $dbo->setProfileId($json["ProfileId"]);
+        }
+        if (isset($json["Firstname"])) {
+            $dbo->setFirstname($json["Firstname"]);
+        }
+        if (isset($json["Lastname"])) {
+            $dbo->setLastname($json["Lastname"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new LuticateUsersDbo();
+        $dbo->setId(42);
+        $dbo->setUsername("sample string");
+        $dbo->setEmail("sample string");
+        $dbo->setPassword("sample string");
+        $dbo->setSalt("sample string");
+        $dbo->setProfileId(42);
+        $dbo->setFirstname("sample string");
+        $dbo->setLastname("sample string");
+        return $dbo;
+    }
+
     /**
      * @var integer
      */

src/Auth/DataAccess/SP/SpLuGetAllUserPermission.php

@@ -8,6 +8,8 @@
 namespace Luticate\Auth\DataAccess\SP;
 
 use Luticate\Utils\LuSpModel;
+use Luticate\Utils\LuMultipleDbo;
+use Luticate\Utils\LuStringUtils;
 use Illuminate\Support\Facades\DB;
 
 class SpLuGetAllUserPermission extends LuSpModel {
@@ -24,15 +26,30 @@ class SpLuGetAllUserPermission extends LuSpModel {
         return $dbo;
     }
 
+
     public static function execute($_user_id)
     {
-        $values = DB::select('SELECT * FROM sp_lu_get_all_user_permission(?)', array($_user_id));
+        $values = DB::select('SELECT * FROM sp_lu_get_all_user_permission(:_user_id)', array(":_user_id" => $_user_id));
         $dboValues = array();
         foreach ($values as $value)
             $dboValues[] = self::damToDbo($value);
         return $dboValues;
     }
 
+    public static function getMultipleJson($_user_id, $page, $perPage)
+    {
+        $values = DB::select('SELECT (SELECT count(*) FROM sp_lu_get_all_user_permission(:_user_id)) as count, (SELECT json_agg(q) FROM (SELECT * FROM sp_lu_get_all_user_permission(:_user_id) OFFSET (:page::int * :perPage::int) LIMIT :perPage) q) as data',
+            array(":_user_id" => $_user_id, ":page" => $page, ":perPage" => $perPage));
+        $value = $values[0];
+        if (is_null($value->data))
+        {
+            $value->data = '[]';
+        }
+        $data = LuStringUtils::convertJsonString($value->data);
+        return new LuMultipleDbo($value->count, $data);
+    }
+
+
     /**
     * @var string
     */

src/Auth/DataAccess/SP/SpLuGetUserPermission.php

@@ -8,6 +8,8 @@
 namespace Luticate\Auth\DataAccess\SP;
 
 use Luticate\Utils\LuSpModel;
+use Luticate\Utils\LuMultipleDbo;
+use Luticate\Utils\LuStringUtils;
 use Illuminate\Support\Facades\DB;
 
 class SpLuGetUserPermission extends LuSpModel {
@@ -23,12 +25,15 @@ class SpLuGetUserPermission extends LuSpModel {
         return $dbo;
     }
 
+
     public static function execute($_user_id, $_permisson_name)
     {
-        $values = DB::select('SELECT * FROM sp_lu_get_user_permission(?, ?)', array($_user_id, $_permisson_name));
+        $values = DB::select('SELECT * FROM sp_lu_get_user_permission(:_user_id, :_permisson_name)', array(":_user_id" => $_user_id, ":_permisson_name" => $_permisson_name));
         return self::damToDbo($values[0]);
     }
 
+
+
     /**
     * @var boolean
     */