A free open source IT asset/license management system
move helper query to eager load in the asset api
Godfrey Maaf9372474ca
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.phpindex 74dab8b99c..ee0b2ad844 100644--- a/app/Helpers/Helper.php+++ b/app/Helpers/Helper.php@@ -1583,20 +1583,6 @@ class Helper'he-IL']) ? 'rtl' : 'ltr';}- public static function getAssetFirstCheckout($assetId) {-- if (!$assetId) {- return null;- }- $first_checkout = Actionlog::where('item_id', $assetId)- ->where('item_type', Asset::class)- ->where('action_type', 'checkout')- ->oldest('created_at')- ->first();-- return self::getFormattedDateObject($first_checkout?->created_at, 'datetime');- }-static public function getRedirectOption($request, $id, $table, $item_id = null) : RedirectResponse{diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex cfdefcba70..58043f127b 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -15,6 +15,7 @@ use App\Http\Transformers\ComponentsTransformer;use App\Http\Transformers\LicensesTransformer;use App\Http\Transformers\SelectlistTransformer;use App\Models\AccessoryCheckout;+use App\Models\Actionlog;use App\Models\Asset;use App\Models\AssetModel;use App\Models\CheckoutAcceptance;@@ -153,6 +154,15 @@ class AssetsController extends Controller}$assets = Asset::select('assets.*')+ ->addSelect([+ 'first_checkout_at' => Actionlog::query()+ ->select('created_at')+ ->whereColumn('item_id', 'assets.id')+ ->where('item_type', Asset::class)+ ->where('action_type', 'checkout')+ ->orderBy('created_at')+ ->limit(1),+ ])->with('model','location',diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.phpindex 15278380d9..d971aff00c 100644--- a/app/Http/Transformers/AssetsTransformer.php+++ b/app/Http/Transformers/AssetsTransformer.php@@ -104,7 +104,7 @@ class AssetsTransformer'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'),'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'),'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),- 'first_checkout' => Helper::getAssetFirstCheckout($asset->id),+ 'first_checkout' => Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime'),'age' => $asset->purchase_date ? $asset->purchase_date->locale(app()->getLocale())->diffForHumans() : '','last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 1453920bee..fc35d2fa23 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -158,7 +158,8 @@ class AssetPresenter extends Presenter'visible' => false,'title' => trans('general.first_checkout'),'formatter' => 'dateDisplayFormatter',- ], [+ ],+ ['field' => 'age','searchable' => false,'sortable' => false,