From 29ebd85572f90ea6587245cd2eeca2ecf114adfc Mon Sep 17 00:00:00 2001 From: Kostiantyn Kichehlov <81977971+kkicheglovspryker@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:57:51 +0100 Subject: [PATCH 1/2] SUPESC-794 Fixed product abstract page search indexing. (#8391) SUPESC-794 Fixed product abstract page search indexing. --- composer.lock | 44 +++++++++---------- .../ProductAbstractPagePublisher.php | 9 +++- .../ProductConfigurationsRestApiFixtures.php | 1 - 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index e3184ec440..01da6783c2 100644 --- a/composer.lock +++ b/composer.lock @@ -246,16 +246,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.286.2", + "version": "3.286.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "33a763586e840e5162ff8144a9532aa43172e11c" + "reference": "29079a62c6a30ac594b50285494b4dec279b4648" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/33a763586e840e5162ff8144a9532aa43172e11c", - "reference": "33a763586e840e5162ff8144a9532aa43172e11c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/29079a62c6a30ac594b50285494b4dec279b4648", + "reference": "29079a62c6a30ac594b50285494b4dec279b4648", "shasum": "" }, "require": { @@ -335,9 +335,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.286.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.286.3" }, - "time": "2023-11-15T19:19:39+00:00" + "time": "2023-11-16T19:12:53+00:00" }, { "name": "brick/math", @@ -4861,23 +4861,23 @@ }, { "name": "react/promise", - "version": "v2.10.0", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38" + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", - "reference": "f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38", + "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831", + "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -4921,7 +4921,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.10.0" + "source": "https://github.com/reactphp/promise/tree/v2.11.0" }, "funding": [ { @@ -4929,7 +4929,7 @@ "type": "open_collective" } ], - "time": "2023-05-02T15:15:43+00:00" + "time": "2023-11-16T16:16:50+00:00" }, { "name": "riskio/oauth2-auth0", @@ -5480,12 +5480,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-sdk/evaluator.git", - "reference": "3c3afcc09b0f6eae02a779fb3eed5f67b78b71c4" + "reference": "cdd63f1a0b44ec82f37d1644f9981cf93d9a357a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/3c3afcc09b0f6eae02a779fb3eed5f67b78b71c4", - "reference": "3c3afcc09b0f6eae02a779fb3eed5f67b78b71c4", + "url": "https://api.github.com/repos/spryker-sdk/evaluator/zipball/cdd63f1a0b44ec82f37d1644f9981cf93d9a357a", + "reference": "cdd63f1a0b44ec82f37d1644f9981cf93d9a357a", "shasum": "" }, "require": { @@ -5546,9 +5546,9 @@ "description": "The tool for evaluating Spryker shops", "support": { "issues": "https://github.com/spryker-sdk/evaluator/issues", - "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.14" + "source": "https://github.com/spryker-sdk/evaluator/tree/0.1.15" }, - "time": "2023-11-14T13:31:16+00:00" + "time": "2023-11-16T15:12:17+00:00" }, { "name": "spryker-sdk/security-checker", @@ -6091,7 +6091,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/spryker.git", - "reference": "91b813ed52c3b55d0856961debf7204462ed8d05" + "reference": "14da64c3dbc03ca9bf8e606a51cc3cc4a36c7414" }, "require": { "php": ">=8.1" @@ -7142,7 +7142,7 @@ "proprietary" ], "description": "Spryker Framework", - "time": "2023-11-16T13:02:58+00:00" + "time": "2023-11-17T08:53:15+00:00" }, { "name": "spryker/spryker-shop", @@ -18186,7 +18186,7 @@ "source": { "type": "git", "url": "git@github.com:spryker/robotframework-suite-tests.git", - "reference": "ce5b2dcdf54309293c6c9dbdd107ac7a0439aa86" + "reference": "152ece9e1582e74e41230d98ae641846573689be" }, "default-branch": true, "type": "library", @@ -18194,7 +18194,7 @@ "MIT" ], "description": "Automated tests for the Robot Framework", - "time": "2023-11-15T18:01:33+00:00" + "time": "2023-11-17T08:53:06+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductAbstractPagePublisher.php b/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductAbstractPagePublisher.php index 9181938a5f..ffc66d131a 100644 --- a/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductAbstractPagePublisher.php +++ b/src/Pyz/Zed/ProductPageSearch/Business/Publisher/ProductAbstractPagePublisher.php @@ -131,7 +131,7 @@ protected function storeData( $isRefresh, ); $productPageSearchTransfers = $this->executeProductPageSearchCollectionFilterPlugins($productPageSearchTransfers); - $indexedProductAbstractPageSearchTransfers = $this->indexProductPageSearchTransfersByLocaleAndIdProductAbstract( + $productPageSearchTransfersIndexedByLocaleAndIdProductAbstract = $this->getProductPageSearchTransfersIndexedByLocaleAndIdProductAbstract( $productPageSearchTransfers, ); @@ -148,7 +148,12 @@ protected function storeData( } $idProductAbstract = $productAbstractLocalizedEntity['fk_product_abstract']; - $productPageSearchTransfer = $indexedProductAbstractPageSearchTransfers[$locale][$idProductAbstract] ?? null; + $productPageSearchTransfer = $this->findProductPageSearchTransferFromIndexedList( + $productPageSearchTransfersIndexedByLocaleAndIdProductAbstract, + $idProductAbstract, + $locale, + $store, + ); if ($productPageSearchTransfer === null) { $this->deleteProductAbstractPageSearchEntity($productAbstractPageSearchEntity); diff --git a/tests/PyzTest/Glue/ProductConfigurations/RestApi/Fixtures/ProductConfigurationsRestApiFixtures.php b/tests/PyzTest/Glue/ProductConfigurations/RestApi/Fixtures/ProductConfigurationsRestApiFixtures.php index 83f7ebe547..5cde7e0ccb 100644 --- a/tests/PyzTest/Glue/ProductConfigurations/RestApi/Fixtures/ProductConfigurationsRestApiFixtures.php +++ b/tests/PyzTest/Glue/ProductConfigurations/RestApi/Fixtures/ProductConfigurationsRestApiFixtures.php @@ -176,7 +176,6 @@ protected function createProductConcrete(ProductConfigurationsApiTester $I): voi PriceProductTransfer::MONEY_VALUE => [ MoneyValueTransfer::NET_AMOUNT => 100, MoneyValueTransfer::GROSS_AMOUNT => 100, - MoneyValueTransfer::STORE => static::STORE_NAME_DE, ], ]); } From 3e222a788dc55eb7a94af757bb330668177125b8 Mon Sep 17 00:00:00 2001 From: Spryker Bot Date: Fri, 17 Nov 2023 09:05:03 +0000 Subject: [PATCH 2/2] SUPESC-794 Merge nonsplit/master. --- composer.lock | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 4e4724bd43..86a2ae60c5 100644 --- a/composer.lock +++ b/composer.lock @@ -43529,20 +43529,20 @@ }, { "name": "spryker/price-cart-connector", - "version": "6.10.0", + "version": "6.10.1", "source": { "type": "git", "url": "https://github.com/spryker/price-cart-connector.git", - "reference": "7dbe63842213706feb24ccfde71fe7d3148dafd6" + "reference": "0a7d30c5c63629072ba1caa3b93a1918d8a36b40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/price-cart-connector/zipball/7dbe63842213706feb24ccfde71fe7d3148dafd6", - "reference": "7dbe63842213706feb24ccfde71fe7d3148dafd6", + "url": "https://api.github.com/repos/spryker/price-cart-connector/zipball/0a7d30c5c63629072ba1caa3b93a1918d8a36b40", + "reference": "0a7d30c5c63629072ba1caa3b93a1918d8a36b40", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", "spryker/cart-extension": "^2.4.0 || ^4.0.0", "spryker/currency": "^3.0.0 || ^4.0.0", "spryker/kernel": "^3.30.0", @@ -43581,9 +43581,9 @@ ], "description": "PriceCartConnector module", "support": { - "source": "https://github.com/spryker/price-cart-connector/tree/6.10.0" + "source": "https://github.com/spryker/price-cart-connector/tree/6.10.1" }, - "time": "2023-03-31T19:36:11+00:00" + "time": "2023-11-17T08:53:15+00:00" }, { "name": "spryker/price-cart-connector-extension", @@ -43715,20 +43715,20 @@ }, { "name": "spryker/price-product", - "version": "4.43.0", + "version": "4.43.1", "source": { "type": "git", "url": "https://github.com/spryker/price-product.git", - "reference": "e623a4cccc82741cb814b76fa49b5e375c670f1e" + "reference": "153c34eafe6fe1084f5bf5ae1a96e3583231625c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/price-product/zipball/e623a4cccc82741cb814b76fa49b5e375c670f1e", - "reference": "e623a4cccc82741cb814b76fa49b5e375c670f1e", + "url": "https://api.github.com/repos/spryker/price-product/zipball/153c34eafe6fe1084f5bf5ae1a96e3583231625c", + "reference": "153c34eafe6fe1084f5bf5ae1a96e3583231625c", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/currency": "^3.10.0 || ^4.0.0", "spryker/event": "^1.0.0 || ^2.0.0", @@ -43781,9 +43781,9 @@ ], "description": "PriceProduct module", "support": { - "source": "https://github.com/spryker/price-product/tree/4.43.0" + "source": "https://github.com/spryker/price-product/tree/4.43.1" }, - "time": "2023-09-20T10:37:58+00:00" + "time": "2023-11-17T08:53:15+00:00" }, { "name": "spryker/price-product-data-import", @@ -53383,20 +53383,20 @@ }, { "name": "spryker/product-page-search", - "version": "3.32.0", + "version": "3.33.0", "source": { "type": "git", "url": "https://github.com/spryker/product-page-search.git", - "reference": "baa5f5ff6a301fd1ae450294a547684f96188edd" + "reference": "3031c109288eced9b9384e1ee6912901c87185d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-page-search/zipball/baa5f5ff6a301fd1ae450294a547684f96188edd", - "reference": "baa5f5ff6a301fd1ae450294a547684f96188edd", + "url": "https://api.github.com/repos/spryker/product-page-search/zipball/3031c109288eced9b9384e1ee6912901c87185d5", + "reference": "3031c109288eced9b9384e1ee6912901c87185d5", "shasum": "" }, "require": { - "php": ">=8.0", + "php": ">=8.1", "spryker/catalog-price-product-connector": "^1.1.0", "spryker/category": "^4.3.0 || ^5.0.0", "spryker/error-handler": "^2.0.0", @@ -53454,9 +53454,9 @@ ], "description": "ProductPageSearch module", "support": { - "source": "https://github.com/spryker/product-page-search/tree/3.32.0" + "source": "https://github.com/spryker/product-page-search/tree/3.33.0" }, - "time": "2023-10-19T14:17:55+00:00" + "time": "2023-11-17T08:53:15+00:00" }, { "name": "spryker/product-page-search-extension", @@ -76092,12 +76092,12 @@ "source": { "type": "git", "url": "https://github.com/JetBrains/phpstorm-stubs.git", - "reference": "b40ca7fe5691d2365a24e415f415d4b9af1abc9b" + "reference": "295a9901918c4e91512a96eef4013c7601f17920" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/b40ca7fe5691d2365a24e415f415d4b9af1abc9b", - "reference": "b40ca7fe5691d2365a24e415f415d4b9af1abc9b", + "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/295a9901918c4e91512a96eef4013c7601f17920", + "reference": "295a9901918c4e91512a96eef4013c7601f17920", "shasum": "" }, "require-dev": { @@ -76133,7 +76133,7 @@ "support": { "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master" }, - "time": "2023-11-15T10:59:56+00:00" + "time": "2023-11-17T07:00:23+00:00" }, { "name": "masterminds/html5", @@ -78114,12 +78114,12 @@ "source": { "type": "git", "url": "https://github.com/spryker/robotframework-suite-tests.git", - "reference": "ce5b2dcdf54309293c6c9dbdd107ac7a0439aa86" + "reference": "152ece9e1582e74e41230d98ae641846573689be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/ce5b2dcdf54309293c6c9dbdd107ac7a0439aa86", - "reference": "ce5b2dcdf54309293c6c9dbdd107ac7a0439aa86", + "url": "https://api.github.com/repos/spryker/robotframework-suite-tests/zipball/152ece9e1582e74e41230d98ae641846573689be", + "reference": "152ece9e1582e74e41230d98ae641846573689be", "shasum": "" }, "default-branch": true, @@ -78133,7 +78133,7 @@ "issues": "https://github.com/spryker/robotframework-suite-tests/issues", "source": "https://github.com/spryker/robotframework-suite-tests/tree/master" }, - "time": "2023-11-15T18:01:33+00:00" + "time": "2023-11-17T08:53:06+00:00" }, { "name": "spryker/silex",