Merge pull request #851 from Nosto/release/7.5.1

Release/7.5.1

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+registries:
+  adobe:
+    type: composer-repository
+    url: https://repo.magento.com
+    username: ${{ secrets.REPO_USR }}
+    password: ${{ secrets.REPO_PSW }}
+
+updates:
+  - package-ecosystem: composer
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 0
+    registries:
+      - adobe

CHANGELOG.md

@@ -1,5 +1,11 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 7.5.1
+* Upgrade SDK to 7.4
+* Remove PII information from Order Export
+* Query speed-up when building categories
+* Crypto utilities now use GCM mode
+
 ### 7.5.0
 * Add category parent id to tagging and product data
 

Model/Order/Builder.php

@@ -52,7 +52,6 @@
 use Nosto\Model\Order\OrderStatus;
 use Nosto\NostoException;
 use Nosto\Tagging\Logger\Logger as NostoLogger;
-use Nosto\Tagging\Model\Order\Buyer\Builder as NostoBuyerBuilder;
 use Nosto\Tagging\Model\Order\Item\Builder as NostoOrderItemBuilder;
 
 class Builder
@@ -63,27 +62,23 @@ class Builder
     private SalesRuleFactory $salesRuleFactory;
     private NostoOrderItemBuilder $nostoOrderItemBuilder;
     private ManagerInterface $eventManager;
-    private NostoBuyerBuilder $buyerBuilder;
 
     /**
      * @param NostoLogger $logger
      * @param SalesRuleFactory $salesRuleFactory
      * @param NostoOrderItemBuilder $nostoOrderItemBuilder
      * @param ManagerInterface $eventManager
-     * @param NostoBuyerBuilder $buyerBuilder
      */
     public function __construct(
         NostoLogger $logger,
         SalesRuleFactory $salesRuleFactory,
         NostoOrderItemBuilder $nostoOrderItemBuilder,
-        ManagerInterface $eventManager,
-        NostoBuyerBuilder $buyerBuilder
+        ManagerInterface $eventManager
     ) {
         $this->logger = $logger;
         $this->salesRuleFactory = $salesRuleFactory;
         $this->nostoOrderItemBuilder = $nostoOrderItemBuilder;
         $this->eventManager = $eventManager;
-        $this->buyerBuilder = $buyerBuilder;
     }
 
     /**
@@ -120,10 +115,7 @@ public function build(Order $order)
                 }
                 $nostoOrder->setOrderStatus($nostoStatus);
             }
-            $nostoBuyer = $this->buyerBuilder->fromOrder($order);
-            if ($nostoBuyer instanceof Buyer) {
-                $nostoOrder->setCustomer($nostoBuyer);
-            }
+            $nostoOrder->setCustomer(new Buyer());
 
             // Add each ordered item as a line item
             /** @var Item $item */

Model/Service/Product/Category/DefaultCategoryService.php

@@ -37,11 +37,9 @@
 namespace Nosto\Tagging\Model\Service\Product\Category;
 
 use Exception;
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
-use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Nosto\Tagging\Logger\Logger as NostoLogger;
@@ -50,24 +48,20 @@ class DefaultCategoryService implements CategoryServiceInterface
 {
 
     private NostoLogger $logger;
-    private CategoryRepositoryInterface $categoryRepository;
     private CollectionFactory $categoryCollectionFactory;
     private ManagerInterface $eventManager;
 
     /**
      * Builder constructor.
-     * @param CategoryRepositoryInterface $categoryRepository
      * @param CollectionFactory $categoryCollectionFactory
      * @param NostoLogger $logger
      * @param ManagerInterface $eventManager
      */
     public function __construct(
-        CategoryRepositoryInterface $categoryRepository,
         CollectionFactory $categoryCollectionFactory,
         NostoLogger $logger,
         ManagerInterface $eventManager
     ) {
-        $this->categoryRepository = $categoryRepository;
         $this->categoryCollectionFactory = $categoryCollectionFactory;
         $this->logger = $logger;
         $this->eventManager = $eventManager;
@@ -111,10 +105,11 @@ public function getCategory(Category $category, StoreInterface $store)
             }
 
             $categories = $this->categoryCollectionFactory->create()
-                ->addAttributeToSelect('*')
+                ->addAttributeToSelect('name')
+                ->addAttributeToSelect('level')
                 ->addAttributeToFilter('entity_id', $categoryIds)
                 ->setStore($store->getId())
-                ->addAttributeToSort('level', Collection::SORT_ORDER_ASC);
+                ->addAttributeToSort('level');
             foreach ($categories as $cat) {
                 if ($cat instanceof Category
                     && $cat->getLevel() > 1
@@ -135,7 +130,6 @@ public function getCategory(Category $category, StoreInterface $store)
                 ['categoryString' => $nostoCategory, 'magentoCategory' => $category]
             );
         }
-
         return $nostoCategory;
     }
 

Observer/Order/Save.php

@@ -46,7 +46,6 @@
 use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Sales\Model\Order;
 use Magento\Store\Model\Store;
-use Nosto\Model\Order\Buyer;
 use Nosto\Model\Order\Order as NostoOrder;
 use Nosto\Operation\Order\OrderCreate as NostoOrderCreate;
 use Nosto\Operation\Order\OrderStatus as NostoOrderUpdate;
@@ -256,7 +255,6 @@ private function sendNewOrder(Order $order, AccountInterface $nostoAccount, Stor
             $nostoCustomerIdentifier = NostoOrderCreate::IDENTIFIER_BY_REF;
         }
         $nostoOrder = $this->nostoOrderBuilder->build($order);
-        $nostoOrder->setCustomer(new Buyer()); // Remove customer data from order API calls
         if ($nostoCustomerId !== null) {
             try {
                 $orderService = new NostoOrderCreate(

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": "7.5.0",
+  "version": "7.5.1",
   "require-dev": {
     "phpmd/phpmd": "^2.5",
     "sebastian/phpcpd": "*",
@@ -41,7 +41,7 @@
     "php": ">=7.4.0",
     "magento/framework": ">=101.0.6|~104.0",
     "ext-json": "*",
-    "nosto/php-sdk": "^7.3",
+    "nosto/php-sdk": "^7.4",
     "laminas/laminas-uri": "*"
   },
   "repositories": [