From c5fc2693ed8f365e84f631ae0dbf6449a0e45711 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Mon, 29 Dec 2025 20:23:29 +0800
Subject: [PATCH] Hotfix: Invalidate model cache on bulk delete operations

---
 composer.json                      | 2 +-
 src/Traits/HasApiModelBehavior.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 3c7e912..6267b1f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.31",
+    "version": "1.6.32",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",
diff --git a/src/Traits/HasApiModelBehavior.php b/src/Traits/HasApiModelBehavior.php
index 8b63d20..bd1a2b2 100644
--- a/src/Traits/HasApiModelBehavior.php
+++ b/src/Traits/HasApiModelBehavior.php
@@ -2,6 +2,7 @@
 
 namespace Fleetbase\Traits;
 
+use Fleetbase\Support\ApiModelCache;
 use Fleetbase\Support\Auth;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\QueryOptimizer;
@@ -63,15 +64,13 @@ protected function invalidateApiCacheOnChange(): void
         }
 
         // Get company UUID if available
-        $companyUuid = null;
+        $companyUuid = session('company');
         if (isset($this->company_uuid)) {
             $companyUuid = $this->company_uuid;
         }
 
         // Use ApiModelCache if available
-        if (class_exists('\Fleetbase\Support\ApiModelCache')) {
-            \Fleetbase\Support\ApiModelCache::invalidateModelCache($this, $companyUuid);
-        }
+        ApiModelCache::invalidateModelCache($this, $companyUuid);
     }
 
     /**
@@ -439,6 +438,7 @@ public function bulkRemove($ids = [])
 
         try {
             $records->delete();
+            $this->invalidateApiCacheOnChange();
 
             return $count;
         } catch (\Exception $e) {