Optimize transformers

jcc · Jan 7, 2018 · c2065c0 · c2065c0
1 parent bd51406
commit c2065c0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/app/Transformers/ArticleTransformer.php b/app/Transformers/ArticleTransformer.php
@@ -39,9 +39,9 @@ public function transform(Article $article)
      */
     public function includeCategory(Article $article)
     {
-        $category = $article->category;
-
-        return $this->item($category, new CategoryTransformer);
+        if ($category = $article->category) {
+            return $this->item($category, new CategoryTransformer);
+        }
     }
 
     /**
@@ -52,8 +52,8 @@ public function includeCategory(Article $article)
      */
     public function includeTags(Article $article)
     {
-        $tags = $article->tags;
-
-        return $this->collection($tags, new TagTransformer);
+        if ($tags = $article->tags) {
+            return $this->collection($tags, new TagTransformer);
+        }
     }
 }
diff --git a/app/Transformers/CommentTransformer.php b/app/Transformers/CommentTransformer.php
@@ -38,9 +38,9 @@ public function transform(Comment $comment)
      */
     public function includeUser(Comment $comment)
     {
-        $user = $comment->user;
-
-        return $this->item($user, new UserTransformer);
+        if ($user = $comment->user) {
+            return $this->item($user, new UserTransformer);
+        }
     }
 
 }
diff --git a/app/Transformers/DiscussionTransformer.php b/app/Transformers/DiscussionTransformer.php
@@ -13,16 +13,17 @@ class DiscussionTransformer extends TransformerAbstract
         'user'
     ];
 
+    protected $defaultIncludes = [
+        'user',
+    ];
+
     public function transform(Discussion $discussion)
     {
         $content = json_decode($discussion->content);
 
         return [
             'id'            => $discussion->id,
             'user_id'       => $discussion->user_id,
-            'user'          => [
-                'name'   => $discussion->user->name
-            ],
             'title'         => $discussion->title,
             'content_raw'   => $content->raw,
             'content_html'  => $content->html,
@@ -40,9 +41,9 @@ public function transform(Discussion $discussion)
      */
     public function includeComments(Discussion $discussion)
     {
-        $comments = $discussion->comments;
-
-        return $this->collection($comments, new CommentTransformer);
+        if ($comments = $discussion->comments) {
+            return $this->collection($comments, new CommentTransformer);
+        }
     }
 
     /**
@@ -53,9 +54,9 @@ public function includeComments(Discussion $discussion)
      */
     public function includeTags(Discussion $discussion)
     {
-        $tags = $discussion->tags;
-
-        return $this->collection($tags, new TagTransformer);
+        if ($tags = $discussion->tags) {
+            return $this->collection($tags, new TagTransformer);
+        }
     }
 
     /**
@@ -66,8 +67,8 @@ public function includeTags(Discussion $discussion)
      */
     public function includeUser(Discussion $discussion)
     {
-        $user = $discussion->user;
-
-        return $this->item($user, new UserTransformer);
+        if ($user = $discussion->user) {
+            return $this->item($user, new UserTransformer);
+        }
     }
 }