From abcc5fe38d29b7598a25c136a2a2533be970de0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannu=20Po=CC=88lo=CC=88nen?= <hannu.polonen@nosto.com>
Date: Mon, 30 Mar 2020 13:28:12 -0400
Subject: [PATCH 1/4] Fix issue with non generated proxy classes during di
 compilation

---
 CHANGELOG.md   | 3 +++
 composer.json  | 2 +-
 etc/di.xml     | 2 +-
 etc/module.xml | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 251f7b012..f6827d4c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+# 4.0.6
+* Fix issue with non-generated proxy classes during di compilation 
+
 # 4.0.5
 * Fix an issue where product cache table was not created during upgrade
 
diff --git a/composer.json b/composer.json
index e723ccac5..446d166d3 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "require-dev": {
     "php": ">=7.1.0",
     "phan/phan": "0.8.8",
diff --git a/etc/di.xml b/etc/di.xml
index 6c6304c97..1454abcc4 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -85,7 +85,7 @@
     </type>
     <type name="Nosto\Tagging\Console\Command\NostoRebuildInvalidProductData">
         <arguments>
-            <argument name="productDataCron" xsi:type="object">Nosto\Tagging\Cron\ProductDataCron\Proxy</argument>
+            <argument name="productDataCron" xsi:type="object">Nosto\Tagging\Cron\ProductDataCron</argument>
         </arguments>
     </type>
     <type name="Nosto\Tagging\Observer\Order\Save">
diff --git a/etc/module.xml b/etc/module.xml
index ad92bfea5..bee467eec 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="4.0.5"/>
+    <module name="Nosto_Tagging" setup_version="4.0.6"/>
 </config>

From d0b9ac92a6122256dd8cb1913de16d198638ca9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannu=20Po=CC=88lo=CC=88nen?= <hannu.polonen@nosto.com>
Date: Mon, 30 Mar 2020 14:17:29 -0400
Subject: [PATCH 2/4] Remove redundant proxies from cron command

---
 etc/di.xml | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index 1454abcc4..c3163588b 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -83,9 +83,14 @@
             </argument>
         </arguments>
     </type>
+    <type name="Nosto\Tagging\Cron\ProductDataCron">
+        <arguments>
+            <argument name="batchSize" xsi:type="number">1000</argument>
+        </arguments>
+    </type>
     <type name="Nosto\Tagging\Console\Command\NostoRebuildInvalidProductData">
         <arguments>
-            <argument name="productDataCron" xsi:type="object">Nosto\Tagging\Cron\ProductDataCron</argument>
+            <argument name="productDataCron" xsi:type="object">Nosto\Tagging\Cron\ProductDataCron\Proxy</argument>
         </arguments>
     </type>
     <type name="Nosto\Tagging\Observer\Order\Save">
@@ -223,23 +228,6 @@
             <argument name="productLimit" xsi:type="number">1000</argument>
         </arguments>
     </type>
-    <type name="Nosto\Tagging\Cron\ProductDataCron">
-        <arguments>
-            <argument name="nostoAccountHelper" xsi:type="object">
-                Nosto\Tagging\Helper\Account\Proxy
-            </argument>
-            <argument name="nostoDataHelper" xsi:type="object">
-                Nosto\Tagging\Helper\Data\Proxy
-            </argument>
-            <argument name="cacheRepository" xsi:type="object">
-                Nosto\Tagging\Model\Product\Cache\CacheRepository\Proxy
-            </argument>
-            <argument name="cacheService" xsi:type="object">
-                Nosto\Tagging\Model\Service\Cache\CacheService\Proxy
-            </argument>
-            <argument name="batchSize" xsi:type="number">1000</argument>
-        </arguments>
-    </type>
     <type name="Nosto\Tagging\Model\Service\Sync\Upsert\AsyncBulkPublisher">
         <arguments>
             <argument name="asyncBulkConsumer" xsi:type="object" shared="false">

From 461101b0d0ac168efec24a4821e45b90a8692678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannu=20Po=CC=88lo=CC=88nen?= <hannu.polonen@nosto.com>
Date: Mon, 30 Mar 2020 14:33:27 -0400
Subject: [PATCH 3/4] Temporarily change the version

---
 composer.json  | 2 +-
 etc/module.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 446d166d3..a535ebb38 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "4.0.6",
+  "version": "4.0.6-rc1",
   "require-dev": {
     "php": ">=7.1.0",
     "phan/phan": "0.8.8",
diff --git a/etc/module.xml b/etc/module.xml
index bee467eec..d4ff31906 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="4.0.6"/>
+    <module name="Nosto_Tagging" setup_version="4.0.6-rc1"/>
 </config>

From f63922d8aa8dcaacfd5d96b75d0ea89a94697df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannu=20Po=CC=88lo=CC=88nen?= <hannu.polonen@nosto.com>
Date: Mon, 30 Mar 2020 14:47:23 -0400
Subject: [PATCH 4/4] Set version back to 4.0.6

---
 composer.json  | 2 +-
 etc/module.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a535ebb38..446d166d3 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "4.0.6-rc1",
+  "version": "4.0.6",
   "require-dev": {
     "php": ">=7.1.0",
     "phan/phan": "0.8.8",
diff --git a/etc/module.xml b/etc/module.xml
index d4ff31906..bee467eec 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -37,5 +37,5 @@
 <!--suppress XmlUnboundNsPrefix -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Nosto_Tagging" setup_version="4.0.6-rc1"/>
+    <module name="Nosto_Tagging" setup_version="4.0.6"/>
 </config>