Fixes for include in recent after code review

Author: ihorvansach

Block/Index.php

@@ -48,13 +48,16 @@ protected function _preparePostCollection()
             \Magefan\Blog\Helper\Config::XML_PATH_HOMEPAGE_DISPLAY_MODE,
             ScopeInterface::SCOPE_STORE
         );
+
         /* If featured posts enabled */
         if ($displayMode == 1) {
             $postIds = $this->_scopeConfig->getValue(
                 \Magefan\Blog\Helper\Config::XML_PATH_HOMEPAGE_FEATURED_POST_IDS,
                 ScopeInterface::SCOPE_STORE
             );
             $this->_postCollection->addPostsFilter($postIds);
+        } else {
+            $this->_postCollection->addRecentFilter();
         }
     }
 

Block/Sidebar/Recent.php

@@ -34,6 +34,17 @@ public function _construct()
         return parent::_construct();
     }
 
+    /*
+     * Prepare posts collection
+     *
+     * @return void
+     */
+    protected function _preparePostCollection()
+    {
+        parent::_preparePostCollection();
+        $this->_postCollection->addRecentFilter();
+    }
+
     /**
      * Retrieve block identities
      * @return array

Block/Widget/Recent.php

@@ -91,6 +91,7 @@ protected function _preparePostCollection()
 
         parent::_preparePostCollection();
 
+        $this->_postCollection->addRecentFilter();
         if ($category = $this->getCategory()) {
             $this->_postCollection->addCategoryFilter($category);
         }

Model/Post.php

@@ -844,6 +844,7 @@ public function getSecret()
             );
             $this->save();
         }
+
         return $this->getData('secret');
     }
 }

Model/PostManagement.php

@@ -84,6 +84,7 @@ public function getList($type, $term, $storeId, $page, $limit)
                     $collection->addTagFilter($term);
                     break;
             }
+
             $posts = [];
             foreach ($collection as $item) {
                 $item->initDinamicData();

Model/ResourceModel/Post/Collection.php

@@ -131,6 +131,10 @@ public function addStoreFilter($store, $withAdmin = true)
         return $this;
     }
 
+    /**
+     * Add "include in recent" filter to collection
+     * @return $this
+     */
     public function addRecentFilter()
     {
       return $this->addFieldToFilter('include_in_recent', 1);

Setup/UpgradeSchema.php

@@ -470,36 +470,36 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getIdxName($setup->getTable('magefan_blog_category'), ['include_in_menu']),
                 ['include_in_menu']
             );
-              if (version_compare($version, '2.6.3') < 0)
-             {
-            /* Add include in recent posts into post table */
+        }
+
+        if (version_compare($version, '2.6.3') < 0) {
+        /* Add display mode field into category table */
             $connection->addColumn(
-                $setup->getTable('magefan_blog_post'),
-                'include_in_recent',
+                $setup->getTable('magefan_blog_category'),
+                'display_mode',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                     null,
                     'nullable' => false,
-                    'default' => '1',
-                    'comment' => 'Include in Recent Posts',
+                    'default' => '0',
+                    'comment' => 'Display Mode',
                     'after' => 'is_active'
                 ]
             );
         }
 
-        }
 
-        if (version_compare($version, '2.6.3') < 0) {
-        /* Add display mode field into category table */
+        if (version_compare($version, '2.6.3.1') < 0) {
+            /* Add include in recent posts into post table */
             $connection->addColumn(
-                $setup->getTable('magefan_blog_category'),
-                'display_mode',
+                $setup->getTable('magefan_blog_post'),
+                'include_in_recent',
                 [
                     'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
                     null,
                     'nullable' => false,
-                    'default' => '0',
-                    'comment' => 'Display Mode',
+                    'default' => '1',
+                    'comment' => 'Include in Recent Posts',
                     'after' => 'is_active'
                 ]
             );

etc/module.xml

@@ -8,7 +8,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magefan_Blog" setup_version="2.6.3">
+    <module name="Magefan_Blog" setup_version="2.6.3.1">
          <sequence>
             <module name="Magento_Cms"/>
             <module name="Magento_Catalog"/>