Merge pull request #526 from Nosto/release/3.11.1

Release/3.11.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Report errors and problems
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Magento version(s) used**: x.y.z
+**Extension version(s) affected**: x.y.z
+
+**Description**  
+<!-- A clear and concise description of the problem. -->
+
+**How to reproduce**  
+<!-- Code, config and/or steps needed to reproduce the problem. -->
+
+**Possible Solution**  
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
+
+**Additional context**  
+<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->

.github/ISSUE_TEMPLATE/documentation-issue.md

@@ -0,0 +1,12 @@
+---
+name: Documentation Issue
+about: Missing, misleading or incomplete documentation issues
+title: ''
+labels: docs
+assignees: ''
+
+---
+
+**Documentation issue**
+<!-- Before opening a new issue, please make sure you already checked -->
+<!-- our exhaustive wiki documentation at https://github.com/nosto/nosto-magento/wiki -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Ideas for new features and improvements
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG.md

@@ -1,5 +1,10 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 3.11.0
+* Use mock products in category personalisation when preview mode is enabled
+* Ignore non-numeric product ids in Graphql responses
+* Add inventory level to SKU
+
 ### 3.10.0
 * Add Nosto category personalization in the default Magento category sorting options
 

app/code/community/Nosto/Tagging/Model/Meta/Sku.php

@@ -55,6 +55,9 @@ public function loadData(
         Mage_Core_Model_Store $store = null
     )
     {
+        /** @var Nosto_Tagging_Helper_Data $dataHelper */
+        $dataHelper = Mage::helper('nosto_tagging');
+
         if ($store === null) {
             /** @var Nosto_Tagging_Helper_Data $helper */
             $helper = Mage::helper('nosto_tagging');
@@ -83,6 +86,10 @@ public function loadData(
         $this->loadCustomFieldsFromConfigurableAttributes($sku, $parent, $store);
         $this->loadCustomFieldsFromAttributeSet($sku, $store);
 
+        if ($dataHelper->getUseInventoryLevel($store)) {
+            $this->amendInventoryLevel($sku);
+        }
+
         return true;
     }
 
@@ -173,4 +180,27 @@ protected function buildAvailability(Mage_Catalog_Model_Product $product)
 
         return $availability;
     }
+
+    /**
+     * Adds the stock level / inventory level for SKU
+     *
+     * @param Mage_Catalog_Model_Product $sku the product sku model.
+     *
+     */
+    protected function amendInventoryLevel(Mage_Catalog_Model_Product $sku)
+    {
+        /* @var Nosto_Tagging_Helper_Stock $stockHelper */
+        $stockHelper = Mage::helper('nosto_tagging/stock');
+        try {
+            $this->setInventoryLevel($stockHelper->getQty($sku));
+        } catch (\Exception $e) {
+            Nosto_Tagging_Helper_Log::error(
+                'Failed to resolve inventory level for SKU %d to tags. Error message was: %s',
+                array(
+                    $sku->getId(),
+                    $e->getMessage()
+                )
+            );
+        }
+    }
 }

app/code/community/Nosto/Tagging/Model/Service/Recommendation/Category.php

@@ -35,6 +35,8 @@
 class Nosto_Tagging_Model_Service_Recommendation_Category
     extends Nosto_Tagging_Model_Service_Recommendation_Base
 {
+    const NOSTO_PREVIEW_COOKIE = 'nostopreview';
+
     /**
      * Returns an array of product ids sorted by relevance
      *
@@ -57,32 +59,35 @@ public function getSortedProductIds(
         if (!$featureAccess->canUseGraphql()) {
             return $productIds;
         }
-        switch ($type){
-            case Nosto_Tagging_Model_Category_Config::NOSTO_PERSONALIZED_KEY:
-                $recoOperation = new Nosto_Operation_Recommendation_CategoryBrowsingHistory(
-                    $nostoAccount,
-                    $nostoCustomerId
-                );
-                break;
-            default:
-                $recoOperation = new Nosto_Operation_Recommendation_CategoryTopList(
-                    $nostoAccount,
-                    $nostoCustomerId
-                );
-                break;
+        if ($type === Nosto_Tagging_Model_Category_Config::NOSTO_PERSONALIZED_KEY) {
+            $recoOperation = new Nosto_Operation_Recommendation_CategoryBrowsingHistory(
+                $nostoAccount,
+                $nostoCustomerId
+            );
+        } else {
+            $recoOperation = new Nosto_Operation_Recommendation_CategoryTopList(
+                $nostoAccount,
+                $nostoCustomerId
+            );
         }
         $recoOperation->setCategory($category);
+
+        $previewModeCookie = Mage::getModel('core/cookie')
+            ->get(self::NOSTO_PREVIEW_COOKIE);
+        if ($previewModeCookie !== null && $previewModeCookie === "true") {
+            $recoOperation->setPreviewMode(true);
+        }
+
         try {
             $result = $recoOperation->execute();
             foreach ($result as $item) {
-                if ($item->getProductId()) {
+                if ($item->getProductId() && is_numeric($item->getProductId())) {
                     $productIds[] = $item->getProductId();
                 }
             }
         } catch (\Exception $e) {
             Nosto_Tagging_Helper_Log::exception($e);
         }
-
         return $productIds;
     }
-}
+}

app/code/community/Nosto/Tagging/etc/config.xml

@@ -28,7 +28,7 @@
 <config>
     <modules>
         <Nosto_Tagging>
-            <version>3.10.0</version>
+            <version>3.11.0</version>
         </Nosto_Tagging>
     </modules>
     <global>

composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "nosto/php-sdk": "3.13.0"
+        "nosto/php-sdk": "3.15.0"
     },
     "require-dev": {
         "php": ">=7.1.0",
@@ -37,7 +37,8 @@
         "magento/marketplace-eqp": "1.*",
         "openmage/magento-mirror": "1.9",
         "wimg/php-compatibility": "^8.0",
-        "mridang/pearify": "0.3"
+        "mridang/pearify": "0.3",
+        "vlucas/phpdotenv": ">=2.4.0 <3.0"
     },
     "scripts": {
         "post-install-cmd": "if ! type \"composer\" > /dev/null; then echo \"composer not available in path - you must update the lib files manually\"; else composer dump-autoload --optimize; ./vendor/bin/pearify process .;fi",