Merge pull request #134 from fleetbase/dev-v1.5.28

v1.5.28 ~ minor patches
fleetbase · Feb 12, 2025 · a027b6a · a027b6a
2 parents 3b0dbaa + 85661d8
commit a027b6a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/core-api",
-    "version": "1.5.27",
+    "version": "1.5.28",
     "description": "Core Framework and Resources for Fleetbase API",
     "keywords": [
         "fleetbase",

diff --git a/src/Models/Category.php b/src/Models/Category.php
@@ -40,7 +40,7 @@ class Category extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['name'];
+    protected $searchableColumns = ['name', 'tags', 'description'];
 
     /**
      * The attributes that are mass assignable.

diff --git a/src/Traits/HasApiModelBehavior.php b/src/Traits/HasApiModelBehavior.php
@@ -114,6 +114,9 @@ public function queryFromRequest(Request $request, ?\Closure $queryCallback = nu
 
         if (intval($limit) > 0) {
             $builder->limit($limit);
+        } elseif ($limit === -1) {
+            $limit = 999999999;
+            $builder->limit($limit);
         }
 
         // if queryCallback is supplied
@@ -125,10 +128,6 @@ public function queryFromRequest(Request $request, ?\Closure $queryCallback = nu
         // Utils::sqlDump($builder);
 
         if (Http::isInternalRequest($request)) {
-            if ($limit === -1) {
-                $limit = 999999999;
-            }
-
             return $builder->fastPaginate($limit, $columns);
         }
 

diff --git a/src/Traits/PurgeCommand.php b/src/Traits/PurgeCommand.php
@@ -51,7 +51,7 @@ protected function backupAndDelete(string $modelClass, string $tableName, $cutof
         $this->info("Backing up {$records->count()} records from {$tableName}...");
 
         // Create SQL dump
-        $sqlDumpFileName = str_replace([' '], '_', "{$tableName}_backup_{$firstRecordDate}_to_{$lastRecordDate}_created_{$currentDate}.sql");
+        $sqlDumpFileName = str_replace([' ', ':'], '_', "{$tableName}_backup_{$firstRecordDate}_to_{$lastRecordDate}_created_{$currentDate}.sql");
         $localPath       = storage_path("app/tmp/{$sqlDumpFileName}");
         $remotePath      = "{$path}/{$sqlDumpFileName}";
         $backupData      = $records->map(function ($record) {