2197-new-release 1 [Implemented]

Author: dev4

Api/AuthorRepositoryInterface.php

@@ -8,19 +8,17 @@
 
 namespace Magefan\Blog\Api;
 
-use Magefan\Blog\Model\Author;
-
 /**
  * Interface AuthorRepositoryInterface
  * @package Magefan\Blog\Api
  */
 interface AuthorRepositoryInterface
 {
     /**
-     * @param Author $author
+     * @param AuthorInterface $author
      * @return mixed
      */
-    public function save(Author $author);
+    public function save(AuthorInterface $author);
 
     /**
      * @param $authorId
@@ -39,10 +37,10 @@ public function getById($authorId);
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 
     /**
-     * @param Author $author
+     * @param AuthorInterface $author
      * @return mixed
      */
-    public function delete(Author $author);
+    public function delete(AuthorInterface $author);
 
     /**
      * Delete Author by ID.

Block/Adminhtml/Grid/Column/Filter/Author.php

@@ -14,20 +14,21 @@
 class Author extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
 {
     /**
-     * @var \Magefan\Blog\Model\ResourceModel\Author\CollectionFactory
+     * @var \Magefan\Blog\Api\AuthorCollectionInterfaceFactory
      */
     protected $collectionFactory;
 
     /**
+     * Author constructor.
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\DB\Helper $resourceHelper
-     * @param \Magefan\Blog\Model\ResourceModel\Author\CollectionFactory $collectionFactory
+     * @param \Magefan\Blog\Api\AuthorCollectionInterfaceFactory $collectionFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\DB\Helper $resourceHelper,
-        \Magefan\Blog\Model\ResourceModel\Author\CollectionFactory $collectionFactory,
+        \Magefan\Blog\Api\AuthorCollectionInterfaceFactory $collectionFactory,
         array $data = []
     ) {
         $this->collectionFactory = $collectionFactory;

Block/Adminhtml/Grid/Column/Render/Author.php

@@ -14,23 +14,24 @@
 class Author extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magefan\Blog\Model\AuthorFactory
+     * @var \Magefan\Blog\Api\AuthorInterfaceFactory
      */
-    protected $authoryFactory;
+    protected $authorFactory;
 
     /**
      * @var array
      */
     static protected $authors = [];
 
     /**
+     * Author constructor.
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magefan\Blog\Model\AuthorFactory $localeLists
+     * @param \Magefan\Blog\Api\AuthorInterfaceFactory $authorFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magefan\Blog\Model\AuthorFactory $authorFactory,
+        \Magefan\Blog\Api\AuthorInterfaceFactory $authorFactory,
         array $data = []
     ) {
         parent::__construct($context, $data);

Model/AuthorRepository.php

@@ -6,9 +6,9 @@
 namespace Magefan\Blog\Model;
 
 use Magefan\Blog\Api\AuthorRepositoryInterface;
-use Magefan\Blog\Model\AuthorFactory;
+use Magefan\Blog\Api\AuthorInterface;
 use Magefan\Blog\Model\ResourceModel\Author as AuthorResourceModel;
-use Magefan\Blog\Model\ResourceModel\Author\CollectionFactory;
+use Magefan\Blog\Api\AuthorCollectionInterfaceFactory;
 use Magento\Framework\Api\SearchResultsFactory;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\DB\Adapter\ConnectionException;
@@ -25,15 +25,15 @@
 class AuthorRepository implements AuthorRepositoryInterface
 {
     /**
-     * @var AuthorFactory
+     * @var AuthorInterface
      */
     private $authorFactory;
     /**
      * @var AuthorResourceModel
      */
     private $authorResourceModel;
     /**
-     * @var CollectionFactory
+     * @var AuthorCollectionInterfaceFactory
      */
     private $collectionFactory;
     /**
@@ -43,15 +43,15 @@ class AuthorRepository implements AuthorRepositoryInterface
 
     /**
      * AuthorRepository constructor.
-     * @param \Magefan\Blog\Model\AuthorFactory $authorFactory
+     * @param AuthorInterface $authorFactory
      * @param AuthorResourceModel $authorResourceModel
-     * @param CollectionFactory $collectionFactory
+     * @param AuthorCollectionInterfaceFactory $collectionFactory
      * @param SearchResultsFactory $searchResultsFactory
      */
     public function __construct(
-        AuthorFactory $authorFactory,
+        AuthorInterface $authorFactory,
         AuthorResourceModel $authorResourceModel,
-        CollectionFactory $collectionFactory,
+        AuthorCollectionInterfaceFactory $collectionFactory,
         SearchResultsFactory $searchResultsFactory
     ) {
         $this->authorFactory = $authorFactory;
@@ -61,13 +61,13 @@ public function __construct(
     }
 
     /**
-     * @param Author $author
-     * @return bool|mixed
+     * @param AuthorInterface $author
+     * @return bool|Author|mixed
      * @throws CouldNotSaveException
      * @throws NoSuchEntityException
      * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
-    public function save(Author $author)
+    public function save(AuthorInterface $author)
     {
         if ($author) {
             try {
@@ -107,12 +107,12 @@ public function getById($authorId, $editMode = false, $storeId = null, $forceRel
     }
 
     /**
-     * @param Author $author
+     * @param AuthorInterface $author
      * @return bool|mixed
      * @throws CouldNotDeleteException
      * @throws StateException
      */
-    public function delete(Author $author)
+    public function delete(AuthorInterface $author)
     {
         try {
             $this->authorResourceModel->delete($author);

Model/Comment.php

@@ -41,7 +41,7 @@
 class Comment extends AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
     /**
-     * @var \Magefan\Blog\Model\AuthorFactory
+     * @var PostFactory
      */
     protected $postFactory;
 
@@ -51,7 +51,7 @@ class Comment extends AbstractModel implements \Magento\Framework\DataObject\Ide
     protected $customerFactory;
 
     /**
-     * @var \Magento\User\Model\UserFactory
+     * @var \Magefan\Blog\Api\AuthorInterfaceFactory
      */
     protected $userFactory;
 
@@ -81,7 +81,7 @@ class Comment extends AbstractModel implements \Magento\Framework\DataObject\Ide
      * @param \Magento\Framework\Registry                                  $registry
      * @param \Magefan\Blog\Model\PostFactory                              $postFactory
      * @param \Magento\Customer\Model\CustomerFactory                      $customerFactory,
-     * @param \Magento\User\Model\Useractory                               $userFactory,
+     * @param \Magefan\Blog\Api\AuthorInterfaceFactory                     $userFactory,
      * @param \Magefan\Blog\Model\ResourceModel\Comment\CollectionFactory  $commentCollectionFactory
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null           $resourceCollection
@@ -92,7 +92,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magefan\Blog\Model\PostFactory $postFactory,
         \Magento\Customer\Model\CustomerFactory $customerFactory,
-        \Magento\User\Model\UserFactory $userFactory,
+        \Magefan\Blog\Api\AuthorInterfaceFactory $userFactory,
         \Magefan\Blog\Model\ResourceModel\Comment\CollectionFactory $commentCollectionFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
@@ -200,7 +200,7 @@ public function getAuthor()
                     $admin = $this->userFactory->create();
                     $admin->load($this->getAdminId());
                     $this->author->setData([
-                        'nickname' => $customer->getName(),
+                        'nickname' => $admin->getName(),
                         'email' => $this->getEmail(),
                         'admin' => $admin,
                     ]);

Model/ResourceModel/Post.php

@@ -173,18 +173,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
             }
         }
 
-        /* Save tags links */
-        $newIds = (array)$object->getTags();
-        foreach ($newIds as $key => $id) {
-            if (!$id) { // e.g.: zero
-                unset($newIds[$key]);
-            }
-        }
-        if (is_array($newIds)) {
-            $oldIds = $this->lookupTagIds($object->getId());
-            $this->_updateLinks($object, $newIds, $oldIds, 'magefan_blog_post_tag', 'tag_id');
-        }
-
         /* Save related post & product links */
         if ($links = $object->getData('links')) {
             if (is_array($links)) {
@@ -229,6 +217,13 @@ protected function _updateLinks(
     ) {
         $table = $this->getTable($tableName);
 
+        if ($object->getId() && empty($rowData)) {
+            $currentData = $this->_lookupAll($object->getId(), $tableName, '*');
+            foreach ($currentData as $item) {
+                $rowData[$item[$field]] = $item;
+            }
+        }
+
         $insert = $newRelatedIds;
         $delete = $oldRelatedIds;
 
@@ -437,4 +432,26 @@ protected function _lookupIds($postId, $tableName, $field)
 
         return $adapter->fetchCol($select);
     }
+
+    /**
+     * Get ids to which specified item is assigned
+     * @param  int $postId
+     * @param  string $tableName
+     * @param  string $field
+     * @return array
+     */
+    protected function _lookupAll($postId, $tableName, $field)
+    {
+        $adapter = $this->getConnection();
+
+        $select = $adapter->select()->from(
+            $this->getTable($tableName),
+            $field
+        )->where(
+            'post_id = ?',
+            (int)$postId
+        );
+
+        return $adapter->fetchAll($select);
+    }
 }