From 6bb424b6fd63342cae93f2f5d8005e310ff8a15b Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Thu, 7 Dec 2023 16:10:25 +0700
Subject: [PATCH] update validation name

---
 app/Http/Controllers/DivisiController.php | 81 ++++++++++++-----------
 app/Http/Controllers/RoleController.php   | 71 ++++++++++----------
 2 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/app/Http/Controllers/DivisiController.php b/app/Http/Controllers/DivisiController.php
index 2d056aa..d46c927 100644
--- a/app/Http/Controllers/DivisiController.php
+++ b/app/Http/Controllers/DivisiController.php
@@ -8,21 +8,23 @@ use App\Models\Divisi;
 class DivisiController extends Controller
 {
 
-	private function getAllChildren($divisi, $depth = 0, $array = []) {
+	private function getAllChildren($divisi, $depth = 0, $array = [])
+	{
 		$divisi->depth = $depth;
 		array_push($array, $divisi);
-		foreach($divisi->children as $child){
+		foreach ($divisi->children as $child) {
 			$array = $this->getAllChildren($child, $depth + 1, $array);
 		}
 		return $array;
 	}
 
-	public function add(Request $request){
+	public function add(Request $request)
+	{
 		$this->validate($request, [
-			'name'          => 'string|required|unique:m_divisi,name',
+			'name'        => 'string|required|unique:m_divisi,name,NULL,id,company_id,' . $request->input('company_id'),
 			'description'   => 'nullable|string',
 			'parent'   => 'nullable|integer',
-            'color'=>'nullable|string|max:10'
+			'color' => 'nullable|string|max:10'
 		]);
 
 		$data = $request->all();
@@ -30,15 +32,16 @@ class DivisiController extends Controller
 
 		$result = Divisi::create($data);
 
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=>'Failed to add data','code'=> 500]);
+		if (!$result)
+			return response()->json(['status' => 'failed', 'message' => 'Failed to add data', 'code' => 500]);
 
-		return response()->json(['status'=>'success','message'=>'Data created!','code'=>200]);
+		return response()->json(['status' => 'success', 'message' => 'Data created!', 'code' => 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);
+	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',
@@ -47,46 +50,46 @@ class DivisiController extends Controller
 		]);
 		$data = Divisi::find($id);
 
-		$request->name !== $data['name'] ? $this->validate($request,['name'=>'unique:m_divisi,name']) : '';
+		$request->name !== $data['name'] ? $this->validate($request, ['name' => 'unique:m_divisi,name']) : '';
 
-		if(!$data)
-			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);
+		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'=> 'Update failed!','code'=> 500], 500);
+		if (!$result)
+			return response()->json(['status' => 'failed', 'message' => 'Update failed!', 'code' => 500], 500);
 
-		return response()->json(['status'=>'success','message'=>'Data added!','code'=>200], 200);
+		return response()->json(['status' => 'success', 'message' => 'Data added!', '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);
+		if (empty($id) || !is_int((int)$id))
+			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
 		$data = Divisi::find($id);
 
-		if(!$data)
-			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);
+		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'=> 'Delete failed!','code'=> 500], 500);
+		if (!$delete)
+			return response()->json(['status' => 'failed', 'message' => 'Delete failed!', 'code' => 500], 500);
 
-		return response()->json(['status'=>'success','message'=> 'Data deleted!','code'=> 200], 200);
+		return response()->json(['status' => 'success', 'message' => 'Data deleted!', 'code' => 200], 200);
 	}
 
 	public function search(Request $request)
-    {
-        $payload = $request->all();
-        $dataBuilder = $this->setUpPayload($payload, 'm_divisi');
-        $builder = $dataBuilder['builder'];
-        $countBuilder = $dataBuilder['count'];
-        $dataGet = $builder->get();
-        $totalRecord = $countBuilder->count();
-        return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
+	{
+		$payload = $request->all();
+		$dataBuilder = $this->setUpPayload($payload, 'm_divisi');
+		$builder = $dataBuilder['builder'];
+		$countBuilder = $dataBuilder['count'];
+		$dataGet = $builder->get();
+		$totalRecord = $countBuilder->count();
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 		//return $this->list();
 		// cant use builder for this case
 	}
@@ -95,20 +98,20 @@ class DivisiController extends Controller
 	{
 		$parentMenus = Divisi::whereNull('parent')->with('children')->get();
 		$divisions = [];
-		foreach($parentMenus as $menu){
+		foreach ($parentMenus as $menu) {
 			$childs = $this->getAllChildren($menu);
-			foreach($childs as $d){
+			foreach ($childs as $d) {
 				$d->displayName = ' ' . $d->name;
-				for($i=0; $i < $d->depth; $i++){
-					$d->displayName = '--' . $d->displayName ;
+				for ($i = 0; $i < $d->depth; $i++) {
+					$d->displayName = '--' . $d->displayName;
 				}
 				array_push($divisions, $d);
 			}
 		}
 		$countData = count($divisions);
-		if($countData == 0)
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
+		if ($countData == 0)
+			return response()->json(['status' => 'failed', 'message' => 'Data not found!', 'code' => 404], 404);
 
-		return response()->json(['status'=>'success','code'=>200,'data'=> $divisions, 'totalRecord'=> $countData], 200);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $divisions, 'totalRecord' => $countData], 200);
 	}
 }
diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index 57b8c58..7e6dbde 100644
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -11,76 +11,77 @@ class RoleController extends Controller
 	public function add(Request $request)
 	{
 		$this->validate($request, [
-			'name' => 'string|required|unique:m_roles,name',
+			'name'        => 'string|required|unique:m_roles,name,NULL,id,company_id,' . $request->input('company_id'),
 			'description' => 'required'
 		]);
 
 		$data = $request->all();
 
 		$data['created_by'] = $this->currentName;
-        if (!isset($data['default_page'])) {
-            $data['default_page'] = 29; // dashboard
-        }
+		if (!isset($data['default_page'])) {
+			$data['default_page'] = 29; // dashboard
+		}
 
 		$result = Role::create($data);
 
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=>'Failed to add data!','code'=>500], 500);
+		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);
+		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);
+	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);
+		if (!$result)
+			return response()->json(['status' => 'failed', 'message' => 'Data not found!', 'code' => 404], 404);
 
-		return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
+		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);
+		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'
+		$this->validate($request, [
+			'name' => 'string|required',
+			'description' => 'required'
 		]);
 		$data = Role::find($id);
-		$request->name !== $data['name'] ? $this->validate($request,['name'=>'unique:m_roles,name']) : '';
+		$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);
+		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);
+		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);
+		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);
+		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);
+		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);
+		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);
+		return response()->json(['status' => 'success', 'message' => 'Data deleted!', 'code' => 200], 200);
 	}
 
 	public function search(Request $request)
@@ -93,7 +94,7 @@ class RoleController extends Controller
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
 
-		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 	}
 
 	public function list()
@@ -101,9 +102,9 @@ class RoleController extends Controller
 		$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);
+		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);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $data, 'totalRecord' => $countData], 200);
 	}
 }