Update AccountService, and NotificationResource

Author: dansup

app/Http/Resources/NotificationResource.php

@@ -61,7 +61,7 @@ protected function newVideoCommentReplyShare()
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'url' => $link,
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
@@ -84,7 +84,7 @@ protected function newVideoCommentShare()
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
             'url' => $link,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
         ];
@@ -102,7 +102,7 @@ protected function newVideoShare()
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
         ];
@@ -119,7 +119,7 @@ protected function newVideoDuet()
         return [
             'id' => (string) $this->id,
             'type' => 'video.duet',
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
@@ -141,7 +141,7 @@ protected function newVideoCommentReply()
         return [
             'id' => (string) $this->id,
             'type' => 'video.commentReply',
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
@@ -166,7 +166,7 @@ protected function newVideoCommentReplyLike()
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'url' => $link,
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
@@ -189,7 +189,7 @@ protected function newVideoCommentLike()
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
             'url' => $link,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
         ];
@@ -207,7 +207,7 @@ protected function newVideoLike()
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
         ];
@@ -218,7 +218,7 @@ protected function newFollower()
         return [
             'id' => (string) $this->id,
             'type' => 'new_follower',
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'read_at' => $this->read_at,
             'created_at' => $this->created_at,
         ];
@@ -236,7 +236,7 @@ protected function newVideoComment()
         return [
             'id' => (string) $this->id,
             'type' => 'video.comment',
-            'actor' => AccountService::compact($this->profile_id, false) ?: $this->unavailableAccount(),
+            'actor' => AccountService::get($this->profile_id, false) ?: $this->unavailableAccount(),
             'video_pid' => $videoPid,
             'video_id' => (string) $this->video_id,
             'video_thumbnail' => $thumb,

app/Services/AccountService.php

@@ -5,16 +5,16 @@
 use App\Http\Resources\ProfileResource;
 use App\Models\Profile;
 use App\Models\Video;
-use Cache;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class AccountService
 {
     const CACHE_KEY = 'api:s:account:';
 
     const ACCOUNT_LIKES_CACHE_KEY = 'api:s:account:likes_count:';
 
-    public static function get($id)
+    public static function get($id, $grace = true)
     {
         $res = Cache::remember(self::CACHE_KEY.$id, now()->addDays(7), function () use ($id) {
             $req = new Request;
@@ -26,7 +26,11 @@ public static function get($id)
             return (new ProfileResource($profile))->toArray($req);
         });
 
-        return $res ? $res : [];
+        if($res) {
+            return $res;
+        }
+
+        return $grace ? [] : false;
     }
 
     public static function getActorId($id)