Merge pull request #341 from magefan/4301-blog-with-deleted-author

Add check if customer exists

Author: magefan

Model/Comment.php

@@ -179,30 +179,40 @@ public function getAuthor()
                 $this->getAuthorType()
             );
 
+            $guestData = [
+                'nickname' => $this->getAuthorNickname(),
+                'email' => $this->getAuthorEmail(),
+            ];
+
             switch ($this->getAuthorType()) {
                 case \Magefan\Blog\Model\Config\Source\AuthorType::GUEST:
-                    $this->author->setData([
-                        'nickname' => $this->getAuthorNickname(),
-                        'email' => $this->getAuthorEmail(),
-                    ]);
+                    $this->author->setData($guestData);
                     break;
                 case \Magefan\Blog\Model\Config\Source\AuthorType::CUSTOMER:
                     $customer = $this->customerFactory->create();
                     $customer->load($this->getCustomerId());
-                    $this->author->setData([
-                        'nickname' => $customer->getName(),
-                        'email' => $this->getEmail(),
-                        'customer' => $customer,
-                    ]);
+                    if ($customer->getId()) {
+                        $this->author->setData([
+                            'nickname' => $customer->getName(),
+                            'email' => $this->getEmail(),
+                            'customer' => $customer,
+                        ]);
+                    } else {
+                        $this->author->setData($guestData);
+                    }
                     break;
                 case \Magefan\Blog\Model\Config\Source\AuthorType::ADMIN:
                     $admin = $this->userFactory->create();
                     $admin->load($this->getAdminId());
-                    $this->author->setData([
-                        'nickname' => $admin->getName(),
-                        'email' => $this->getEmail(),
-                        'admin' => $admin,
-                    ]);
+                    if ($admin->getId()) {
+                        $this->author->setData([
+                            'nickname' => $admin->getName(),
+                            'email' => $this->getEmail(),
+                            'admin' => $admin,
+                        ]);
+                    } else {
+                        $this->author->setData($guestData);
+                    }
                     break;
             }
         }

Ui/DataProvider/Comment/Form/CommentDataProvider.php

@@ -108,39 +108,51 @@ public function getData()
             ];
 
             $author = $comment->getAuthor();
+            $guestData = [
+                'url' => 'mailto:' . $author->getEmail(),
+                'title' => $author->getNickname(),
+                'text' => $author->getNickname() .
+                    ' - ' . $author->getEmail() .
+                    ' (' . __('Guest')  . ')',
+            ];
+
             switch ($comment->getAuthorType()) {
                 case \Magefan\Blog\Model\Config\Source\AuthorType::GUEST:
-                    $this->loadedData[$comment->getId()]['author_url'] = [
-                        'url' => 'mailto:' . $author->getEmail(),
-                        'title' => $author->getNickname(),
-                        'text' => $author->getNickname() .
-                            ' - ' . $author->getEmail() .
-                            ' (' . __('Guest')  . ')',
-                    ];
+                    $this->loadedData[$comment->getId()]['author_url'] = $guestData;
                     break;
                 case \Magefan\Blog\Model\Config\Source\AuthorType::CUSTOMER:
-                    $this->loadedData[$comment->getId()]['author_url'] = [
-                        'url' => $this->url->getUrl(
-                            'customer/index/edit',
-                            ['id' => $comment->getCustomerId()]
-                        ),
-                        'title' => $author->getNickname(),
-                        'text' => '#' . $comment->getCustomerId() .
-                            '. ' . $author->getNickname() .
-                            ' (' . __('Customer')  . ')',
-                    ];
+
+                    if ($author->getCustomer()) {
+                        $this->loadedData[$comment->getId()]['author_url'] = [
+                            'url' => $this->url->getUrl(
+                                'customer/index/edit',
+                                ['id' => $comment->getCustomerId()]
+                            ),
+                            'title' => $author->getNickname(),
+                            'text' => '#' . $comment->getCustomerId() .
+                                '. ' . $author->getNickname() .
+                                ' (' . __('Customer') . ')',
+                        ];
+                    } else {
+                        $this->loadedData[$comment->getId()]['author_url'] = $guestData;
+                    }
+
                     break;
                 case \Magefan\Blog\Model\Config\Source\AuthorType::ADMIN:
-                    $this->loadedData[$comment->getId()]['author_url'] = [
-                        'url' => $this->url->getUrl(
-                            'admin/user/edit',
-                            ['id' => $comment->getAdminId()]
-                        ),
-                        'title' => $author->getNickname(),
-                        'text' => '#' . $comment->getAdminId() .
-                            '. ' . $author->getNickname() .
-                            ' (' . __('Admin')  . ')',
-                    ];
+                    if ($author->getAdmin()) {
+                        $this->loadedData[$comment->getId()]['author_url'] = [
+                            'url' => $this->url->getUrl(
+                                'admin/user/edit',
+                                ['id' => $comment->getAdminId()]
+                            ),
+                            'title' => $author->getNickname(),
+                            'text' => '#' . $comment->getAdminId() .
+                                '. ' . $author->getNickname() .
+                                ' (' . __('Admin') . ')',
+                        ];
+                    } else {
+                        $this->loadedData[$comment->getId()]['author_url'] = $guestData;
+                    }
                     break;
             }