diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index b420107..4a29066 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -1,101 +1,106 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Models\Role;
-
-class RoleController extends Controller
-{
-
-	public function add(Request $request)
-	{
-		$this->validate($request, [
-			'name' => 'required',
-			'description' => 'required'
-		]);
-
-		$data = $request->all();
-
-		$data['created_by'] = $this->currentName;
-
-		$result = Role::create($data);
-
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=>'Failed to add data!','code'=>500], 500);
-
-		return response()->json(['status'=>'success','message'=>'Data added!','code'=>200], 200);
-	}
-
-	public function edit( $id){
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$result = Role::find($id);
-
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
-
-		return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
-	}
-
-	public function update(Request $request, $id)
-	{
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$data = Role::find($id);
-
-		if(!$data)
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
-
-		$result = $data->update($request->all());
-
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=>'Failed to update the data!','code'=>500], 500);
-
-		return response()->json(['status'=>'success','message'=>'Data updated!','code'=>200], 200);
-	}
-
-	public function delete($id)
-	{
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$data = Role::find($id);
-
-		if(!$data)
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
-
-		$delete = $data->delete();
-
-		if(!$delete)
-			return response()->json(['status'=>'failed','message'=>'Failed to delete!','code'=>500], 500);
-
-		return response()->json(['status'=>'success','message'=>'Data deleted!','code'=>200], 200);
-	}
-
-	public function search(Request $request)
-	{
-		$payload = $request->all();
-
-		$dataBuilder = $this->setUpPayload($payload, 'm_roles');
-		$builder = $dataBuilder['builder'];
-		$countBuilder = $dataBuilder['count'];
-		$dataGet = $builder->get();
-		$totalRecord = $countBuilder->count();
-
-		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-	}
-
-	public function list()
-	{
-		$data = Role::all();
-		$countData = $data->count();
-
-		if(!$data)
-			return response()->json(['status'=>'failed','message'=>'failed get list role, please try again later!','code'=>400], 400);
-
-		return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
-	}
-}
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Role;
+
+class RoleController extends Controller
+{
+
+	public function add(Request $request)
+	{
+		$this->validate($request, [
+			'name' => 'string|required|unique:m_roles,name',
+			'description' => 'required'
+		]);
+
+		$data = $request->all();
+
+		$data['created_by'] = $this->currentName;
+
+		$result = Role::create($data);
+
+		if(!$result)
+			return response()->json(['status'=>'failed','message'=>'Failed to add data!','code'=>500], 500);
+
+		return response()->json(['status'=>'success','message'=>'Data added!','code'=>200], 200);
+	}
+
+	public function edit( $id){
+		if(empty($id) || !is_int((int)$id))
+			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+
+		$result = Role::find($id);
+
+		if(!$result)
+			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
+
+		return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
+	}
+
+	public function update(Request $request, $id)
+	{
+		if(empty($id) || !is_int((int)$id))
+			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+
+        $this->validate($request, [
+            'name' => 'string|required',
+            'description' => 'required'
+		]);
+		$data = Role::find($id);
+		$request->name !== $data['name'] ? $this->validate($request,['name'=>'unique:m_roles,name']) : '';
+
+		if(!$data)
+			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
+
+		$result = $data->update($request->all());
+
+		if(!$result)
+			return response()->json(['status'=>'failed','message'=>'Failed to update the data!','code'=>500], 500);
+
+		return response()->json(['status'=>'success','message'=>'Data updated!','code'=>200], 200);
+	}
+
+	public function delete($id)
+	{
+		if(empty($id) || !is_int((int)$id))
+			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+
+		$data = Role::find($id);
+
+		if(!$data)
+			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=>404], 404);
+
+		$delete = $data->delete();
+
+		if(!$delete)
+			return response()->json(['status'=>'failed','message'=>'Failed to delete!','code'=>500], 500);
+
+		return response()->json(['status'=>'success','message'=>'Data deleted!','code'=>200], 200);
+	}
+
+	public function search(Request $request)
+	{
+		$payload = $request->all();
+
+		$dataBuilder = $this->setUpPayload($payload, 'm_roles');
+		$builder = $dataBuilder['builder'];
+		$countBuilder = $dataBuilder['count'];
+		$dataGet = $builder->get();
+		$totalRecord = $countBuilder->count();
+
+		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
+	}
+
+	public function list()
+	{
+		$data = Role::all();
+		$countData = $data->count();
+
+		if(!$data)
+			return response()->json(['status'=>'failed','message'=>'failed get list role, please try again later!','code'=>400], 400);
+
+		return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
+	}
+}