begin controller update

generate.php

@@ -40,12 +40,18 @@ $gen->setConfig(array("dbo" =>
             "namespace" => 'Luticate\Auth\Business',
             "folder" => 'src/Auth/Business'
         ),
+    "controller" =>
+        array(
+            "namespace" => 'Luticate\Auth\Controller',
+            "folder" => 'src/Auth/Controller'
+        ),
     "mode" => 0775,
     "ignore" => array(
         "tables" => array(
             "/luticate_users_groups/"
         ),
-        "sp" => array()
+        "sp" => array(),
+        "controllers" => array()
     )
 ));
 $gen->run();

src/Auth/Business/LuticateBusiness.php

@@ -8,11 +8,8 @@
 
 namespace Luticate\Auth\Business;
 
-use Illuminate\Http\Request;
 use Luticate\Auth\DBO\LuticatePermissions;
 use Luticate\Auth\DBO\LuticateUsersDbo;
-use Luticate\Doc\Business\LuDocBusiness;
-use Luticate\Utils\LuController;
 use Luticate\Utils\LuRoute;
 
 class LuticateBusiness
@@ -43,13 +40,12 @@ class LuticateBusiness
      */
     public static function setupRoutes($prefix = "/luticate")
     {
-        $ns = 'Luticate\Auth\Business\\';
+        $ns = 'Luticate\Auth\Controller\\';
 
         $int = "[0-9]+";
         $name = "[A-Z0-9_]+";
         $bool = "true|false";
 
-        $id = "{id:$int}";
         $group_id = "{group_id:$int}";
         $user_id = "{user_id:$int}";
         $permission_name = "{permission_name:$name}";
@@ -57,73 +53,73 @@ class LuticateBusiness
 
         $route = LuRoute::getInstance();
 
-        $route->post("$prefix/users/login", "${ns}LuticateUsersBusiness", "login");
-        $route->post("$prefix/users/logout", "${ns}LuticateUsersBusiness", "logout");
-        $route->post("$prefix/users/$id", "${ns}LuticateUsersBusiness", "getById", LuticatePermissions::USER_GET);
-        $route->post("$prefix/users", "${ns}LuticateUsersBusiness", "getAll", LuticatePermissions::USER_GET);
-        $route->post("$prefix/users/add", "${ns}LuticateUsersBusiness", "add",
+        $route->post("$prefix/users/login", "${ns}LuticateUsersController", "login");
+        $route->post("$prefix/users/logout", "${ns}LuticateUsersController", "logout");
+        $route->get("$prefix/users/$user_id", "${ns}LuticateUsersController", "getById", LuticatePermissions::USER_GET);
+        $route->get("$prefix/users", "${ns}LuticateUsersController", "getAll", LuticatePermissions::USER_GET);
+        $route->post("$prefix/users/add", "${ns}LuticateUsersController", "add",
             array(LuticatePermissions::USER_ADD, LuticatePermissions::USER_GET));
-        $route->post("$prefix/users/$user_id/del", "${ns}LuticateUsersBusiness", "del",
+        $route->post("$prefix/users/$user_id/del", "${ns}LuticateUsersController", "del",
             array(LuticatePermissions::USER_DEL, LuticatePermissions::USER_GET));
-        $route->post("$prefix/users/$user_id/edit", "${ns}LuticateUsersBusiness", "edit",
+        $route->post("$prefix/users/$user_id/edit", "${ns}LuticateUsersController", "edit",
             array(LuticatePermissions::USER_EDIT, LuticatePermissions::USER_GET));
-        $route->post("$prefix/users/me/edit", "${ns}LuticateUsersBusiness", "editMe",
+        $route->post("$prefix/users/me/edit", "${ns}LuticateUsersController", "editMe",
             LuticatePermissions::USER_EDIT_ME);
-        $route->post("$prefix/users/$user_id/setPassword", "${ns}LuticateUsersBusiness", "setPassword",
+        $route->post("$prefix/users/$user_id/setPassword", "${ns}LuticateUsersController", "setPassword",
             array(LuticatePermissions::USER_SET_PASSWORD, LuticatePermissions::USER_GET));
-        $route->post("$prefix/users/me/setPassword", "${ns}LuticateUsersBusiness", "setPasswordMe",
+        $route->post("$prefix/users/me/setPassword", "${ns}LuticateUsersController", "setPasswordMe",
             LuticatePermissions::USER_SET_PASSWORD_ME);
 
 
-        $route->post("$prefix/groups/$id", "${ns}LuticateGroupsBusiness", "getById", LuticatePermissions::GROUP_GET);
-        $route->post("$prefix/groups", "${ns}LuticateGroupsBusiness", "getAll", LuticatePermissions::GROUP_GET);
-        $route->post("$prefix/groups/add", "${ns}LuticateGroupsBusiness", "add",
+        $route->get("$prefix/groups/$group_id", "${ns}LuticateGroupsController", "getById", LuticatePermissions::GROUP_GET);
+        $route->get("$prefix/groups", "${ns}LuticateGroupsController", "getAll", LuticatePermissions::GROUP_GET);
+        $route->post("$prefix/groups/add", "${ns}LuticateGroupsController", "add",
             array(LuticatePermissions::GROUP_ADD, LuticatePermissions::GROUP_GET));
-        $route->post("$prefix/groups/$group_id/del", "${ns}LuticateGroupsBusiness", "del",
+        $route->post("$prefix/groups/$group_id/del", "${ns}LuticateGroupsController", "del",
             array(LuticatePermissions::GROUP_DEL, LuticatePermissions::GROUP_GET));
-        $route->post("$prefix/groups/$group_id/edit", "${ns}LuticateGroupsBusiness", "edit",
+        $route->post("$prefix/groups/$group_id/edit", "${ns}LuticateGroupsController", "edit",
             array(LuticatePermissions::GROUP_EDIT, LuticatePermissions::GROUP_GET));
-        $route->post("$prefix/groups/$group_id/addUser/$user_id", "${ns}LuticateGroupsBusiness", "addUser",
+        $route->post("$prefix/groups/$group_id/addUser/$user_id", "${ns}LuticateGroupsController", "addUser",
             array(LuticatePermissions::GROUP_ADD_USER, LuticatePermissions::GROUP_GET));
-        $route->post("$prefix/groups/$group_id/delUser/$user_id", "${ns}LuticateGroupsBusiness", "delUser",
+        $route->post("$prefix/groups/$group_id/delUser/$user_id", "${ns}LuticateGroupsController", "delUser",
             array(LuticatePermissions::GROUP_DEL_USER, LuticatePermissions::GROUP_GET));
 
 
-        $route->post("$prefix/permissions/effective/$user_id/$permission_name", "${ns}LuticatePermissionsBusiness",
+        $route->get("$prefix/permissions/effective/$user_id/$permission_name", "${ns}LuticatePermissionsController",
             "getEffectivePermission", LuticatePermissions::PERM_EFFECTIVE_GET);
-        $route->post("$prefix/permissions/effective/me/$permission_name", "${ns}LuticatePermissionsBusiness",
+        $route->get("$prefix/permissions/effective/me/$permission_name", "${ns}LuticatePermissionsController",
             "getEffectivePermissionMe");
 
-        $route->post("$prefix/permissions/$permission_name", "${ns}LuticatePermissionsBusiness", "get",
+        $route->get("$prefix/permissions/$permission_name", "${ns}LuticatePermissionsController", "get",
             LuticatePermissions::PERM_GET);
-        $route->post("$prefix/permissions/add/$permission_name/$permission_value", "${ns}LuticatePermissionsBusiness",
+        $route->post("$prefix/permissions/add/$permission_name/$permission_value", "${ns}LuticatePermissionsController",
             "add", array(LuticatePermissions::PERM_ADD, LuticatePermissions::PERM_GET));
-        $route->post("$prefix/permissions/$permission_name/del", "${ns}LuticatePermissionsBusiness", "del",
+        $route->post("$prefix/permissions/$permission_name/del", "${ns}LuticatePermissionsController", "del",
             array(LuticatePermissions::PERM_DEL, LuticatePermissions::PERM_GET));
-        $route->post("$prefix/permissions/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsBusiness",
+        $route->post("$prefix/permissions/$permission_name/edit/$permission_value", "${ns}LuticatePermissionsController",
             "edit", array(LuticatePermissions::PERM_EDIT, LuticatePermissions::PERM_GET));
 
-        $route->post("$prefix/permissions/group/$group_id/$permission_name", "${ns}LuticatePermissionsGroupsBusiness",
+        $route->get("$prefix/permissions/group/$group_id/$permission_name", "${ns}LuticatePermissionsGroupsController",
             "get", LuticatePermissions::PERM_GROUP_GET);
         $route->post("$prefix/permissions/group/$group_id/add/$permission_name/$permission_value",
-            "${ns}LuticatePermissionsGroupsBusiness", "add", array(LuticatePermissions::PERM_GROUP_ADD,
+            "${ns}LuticatePermissionsGroupsController", "add", array(LuticatePermissions::PERM_GROUP_ADD,
                 LuticatePermissions::PERM_GROUP_GET));
         $route->post("$prefix/permissions/group/$group_id/$permission_name/del",
-            "${ns}LuticatePermissionsGroupsBusiness", "del", array(LuticatePermissions::PERM_GROUP_DEL,
+            "${ns}LuticatePermissionsGroupsController", "del", array(LuticatePermissions::PERM_GROUP_DEL,
                 LuticatePermissions::PERM_GROUP_GET));
         $route->post("$prefix/permissions/group/$group_id/$permission_name/edit/$permission_value",
-            "${ns}LuticatePermissionsGroupsBusiness", "edit", array(LuticatePermissions::PERM_GROUP_EDIT,
+            "${ns}LuticatePermissionsGroupsController", "edit", array(LuticatePermissions::PERM_GROUP_EDIT,
                 LuticatePermissions::PERM_GROUP_GET));
 
-        $route->post("$prefix/permissions/user/$user_id/$permission_name", "${ns}LuticatePermissionsUsersBusiness",
+        $route->post("$prefix/permissions/user/$user_id/$permission_name", "${ns}LuticatePermissionsUsersController",
             "get", LuticatePermissions::PERM_USER_GET);
         $route->post("$prefix/permissions/user/$user_id/add/$permission_name/$permission_value",
-            "${ns}LuticatePermissionsUsersBusiness", "add", array(LuticatePermissions::PERM_USER_ADD,
+            "${ns}LuticatePermissionsUsersController", "add", array(LuticatePermissions::PERM_USER_ADD,
                 LuticatePermissions::PERM_USER_GET));
-        $route->post("$prefix/permissions/user/$user_id/$permission_name/del", "${ns}LuticatePermissionsUsersBusiness",
+        $route->post("$prefix/permissions/user/$user_id/$permission_name/del", "${ns}LuticatePermissionsUsersController",
             "del", array(LuticatePermissions::PERM_USER_DEL, LuticatePermissions::PERM_USER_GET));
         $route->post("$prefix/permissions/user/$user_id/$permission_name/edit/$permission_value",
-            "${ns}LuticatePermissionsUsersBusiness", "edit", array(LuticatePermissions::PERM_USER_EDIT,
+            "${ns}LuticatePermissionsUsersController", "edit", array(LuticatePermissions::PERM_USER_EDIT,
                 LuticatePermissions::PERM_USER_GET));
     }
 }

src/Auth/Business/LuticateGroupsBusiness.php

@@ -30,11 +30,6 @@ class LuticateGroupsBusiness extends LuBusiness {
         return LuticateGroupsDataAccess::getByName($group_name);
     }
 
-    public static function getAll($page = 0, $perPage = PHP_INT_MAX)
-    {
-        return self::search($page, $perPage, "name", "ASC");
-    }
-
     public static function hasUser($user_id, $group_id)
     {
         return LuticateGroupsDataAccess::hasUser($user_id, $group_id);
@@ -84,7 +79,6 @@ class LuticateGroupsBusiness extends LuBusiness {
 
     public static function del($group_id)
     {
-        LuticateGroupsDataAccess::deleteById($group_id);
-        return true;
+        return LuticateGroupsDataAccess::deleteById($group_id);
     }
 }

src/Auth/Business/LuticateUsersBusiness.php

@@ -100,16 +100,6 @@ class LuticateUsersBusiness extends LuBusiness {
         return true;
     }
 
-    public static function getAll($page = 0, $perPage = PHP_INT_MAX)
-    {
-        $users = self::search($page, $perPage, "username", "ASC");
-        $usersLight = array();
-        foreach ($users as $user) {
-            $usersLight[] = LuticateUsersLightDbo::fromUserDbo($user);
-        }
-        return $usersLight;
-    }
-
     public static function add($username, $email, $password)
     {
         $hash = self::hashPassword($password);
@@ -152,11 +142,6 @@ class LuticateUsersBusiness extends LuBusiness {
         return true;
     }
 
-    public static function editMe($email, $user)
-    {
-        return self::edit($user->getId(), $email);
-    }
-
     public static function setPassword($user_id, $password)
     {
         if ($user_id != 0) {
@@ -173,9 +158,4 @@ class LuticateUsersBusiness extends LuBusiness {
         self::login($user->getUsername(), $oldPassword);
         return self::setPassword($user->getId(), $password);
     }
-
-    public static function del($user_id)
-    {
-        parent::deleteById($user_id);
-    }
 }

src/Auth/Controller/LuticateGroupsController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Luticate\Auth\Controller;
+
+use Luticate\Utils\LuController;
+use Luticate\Auth\Business\LuticateGroupsBusiness;
+use Luticate\Auth\DBO\LuticateGroupsDbo;
+
+class LuticateGroupsController extends LuController {
+    protected function getBusiness()
+    {
+        return new LuticateGroupsBusiness();
+    }
+
+    public function getById($group_id)
+    {
+        return LuticateGroupsBusiness::getById($group_id);
+    }
+
+    public function add($group_name)
+    {
+        return LuticateGroupsBusiness::add($group_name);
+    }
+
+    public function del($group_id)
+    {
+        return LuticateGroupsBusiness::del($group_id);
+    }
+
+    public function edit($group_id, $group_name)
+    {
+        return LuticateGroupsBusiness::edit($group_id, $group_name);
+    }
+
+    public function addUser($user_id, $group_id)
+    {
+        return LuticateGroupsBusiness::addUser($user_id, $group_id);
+    }
+
+    public static function delUser($user_id, $group_id)
+    {
+        return LuticateGroupsBusiness::delUser($user_id, $group_id);
+    }
+}

src/Auth/Controller/LuticatePermissionsController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Luticate\Auth\Controller;
+
+use Luticate\Utils\LuController;
+use Luticate\Auth\Business\LuticatePermissionsBusiness;
+use Luticate\Auth\DBO\LuticatePermissionsDbo;
+
+class LuticatePermissionsController extends LuController {
+    protected function getBusiness()
+    {
+        return new LuticatePermissionsBusiness();
+    }
+}

src/Auth/Controller/LuticatePermissionsGroupsController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Luticate\Auth\Controller;
+
+use Luticate\Utils\LuController;
+use Luticate\Auth\Business\LuticatePermissionsGroupsBusiness;
+use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
+
+class LuticatePermissionsGroupsController extends LuController {
+    protected function getBusiness()
+    {
+        return new LuticatePermissionsGroupsBusiness();
+    }
+}

src/Auth/Controller/LuticatePermissionsUsersController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Luticate\Auth\Controller;
+
+use Luticate\Utils\LuController;
+use Luticate\Auth\Business\LuticatePermissionsUsersBusiness;
+use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
+
+class LuticatePermissionsUsersController extends LuController {
+    protected function getBusiness()
+    {
+        return new LuticatePermissionsUsersBusiness();
+    }
+}

src/Auth/Controller/LuticateUsersController.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Luticate\Auth\Controller;
+
+use Luticate\Utils\LuController;
+use Luticate\Auth\Business\LuticateUsersBusiness;
+use Luticate\Auth\DBO\LuticateUsersDbo;
+
+class LuticateUsersController extends LuController {
+    protected function getBusiness()
+    {
+        return new LuticateUsersBusiness();
+    }
+
+    public function login($username, $password)
+    {
+        return LuticateUsersBusiness::login($username, $password);
+    }
+
+    public function logout($user)
+    {
+        return LuticateUsersBusiness::logout($user);
+    }
+
+    public function getById($user_id)
+    {
+        return LuticateUsersBusiness::getById($user_id);
+    }
+
+    public function add($username, $email, $password)
+    {
+        return LuticateUsersBusiness::add($username, $email, $password);
+    }
+
+    public function del($user_id)
+    {
+        return LuticateUsersBusiness::deleteById($user_id);
+    }
+
+    public function edit($email, $user_id)
+    {
+        return LuticateUsersBusiness::edit($user_id, $email);
+    }
+
+    public function editMe($email, $user)
+    {
+        return LuticateUsersBusiness::edit($user->getId(), $email);
+    }
+
+    public function setPassword($password, $user_id)
+    {
+        return LuticateUsersBusiness::setPassword($user_id, $password);
+    }
+
+    public function setPasswordMe($password, $oldPassword, $user)
+    {
+        return LuticateUsersBusiness::setPasswordMe($password, $oldPassword, $user);
+    }
+}