From 7852d78e5eeccdcabc7760db612c4cbf6f834bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <david@sudomail.ne.jp>
Date: Wed, 14 Feb 2018 18:11:36 +0900
Subject: [PATCH] Made permission API calls more generic.

---
 app/Http/Controllers/PermissionController.php | 34 ++++---------------
 routes/web.php                                |  9 ++---
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
index a99a4bf..653b7ba 100644
--- a/app/Http/Controllers/PermissionController.php
+++ b/app/Http/Controllers/PermissionController.php
@@ -20,43 +20,23 @@ class PermissionController extends Controller {
             ->get();
     }
 
-    public function getStorePermissions() { // /api/rpc/permission/getstorepermissions
-        return DB::table('str_permissions')
+    public function getPermissions($mdl) { // /api/rpc/permission/getpermissions/mdl
+        return DB::table($mdl.'_permissions')
             ->select('*')
             ->get();
     }
 
-    public function getStorePermissionGroup($id) { // /api/rpc/permission/getstorepermissiongroup/id
-        return DB::table('str_permissions')
+    public function getPermissionGroup($mdl, $id) { // /api/rpc/permission/getpermissiongroup/mdl/id
+        return DB::table($mdl.'_permissions')
             ->select('*')
             ->where('id', $id)
             ->get();
     }
 
-    public function getStorePermissionUser($id) { // /api/rpc/permission/getstorepermissionuser/id
-        return DB::table('str_user_permissions')
+    public function getPermissionUser($mdl, $id) { // /api/rpc/permission/getpermissionuser/mdl/id
+        return DB::table($mdl.'_user_permissions')
             ->select('*')
-            ->where('id', $id)
-            ->get();
-    }
-
-    public function getUserPermissions() { // /api/rpc/permission/getuserpermissions
-        return DB::table('usr_permissions')
-            ->select('*')
-            ->get();
-    }
-
-    public function getUserPermissionGroup($id) { // /api/rpc/permission/getuserpermissiongroup/id
-        return DB::table('usr_permissions')
-            ->select('*')
-            ->where('id', $id)
-            ->get();
-    }
-
-    public function getUserPermissionUser($id) { // /api/rpc/permission/getuserpermissionuser/id
-        return DB::table('usr_user_permissions')
-            ->select('*')
-            ->where('id', $id)
+            ->where('user_id', $id)
             ->get();
     }
 }
diff --git a/routes/web.php b/routes/web.php
index c87abd1..19b739f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,9 +22,6 @@ require(__DIR__.'/class/user.php');
 // Permissions
 Route::get('/api/rpc/permission/getpermissionsfrommodule', 'PermissionController@getPermissionsFromModule');
 Route::get('/api/rpc/permission/getpermissionfrommodule/{id}', 'PermissionController@getPermissionFromModule');
-Route::get('/api/rpc/permission/getstorepermissions', 'PermissionController@getStorePermissions');
-Route::get('/api/rpc/permission/getstorepermissiongroup/{id}', 'PermissionController@getStorePermissionGroup');
-Route::get('/api/rpc/permission/getstorepermissionuser/{id}', 'PermissionController@getStorePermissionUser');
-Route::get('/api/rpc/permission/getuserpermissions', 'PermissionController@getUserPermissions');
-Route::get('/api/rpc/permission/getuserpermissiongroup/{id}', 'PermissionController@getUserPermissionGroup');
-Route::get('/api/rpc/permission/getuserpermissionuser/{id}', 'PermissionController@getUserPermissionUser');
+Route::get('/api/rpc/permission/getpermissions/{mdl}', 'PermissionController@getPermissions');
+Route::get('/api/rpc/permission/getpermissiongroup/{mdl}/{id}', 'PermissionController@getPermissionGroup');
+Route::get('/api/rpc/permission/getpermissionuser/{mdl}/{id}', 'PermissionController@getPermissionUser');