Skip to content

A free open source IT asset/license management system

Updated observer to skip deleted_at-only changes

snipea3efd800984a
diff --git a/app/Observers/AccessoryObserver.php b/app/Observers/AccessoryObserver.php
index 359b7826fd..de6c92ffcf 100644
--- a/app/Observers/AccessoryObserver.php
+++ b/app/Observers/AccessoryObserver.php
@@ -2,8 +2,10 @@
namespace App\Observers;
+use App\Enums\CheckoutRequestState;
use App\Models\Accessory;
use App\Models\Actionlog;
+use App\Models\CheckoutRequest;
class AccessoryObserver
{
@@ -20,6 +22,15 @@ class AccessoryObserver
if ($key === 'updated_at') {
continue;
}
+ // SoftDeletes drives the delete + restore flows through
+ // save(), which fires `updated` with deleted_at as the
+ // changed field. The `deleting`/`restored` observers log
+ // those actions directly, so excluding deleted_at here
+ // keeps us from double-logging a "delete" plus an "update"
+ // row that only shows the deleted_at diff.
+ if ($key === 'deleted_at') {
+ continue;
+ }
if ($accessory->getRawOriginal()[$key] != $accessory->getAttributes()[$key]) {
$changed[$key]['old'] = $accessory->getRawOriginal()[$key];
$changed[$key]['new'] = $accessory->getAttributes()[$key];
@@ -35,6 +46,15 @@ class AccessoryObserver
$logAction->log_meta = json_encode($changed);
$logAction->logaction('update');
}
+
+ // Archive-time request cleanup.
+ if ($accessory->wasChanged('archived') && $accessory->archived) {
+ $accessory->openRequests()->get()->each(function (CheckoutRequest $request): void {
+ $request->canceled_at = now();
+ $request->state = CheckoutRequestState::Canceled;
+ $request->saveQuietly();
+ });
+ }
}
/**