refractor

src/Auth/Business/LuticatePermissionsBusiness.php

@@ -39,8 +39,8 @@ class LuticatePermissionsBusiness extends LuBusiness {
     public static function getUserDynamicPermission($user_id, $permission_name, $action, $resource_id)
     {
         $dynamic_permission_name = "LU_DYN_" . $permission_name . "_" . $action . "_" . $resource_id;
-        $val = LuticatePermissionsDataAccess::getEffectivePermission($user_id, $dynamic_permission_name);
-        if (is_null($val)) {
+        $val = self::getEffectivePermission($user_id, $dynamic_permission_name);
+        if (is_null($val->getValue())) {
             return self::getEffectivePermission($user_id, $permission_name);
         }
         return $val;
@@ -48,7 +48,11 @@ class LuticatePermissionsBusiness extends LuBusiness {
 
     public static function get($permission_name)
     {
-        return LuticatePermissionsDataAccess::getByName($permission_name);
+        $perm = LuticatePermissionsDataAccess::getByName($permission_name);
+        if (is_null($perm)) {
+            self::notFound("Permission not found");
+        }
+        return $perm;
     }
 
     public static function add($permission_name, $permission_value)

src/Auth/Business/LuticatePermissionsGroupsBusiness.php

@@ -12,46 +12,53 @@ class LuticatePermissionsGroupsBusiness extends LuBusiness {
         return new LuticatePermissionsGroupsDataAccess();
     }
 
-    public static function get($group_id, $permission_name)
+    public static function checkPermissionGroupName($group_id, $permission_name)
     {
+        LuticateGroupsBusiness::checkGroupId($group_id);
+        LuticatePermissionsBusiness::checkPermissionName($permission_name);
         return LuticatePermissionsGroupsDataAccess::getByName($group_id, $permission_name);
     }
 
-    public static function add($group_id, $permission_name, $permission_value)
+    public static function get($group_id, $permission_name)
     {
-        LuticateGroupsBusiness::checkGroupId($group_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
-        $perm = LuticatePermissionsGroupsDataAccess::getByName($group_id, $permission_name);
+        $perm = self::checkPermissionGroupName($group_id, $permission_name);
         if (is_null($perm)) {
             $perm = new LuticatePermissionsGroupsDbo();
             $perm->setName($permission_name);
-            $perm->setValue($permission_value);
+            $perm->setValue(null);
             $perm->setGroupId($group_id);
-            LuticatePermissionsGroupsDataAccess::add($perm);
-            return true;
         }
-        self::badInput("Group permission already exists");
-        return false;
+        return $perm;
+    }
+
+    public static function add($group_id, $permission_name, $permission_value)
+    {
+        $perm = self::checkPermissionGroupName($group_id, $permission_name);
+        if (!is_null($perm)) {
+            self::badInput("Group permission already exists");
+        }
+        $perm = new LuticatePermissionsGroupsDbo();
+        $perm->setName($permission_name);
+        $perm->setValue($permission_value);
+        $perm->setGroupId($group_id);
+        LuticatePermissionsGroupsDataAccess::add($perm);
+        return true;
     }
 
     public static function del($group_id, $permission_name)
     {
-        LuticateGroupsBusiness::checkGroupId($group_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
+        self::checkPermissionGroupName($group_id, $permission_name);
         LuticatePermissionsGroupsDataAccess::delete($group_id, $permission_name);
         return true;
     }
 
     public static function edit($group_id, $permission_name, $permission_value)
     {
-        LuticateGroupsBusiness::checkGroupId($group_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
-        $perm = LuticatePermissionsGroupsDataAccess::getByName($group_id, $permission_name);
-        if (!is_null($perm)) {
-            LuticatePermissionsGroupsDataAccess::edit($group_id, $permission_name, $permission_value);
-            return true;
+        $perm = self::checkPermissionGroupName($group_id, $permission_name);
+        if (is_null($perm)) {
+            self::badInput("Permission not found");
         }
-        self::badInput("Permission not found");
-        return false;
+        LuticatePermissionsGroupsDataAccess::edit($group_id, $permission_name, $permission_value);
+        return true;
     }
 }

src/Auth/Business/LuticatePermissionsUsersBusiness.php

@@ -12,6 +12,13 @@ class LuticatePermissionsUsersBusiness extends LuBusiness {
         return new LuticatePermissionsUsersDataAccess();
     }
 
+    public static function checkPermissionUserName($user_id, $permission_name)
+    {
+        LuticateUsersBusiness::checkUserId($user_id);
+        LuticatePermissionsBusiness::checkPermissionName($permission_name);
+        return LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
+    }
+
     public static function get($user_id, $permission_name)
     {
         return LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
@@ -19,39 +26,32 @@ class LuticatePermissionsUsersBusiness extends LuBusiness {
 
     public static function add($user_id, $permission_name, $permission_value)
     {
-        LuticateUsersBusiness::checkUserId($user_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
-        $perm = LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
-        if (is_null($perm)) {
-            $perm = new LuticatePermissionsUsersDbo();
-            $perm->setName($permission_name);
-            $perm->setValue($permission_value);
-            $perm->setUserId($user_id);
-            LuticatePermissionsUsersDataAccess::add($perm);
-            return true;
+        $perm = self::checkPermissionUserName($user_id, $permission_name);
+        if (!is_null($perm)) {
+            self::badInput("User permission already exists");
         }
-        self::badInput("User permission already exists");
-        return false;
+        $perm = new LuticatePermissionsUsersDbo();
+        $perm->setName($permission_name);
+        $perm->setValue($permission_value);
+        $perm->setUserId($user_id);
+        LuticatePermissionsUsersDataAccess::add($perm);
+        return true;
     }
 
     public static function del($user_id, $permission_name)
     {
-        LuticateUsersBusiness::checkUserId($user_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
+        self::checkPermissionUserName($user_id, $permission_name);
         LuticatePermissionsUsersDataAccess::delete($user_id, $permission_name);
         return true;
     }
 
     public static function edit($user_id, $permission_name, $permission_value)
     {
-        LuticateUsersBusiness::checkUserId($user_id);
-        LuticatePermissionsBusiness::checkPermissionName($permission_name);
-        $perm = LuticatePermissionsUsersDataAccess::getByName($user_id, $permission_name);
-        if (!is_null($perm)) {
-            LuticatePermissionsUsersDataAccess::edit($user_id, $permission_name, $permission_value);
-            return true;
+        $perm = self::checkPermissionUserName($user_id, $permission_name);
+        if (is_null($perm)) {
+            self::badInput("Permission not found");
         }
-        self::badInput("Permission not found");
-        return false;
+        LuticatePermissionsUsersDataAccess::edit($user_id, $permission_name, $permission_value);
+        return true;
     }
 }