arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix service google sheet, add uemail to profile, fix detail pbg view, backupdb local last migrate, create menu and role request

Browse Source
This commit is contained in:
arifal
2025-02-14 16:22:34 +07:00
parent 4d32d4a110
commit 625d182d81
14 changed files with 1380 additions and 1002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/PbgTaskController.php
View File

@@ -242,7 +242,7 @@ class PbgTaskController extends Controller
$total_data = count($mapToUpsert);
$import_datasource->update([
"message" => "Successfully imported {$total_data}",
"message" => "Successfully processed: {$total_data}",
"status" => ImportDatasourceStatus::Success->value,
]);

33
app/Http/Controllers/MenusController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Http\Requests\MenuRequest;
use App\Models\Menu;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@@ -28,24 +29,12 @@ class MenusController extends Controller
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
public function store(MenuRequest $request)
{
try{
$request->validate([
'name' => 'required|string|max:255',
'url' => 'nullable|string|max:255',
'icon' => 'nullable|string|max:255',
'parent_id' => 'nullable|exists:menus,id', // Ensures it's either null or a valid menu ID
'sort_order' => 'required|integer',
]);
$validated_menu = $request->validated();
DB::beginTransaction();
Menu::create([
'name' => $request->name,
'url' => $request->url,
'icon' => $request->icon,
'parent_id' => $request->parent_id ?? null,
'sort_order' => $request->sort_order,
]);
Menu::create($validated_menu);
DB::commit();
return response()->json(['message' => 'Successfully created'], 200);
}catch(\Exception $e){
@@ -77,21 +66,13 @@ class MenusController extends Controller
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
public function update(MenuRequest $request, string $id)
{
try{
$validateData = $request->validate([
'name' => 'required',
'url'=> 'required',
'icon'=> 'nullable',
'parent_id' => 'nullable',
'sort_order' => 'required',
]);
$validate_menu = $request->validated();
$menu = Menu::findOrFail($id);
DB::beginTransaction();
$menu->update($validateData);
$menu->update($validate_menu);
DB::commit();
return response()->json(['message' => 'Successfully updated'], 200);
}catch(\Exception $e){

22
app/Http/Controllers/RolesController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use App\Http\Requests\RoleRequest;
use App\Models\Menu;
use App\Models\Role;
use App\Models\RoleMenu;
@@ -31,16 +32,13 @@ class RolesController extends Controller
/**
* Store a newly created resource in storage.
*/
public function store(Request $request)
public function store(RoleRequest $request)
{
try{
$request->validate([
"name" => "required|unique:roles,name",
"description" => "nullable",
]);
$validate_role = $request->validated();
DB::beginTransaction();
Role::create($request->all());
Role::create($validate_role);
DB::commit();
return response()->json(['message' => 'Role created successfully'], 201);
}
@@ -70,18 +68,14 @@ class RolesController extends Controller
/**
* Update the specified resource in storage.
*/
public function update(Request $request, string $id)
public function update(RoleRequest $request, string $id)
{
try{
$validate_role = $request->validated();
$role = Role::findOrFail($id);
// Validate request data
$validatedData = $request->validate([
'name' => 'required|string|max:255|unique:roles,name,' . $id, // Ensure name is unique except for the current role
'description' => 'nullable|string|max:500',
]);
DB::beginTransaction();
$role->update($validatedData);
$role->update($validate_role);
DB::commit();
return response()->json(['message' => 'Role updated successfully'], 200);
}catch(\Exception $e){
@@ -97,7 +91,7 @@ class RolesController extends Controller
{
try{
DB::beginTransaction();
$deleted = Role::findOrFail($id)->delete();
Role::findOrFail($id)->delete();
DB::commit();
return response()->json(['success' => true, "message" => "Successfully deleted"]);
}catch(\Exception $e){