regenerated business and data access

src/Auth/Business/LuticateGroupsBusiness.php

@@ -7,8 +7,8 @@ use Luticate\Auth\DataAccess\LuticateGroupsDataAccess;
 use Luticate\Auth\DBO\LuticateGroupsDbo;
 
 class LuticateGroupsBusiness extends LuBusiness {
-    public function __construct()
+    protected static function getDataAccess()
     {
-        $this->dataAccess = new LuticateGroupsDataAccess();
+        return new LuticateGroupsDataAccess();
     }
 }

src/Auth/Business/LuticatePermissionsBusiness.php

@@ -7,9 +7,9 @@ use Luticate\Auth\DataAccess\LuticatePermissionsDataAccess;
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
 
 class LuticatePermissionsBusiness extends LuBusiness {
-    public function __construct()
+    protected static function getDataAccess()
     {
-        $this->dataAccess = new LuticatePermissionsDataAccess();
+        return new LuticatePermissionsDataAccess();
     }
 
     public static function getUserPermission($user_id, $permission_name)

src/Auth/Business/LuticatePermissionsGroupsBusiness.php

@@ -7,8 +7,8 @@ use Luticate\Auth\DataAccess\LuticatePermissionsGroupsDataAccess;
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
 
 class LuticatePermissionsGroupsBusiness extends LuBusiness {
-    public function __construct()
+    protected static function getDataAccess()
     {
-        $this->dataAccess = new LuticatePermissionsGroupsDataAccess();
+        return new LuticatePermissionsGroupsDataAccess();
     }
 }

src/Auth/Business/LuticatePermissionsUsersBusiness.php

@@ -7,8 +7,8 @@ use Luticate\Auth\DataAccess\LuticatePermissionsUsersDataAccess;
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
 
 class LuticatePermissionsUsersBusiness extends LuBusiness {
-    public function __construct()
+    protected static function getDataAccess()
     {
-        $this->dataAccess = new LuticatePermissionsUsersDataAccess();
+        return new LuticatePermissionsUsersDataAccess();
     }
 }

src/Auth/Business/LuticateUsersBusiness.php

@@ -15,9 +15,9 @@ class LuticateUsersBusiness extends LuBusiness {
 
     const TOKEN_HEADER = "X-Authentication";
 
-    public function __construct()
+    protected static function getDataAccess()
     {
-        $this->dataAccess = new LuticateUsersDataAccess();
+        return new LuticateUsersDataAccess();
     }
 
     public static function getCurrentUser()
@@ -37,7 +37,7 @@ class LuticateUsersBusiness extends LuBusiness {
             $data = JwtHelper::decode($token);
             if ($data != null) {
                 $user_id = $data[JwtHelper::USER_KEY];
-                self::$_currentUser = LuticateUsersBusiness::getById($user_id);
+                self::$_currentUser = self::getById($user_id);
             }
         }
 
@@ -46,7 +46,8 @@ class LuticateUsersBusiness extends LuBusiness {
         }
 
         foreach ($permissions as $permission) {
-            if (!LuticatePermissionsBusiness::getUserPermission(self::$_currentUser->getId(), $permission)) {
+            $value = LuticatePermissionsBusiness::getUserPermission(self::$_currentUser->getId(), $permission);
+            if (!$value->getVal()) {
                 return false;
             }
         }

src/Auth/DataAccess/LuticateGroupsDataAccess.php

@@ -7,9 +7,8 @@ use Luticate\Auth\DataAccess\Models\LuticateGroups;
 use Luticate\Auth\DBO\LuticateGroupsDbo;
 
 class LuticateGroupsDataAccess extends LuDataAccess {
-    public function __construct()
+    protected static function getModel()
     {
-        parent::__construct();
-        $this->model = new LuticateGroups();
+        return new LuticateGroups();
     }
 }

src/Auth/DataAccess/LuticatePermissionsDataAccess.php

@@ -8,10 +8,9 @@ use Luticate\Auth\DataAccess\Models\LuticatePermissions;
 use Luticate\Auth\DBO\LuticatePermissionsDbo;
 
 class LuticatePermissionsDataAccess extends LuDataAccess {
-    public function __construct()
+    protected static function getModel()
     {
-        parent::__construct();
-        $this->model = new LuticatePermissions();
+        return new LuticatePermissions();
     }
 
     public static function getUserPermission($user_id, $permission_name)

src/Auth/DataAccess/LuticatePermissionsGroupsDataAccess.php

@@ -7,9 +7,8 @@ use Luticate\Auth\DataAccess\Models\LuticatePermissionsGroups;
 use Luticate\Auth\DBO\LuticatePermissionsGroupsDbo;
 
 class LuticatePermissionsGroupsDataAccess extends LuDataAccess {
-    public function __construct()
+    protected static function getModel()
     {
-        parent::__construct();
-        $this->model = new LuticatePermissionsGroups();
+        return new LuticatePermissionsGroups();
     }
 }

src/Auth/DataAccess/LuticatePermissionsUsersDataAccess.php

@@ -7,9 +7,8 @@ use Luticate\Auth\DataAccess\Models\LuticatePermissionsUsers;
 use Luticate\Auth\DBO\LuticatePermissionsUsersDbo;
 
 class LuticatePermissionsUsersDataAccess extends LuDataAccess {
-    public function __construct()
+    protected static function getModel()
     {
-        parent::__construct();
-        $this->model = new LuticatePermissionsUsers();
+        return new LuticatePermissionsUsers();
     }
 }

src/Auth/DataAccess/LuticateUsersDataAccess.php

@@ -7,9 +7,8 @@ use Luticate\Auth\DataAccess\Models\LuticateUsers;
 use Luticate\Auth\DBO\LuticateUsersDbo;
 
 class LuticateUsersDataAccess extends LuDataAccess {
-    public function __construct()
+    protected static function getModel()
     {
-        parent::__construct();
-        $this->model = new LuticateUsers();
+        return new LuticateUsers();
     }
 }