From 4ee5a4c5c3fec3c376b8868e2c567c7c2fea6463 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 11 Feb 2025 00:31:50 +0000 Subject: [PATCH] Added notes to API controllers Signed-off-by: snipe --- app/Http/Controllers/Api/CategoriesController.php | 2 ++ app/Http/Controllers/Api/CompaniesController.php | 1 + app/Http/Controllers/Api/DepartmentsController.php | 5 +++-- app/Http/Controllers/Api/GroupsController.php | 4 +++- app/Http/Controllers/Api/LocationsController.php | 3 +++ app/Http/Controllers/Api/ManufacturersController.php | 4 +++- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index e772bec4df..319b51dd11 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -39,6 +39,7 @@ class CategoriesController extends Controller 'components_count', 'licenses_count', 'image', + 'notes', ]; $categories = Category::select([ @@ -52,6 +53,7 @@ class CategoriesController extends Controller 'require_acceptance', 'checkin_email', 'image', + 'notes', ]) ->with('adminuser') ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count'); diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php index 5ba342db33..2f1f0740b3 100644 --- a/app/Http/Controllers/Api/CompaniesController.php +++ b/app/Http/Controllers/Api/CompaniesController.php @@ -38,6 +38,7 @@ class CompaniesController extends Controller 'accessories_count', 'consumables_count', 'components_count', + 'notes', ]; $companies = Company::withCount(['assets as assets_count' => function ($query) { diff --git a/app/Http/Controllers/Api/DepartmentsController.php b/app/Http/Controllers/Api/DepartmentsController.php index a7b30a10fc..167d5cbc2a 100644 --- a/app/Http/Controllers/Api/DepartmentsController.php +++ b/app/Http/Controllers/Api/DepartmentsController.php @@ -23,7 +23,7 @@ class DepartmentsController extends Controller public function index(Request $request) : JsonResponse | array { $this->authorize('view', Department::class); - $allowed_columns = ['id', 'name', 'image', 'users_count']; + $allowed_columns = ['id', 'name', 'image', 'users_count', 'notes']; $departments = Department::select( 'departments.id', @@ -35,7 +35,8 @@ class DepartmentsController extends Controller 'departments.manager_id', 'departments.created_at', 'departments.updated_at', - 'departments.image' + 'departments.image', + 'departments.notes', )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count'); if ($request->filled('search')) { diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index 81217ce8db..5f2e222c70 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -24,7 +24,7 @@ class GroupsController extends Controller $this->authorize('view', Group::class); - $groups = Group::select('id', 'name', 'permissions', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count'); + $groups = Group::select('id', 'name', 'permissions', 'notes', 'created_at', 'updated_at', 'created_by')->with('adminuser')->withCount('users as users_count'); if ($request->filled('search')) { $groups = $groups->TextSearch($request->input('search')); @@ -81,6 +81,7 @@ class GroupsController extends Controller $group->name = $request->input('name'); $group->created_by = auth()->id(); + $group->notes = $request->input('notes'); $group->permissions = json_encode($request->input('permissions', $groupPermissions)); if ($group->save()) { @@ -118,6 +119,7 @@ class GroupsController extends Controller $group = Group::findOrFail($id); $group->name = $request->input('name'); + $group->notes = $request->input('notes'); $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here if ($group->save()) { diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php index f4f788d563..53990e9a97 100644 --- a/app/Http/Controllers/Api/LocationsController.php +++ b/app/Http/Controllers/Api/LocationsController.php @@ -53,6 +53,7 @@ class LocationsController extends Controller 'updated_at', 'users_count', 'zip', + 'notes', ]; $locations = Location::with('parent', 'manager', 'children')->select([ @@ -73,6 +74,7 @@ class LocationsController extends Controller 'locations.image', 'locations.ldap_ou', 'locations.currency', + 'locations.notes', ]) ->withCount('assignedAssets as assigned_assets_count') ->withCount('assets as assets_count') @@ -190,6 +192,7 @@ class LocationsController extends Controller 'locations.updated_at', 'locations.image', 'locations.currency', + 'locations.notes', ]) ->withCount('assignedAssets as assigned_assets_count') ->withCount('assets as assets_count') diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index f716fbbf7f..652fad1cfc 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -39,7 +39,8 @@ class ManufacturersController extends Controller 'assets_count', 'consumables_count', 'components_count', - 'licenses_count' + 'licenses_count', + 'notes', ]; $manufacturers = Manufacturer::select([ @@ -55,6 +56,7 @@ class ManufacturersController extends Controller 'updated_at', 'image', 'deleted_at', + 'notes', ]) ->with('adminuser') ->withCount('assets as assets_count')