patches for dev logging, and additional useful user functions

src/Http/Requests/OnboardRequest.php

@@ -14,7 +14,7 @@ class OnboardRequest extends FleetbaseRequest
      *
      * @return array
      */
-    protected $excludedWords = ['test', 'testing', 'example', 'trial', 'trialing', 'asdf', '1234', 'asdas', 'dsdsds'];
+    protected $excludedWords = ['test', 'test123', 'abctest', 'testing', 'example', 'trial', 'trialing', 'asdf', '1234', 'asdas', 'dsdsds', 'dummy', 'xxxx', 'aaa', 'demo', 'zzz', 'zzzz', 'none'];
 
     /**
      * Determine if the user is authorized to make this request.

src/Jobs/LogApiRequest.php

@@ -14,6 +14,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Spatie\ResponseCache\Facades\ResponseCache;
 
 class LogApiRequest implements ShouldQueue
 {
@@ -58,6 +59,8 @@ public function handle()
     {
         // Log::info('Logging API Request ' . print_r($this->payload, true));
         ApiRequestLog::on($this->dbConnection)->create($this->payload);
+        // Clear response cache
+        ResponseCache::clear();
     }
 
     /**

src/Models/ApiCredential.php

@@ -172,4 +172,14 @@ public static function generateKeys($encode, $testKey = false)
             'secret' => $hash,
         ];
     }
+
+    /**
+     * Update the datetime of the last usage.
+     *
+     * @return bool
+     */
+    public function trackLastUsed()
+    {
+        return $this->update(['last_used_at' => now()]);
+    }
 }

src/Models/ApiEvent.php

@@ -5,12 +5,14 @@
 use Fleetbase\Casts\Json;
 use Fleetbase\Traits\Filterable;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 
 class ApiEvent extends Model
 {
     use HasUuid;
+    use HasPublicId;
     use HasApiModelBehavior;
     use Searchable;
     use Filterable;

src/Models/ApiRequestLog.php

@@ -5,12 +5,14 @@
 use Fleetbase\Casts\Json;
 use Fleetbase\Traits\Filterable;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 
 class ApiRequestLog extends Model
 {
     use HasUuid;
+    use HasPublicId;
     use HasApiModelBehavior;
     use Searchable;
     use Filterable;

src/Models/User.php

@@ -775,6 +775,25 @@ public static function applyUserInfoFromRequest($request, array $attributes = []
         return $attributes;
     }
 
+    /**
+     * Create a new User instance with enriched attributes from the request.
+     *
+     * This static method constructs a new User object using information obtained from
+     * a request object. It enhances the initial user attributes with additional details
+     * such as country, timezone, and IP-related metadata by leveraging the
+     * applyUserInfoFromRequest() method. This method is ideal for initializing a user with
+     * comprehensive details at the point of creation, particularly during registration processes.
+     *
+     * @param \Illuminate\Http\Request $request    the request object containing user's IP address and possibly other details
+     * @param array                    $attributes an optional array of initial attributes that may be provided for the user
+     *
+     * @return User returns the newly created User instance with enriched attributes
+     */
+    public static function newUserWithRequestInfo($request, $attributes = []): User
+    {
+        return new User(static::applyUserInfoFromRequest($request, $attributes));
+    }
+
     /**
      * Sets user information from the request on the current User model instance.
      *
@@ -804,11 +823,29 @@ public function setUserInfoFromRequest($request, bool $save = false): User
         return $this;
     }
 
+    /**
+     * Retrieve the last seen timestamp of the user.
+     *
+     * This method acts as an accessor for the 'lastSeenAt' attribute of the User model.
+     * It returns the datetime when the user was last active in the system. This can be
+     * used to display the last seen status or to calculate if the user is offline.
+     *
+     * @return \Carbon\Carbon|null returns the Carbon instance for the last seen timestamp or null if not set
+     */
     public function getLastSeenAtAttribute()
     {
         return $this->lastSeenAt();
     }
 
+    /**
+     * Check if the user is currently online.
+     *
+     * This accessor method for the 'isOnline' attribute determines if the user is considered
+     * online based on certain criteria like their last activity timestamp. It leverages the
+     * isOnline() method, which should contain the logic to ascertain the user's online status.
+     *
+     * @return bool returns true if the user is online, otherwise false
+     */
     public function getIsOnlineAttribute()
     {
         return $this->isOnline();

src/Support/Auth.php

@@ -65,6 +65,9 @@ public static function setSession($user = null, $login = false): bool
                 session(['is_admin' => $user->isAdmin()]);
             }
 
+            // track last usage of api credential
+            $apiCredential->trackLastUsed();
+
             return true;
         }
 

src/Types/Country.php

@@ -126,7 +126,18 @@ public function only($keys = []): array
                 $key = Arr::first(array_keys($key));
             }
 
-            $result[$as] = strpos($key, '.') > 0 ? Utils::get($this, $key) : $this->{$key};
+            if (!is_string($key)) {
+                continue;
+            }
+
+            if (strpos($key, '.') > 0) {
+                $result[$as] = Utils::get($this, $key);
+                continue;
+            }
+
+            if (isset($this->{$key})) {
+                $result[$as] = $this->{$key};
+            }
         }
 
         return $result;
@@ -232,7 +243,7 @@ function ($country) use ($query) {
                     strtolower($country->getCode()) === $query,
                     strtolower($country->getCca2()) === $query,
                     Str::contains(strtolower($country->getAbbrev()), $query),
-                    Str::contains(strtolower($country->getName()), $query),
+                    // Str::contains(strtolower($country->getName()), $query),
                 ];
 
                 return count(array_filter($matches));