Refactor popular queries collection and mview class for additional sections (#1134)

Author: bsuravech

Helper/Entity/SuggestionHelper.php

@@ -106,28 +106,20 @@ public function getPopularQueries($storeId)
         $collection->getSelect()->where(
             'num_results >= ' . $this->configHelper->getMinNumberOfResults() . ' 
             AND popularity >= ' . $this->configHelper->getMinPopularity() . ' 
-            AND query_text != "__empty__"'
+            AND query_text != "__empty__" AND CHAR_LENGTH(query_text) >= 3'
         );
-        $collection->getSelect()->limit(12);
-        $collection->setOrder('popularity', 'DESC');
-        $collection->setOrder('num_results', 'DESC');
-        $collection->setOrder('updated_at', 'ASC');
 
         if ($storeId) {
             $collection->getSelect()->where('store_id = ?', (int) $storeId);
         }
 
-        $collection->load();
-
-        $suggestions = [];
+        $collection->setOrder('popularity', 'DESC');
+        $collection->setOrder('num_results', 'DESC');
+        $collection->setOrder('updated_at', 'ASC');
 
-        foreach ($collection as $suggestion) {
-            if (mb_strlen($suggestion['query_text']) >= 3) {
-                $suggestions[] = $suggestion['query_text'];
-            }
-        }
+        $collection->getSelect()->limit(10);
 
-        $queries = array_slice($suggestions, 0, 9);
+        $queries = $collection->getColumnValues('query_text');
 
         $this->cache->save($this->serializer->serialize($queries), $this->popularQueriesCacheId, [], 24*3600);
 

etc/csp_whitelist.xml

@@ -13,11 +13,5 @@
                 <value id="algolia" type="host">*.algolia.com</value>
             </values>
         </policy>
-        <policy id="connect-src">
-            <values>
-                <value id="algolia-api" type="host">*.algolia.net</value>
-                <value id="algolia" type="host">*.algolia.com</value>
-            </values>
-        </policy>
     </policies>
 </csp_whitelist>

etc/mview.xml

@@ -7,7 +7,7 @@
             <table name="cms_page" entity_column="page_id" />
         </subscriptions>
     </view>
-    <view id="algolia_additional_sections" class="Algolia\AlgoliaSearch\Model\Indexer\Page" group="indexer">
+    <view id="algolia_additional_sections" class="Algolia\AlgoliaSearch\Model\Indexer\AdditionalSection" group="indexer">
     </view>
     <view id="algolia_queue_runner" class="Algolia\AlgoliaSearch\Model\Indexer\QueueRunner" group="indexer">
     </view>