From ad4d9647bb40115d462dc14359810908a69edf6d Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Sun, 17 May 2026 11:10:02 +0800
Subject: [PATCH 1/2] Add shared seed company resolver concern

---
 seeders/Concerns/ResolvesSeedCompany.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 seeders/Concerns/ResolvesSeedCompany.php

diff --git a/seeders/Concerns/ResolvesSeedCompany.php b/seeders/Concerns/ResolvesSeedCompany.php
new file mode 100644
index 00000000..4d552937
--- /dev/null
+++ b/seeders/Concerns/ResolvesSeedCompany.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Fleetbase\Seeders\Concerns;
+
+use Fleetbase\Models\Company;
+
+trait ResolvesSeedCompany
+{
+    protected function resolveSeedCompany(?string $fallbackUuidEnv = null, ?string $fallbackPublicIdEnv = null): ?Company
+    {
+        $companyUuid = env('SEED_COMPANY_UUID') ?: ($fallbackUuidEnv ? env($fallbackUuidEnv) : null);
+        $companyPublicId = env('SEED_COMPANY_PUBLIC_ID') ?: ($fallbackPublicIdEnv ? env($fallbackPublicIdEnv) : null);
+
+        if ($companyUuid) {
+            return Company::where('uuid', $companyUuid)->first();
+        }
+
+        if ($companyPublicId) {
+            return Company::where('public_id', $companyPublicId)->first();
+        }
+
+        return Company::query()->orderBy('created_at')->first();
+    }
+}

From 4ed4db75f4203f7b02fe810a93be90c3e09c9b10 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Sun, 17 May 2026 15:08:56 +0800
Subject: [PATCH 2/2] bump version to v1.6.47

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1e1df975..d667ae77 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.6.46",
+    "version": "1.6.47",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",