fix: check if expiration is null

mostafaznv · Dec 20, 2024 · 6f2a4cf · 6f2a4cf
1 parent 63fede4
commit 6f2a4cf
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Http/Controllers/Api/ApiController.php b/src/Http/Controllers/Api/ApiController.php
@@ -52,7 +52,9 @@ protected function entityToArray(CacheEntity $entity, string $model, bool $withV
         $prefix = Str::kebab(class_basename($model));
 
         $cache = CacheData::fromCache($entity, $prefix);
-        $expiration = Carbon::createFromTimestamp($cache->expiration);
+        $expiration = $cache->expiration
+            ? Carbon::createFromTimestamp($cache->expiration)
+            : null;
 
         if ($withValue) {
             $value = [
@@ -85,9 +87,9 @@ protected function entityToArray(CacheEntity $entity, string $model, bool $withV
             ],
             'expiration'         => [
                 'unix'   => $cache->expiration,
-                'date'   => $expiration->toDateTimeString(),
-                'diff'   => $expiration->diffForHumans(),
-                'isPast' => $expiration->isPast(),
+                'date'   => $expiration?->toDateTimeString() ?? '',
+                'diff'   => $expiration?->diffForHumans() ?? '',
+                'isPast' => $expiration?->isPast() ?? true,
             ],
         ];
     }