-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Init category indexer #858
Draft
supercid
wants to merge
22
commits into
develop
Choose a base branch
from
feature/category-indexer
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
adb846e
Init category indexer
supercid 95324ee
Configure ModeSwithcers, Refinement CategoryIndexer Class, preparatio…
ugljesaspx ced4270
Category indexer
ugljesaspx 34b8961
Fixing unused classes, and change names
ugljesaspx 78c5b0e
Merge branch 'develop' into feature/category-indexer
supercid 3ce60f6
Fix warning errors
ugljesaspx 3de71b3
Fix warnings and errors
ugljesaspx ce95047
Merge branch 'develop' into feature/category-indexer
supercid a65c321
Fixing unused classes, and change names
ugljesaspx 9dfe7a9
Merge branch 'feature/category-indexer' of github.com:Nosto/nosto-mag…
ugljesaspx e7bafbf
Fixing unused classes, and change names, test parent category ids fnc
ugljesaspx 8537de3
Update Model/Category/Repository.php
supercid 22444cf
Update Model/Category/Repository.php
supercid dac61dc
Update Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguratio…
supercid 7d9b919
Update Model/Service/Update/CategoryUpdateService.php
supercid d06c586
Category connection with Queue
ugljesaspx ccaf9ac
Merge branch 'feature/category-indexer' of github.com:Nosto/nosto-mag…
ugljesaspx 7a2d8ee
Adapat code for category reindex
ugljesaspx ee3b5b5
Adapat code for category reindex
ugljesaspx 7e75e9e
Merge branch 'develop' into feature/category-indexer
ugljesaspx c04cd74
Prepare for send categories to Nosto
ugljesaspx ee349e7
implement category sending to nosto
makso8makso File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
/** | ||
* Copyright (c) 2020, Nosto Solutions Ltd | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without modification, | ||
* are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, | ||
* this list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* 3. Neither the name of the copyright holder nor the names of its contributors | ||
* may be used to endorse or promote products derived from this software without | ||
* specific prior written permission. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
* @author Nosto Solutions Ltd <contact@nosto.com> | ||
* @copyright 2020 Nosto Solutions Ltd | ||
* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause | ||
* | ||
*/ | ||
|
||
namespace Nosto\Tagging\Exception; | ||
|
||
use Nosto\NostoException; | ||
use Throwable; | ||
|
||
class ParentCategoryDisabledException extends NostoException | ||
{ | ||
public function __construct($categoryId, $code = 0, Throwable $previous = null) | ||
{ | ||
$message = "Parent category is disabled for category with id: " . $categoryId; | ||
parent::__construct($message, $code, $previous); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
@@ -0,0 +1,189 @@ | ||||
<?php | ||||
/** | ||||
* Copyright (c) 2020, Nosto Solutions Ltd | ||||
* All rights reserved. | ||||
* | ||||
* Redistribution and use in source and binary forms, with or without modification, | ||||
* are permitted provided that the following conditions are met: | ||||
* | ||||
* 1. Redistributions of source code must retain the above copyright notice, | ||||
* this list of conditions and the following disclaimer. | ||||
* | ||||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||||
* this list of conditions and the following disclaimer in the documentation | ||||
* and/or other materials provided with the distribution. | ||||
* | ||||
* 3. Neither the name of the copyright holder nor the names of its contributors | ||||
* may be used to endorse or promote products derived from this software without | ||||
* specific prior written permission. | ||||
* | ||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||
* | ||||
* @author Nosto Solutions Ltd <contact@nosto.com> | ||||
* @copyright 2020 Nosto Solutions Ltd | ||||
* @license http://opensource.org/licenses/BSD-3-Clause BSD 3-Clause | ||||
* | ||||
*/ | ||||
|
||||
namespace Nosto\Tagging\Model\Category; | ||||
|
||||
use Magento\Catalog\Api\Data\CategoryInterface; | ||||
use Magento\Catalog\Model\CategoryRepository; | ||||
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection; | ||||
use Magento\Framework\Api\SearchCriteriaBuilder; | ||||
use Magento\Framework\Exception\LocalizedException; | ||||
use Magento\Store\Model\Store; | ||||
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory; | ||||
use Nosto\Tagging\Exception\ParentCategoryDisabledException; | ||||
|
||||
/** | ||||
* Repository wrapper class for fetching categories | ||||
*/ | ||||
class Repository | ||||
{ | ||||
private array $parentCategoryIdCache = []; | ||||
|
||||
/** @var SearchCriteriaBuilder $searchCriteriaBuilder */ | ||||
private SearchCriteriaBuilder $searchCriteriaBuilder; | ||||
|
||||
/** @var CategoryRepository $categoryRepository */ | ||||
private CategoryRepository $categoryRepository; | ||||
|
||||
/** @var CategoryCollectionFactory $categoryCollectionFactory */ | ||||
private CategoryCollectionFactory $categoryCollectionFactory; | ||||
|
||||
/** | ||||
* @param SearchCriteriaBuilder $searchCriteriaBuilder | ||||
*/ | ||||
public function __construct( | ||||
SearchCriteriaBuilder $searchCriteriaBuilder, | ||||
CategoryRepository $categoryRepository, | ||||
CategoryCollectionFactory $categoryCollectionFactory | ||||
) { | ||||
$this->searchCriteriaBuilder = $searchCriteriaBuilder; | ||||
$this->categoryRepository = $categoryRepository; | ||||
$this->categoryCollectionFactory = $categoryCollectionFactory; | ||||
} | ||||
|
||||
/** | ||||
* Gets categories by category ids | ||||
* | ||||
* @param array $ids | ||||
*/ | ||||
public function getByIds(array $ids) | ||||
{ | ||||
$searchCriteria = $this->searchCriteriaBuilder | ||||
->addFilter('entity_id', $ids, 'in') | ||||
->create(); | ||||
return $this->categoryRepository->getList($searchCriteria); | ||||
} | ||||
|
||||
/** | ||||
* Gets the parent category ID's for a given category | ||||
* | ||||
* @param CategoryInterface $category | ||||
* @return string[]|null | ||||
* | ||||
* @throws ParentCategoryDisabledException | ||||
*/ | ||||
public function resolveParentCategoryIds(CategoryInterface $category): ?array | ||||
{ | ||||
if ($this->getParentIdsFromCache($category)) { | ||||
return $this->getParentIdsFromCache($category); | ||||
} | ||||
|
||||
if ($category->getLevel() < 1 && !$category->getIsActive()) { | ||||
throw new ParentCategoryDisabledException( | ||||
sprintf( | ||||
'Category with id %s is disabled', | ||||
$category->getId() | ||||
) | ||||
); | ||||
} | ||||
|
||||
$parentCategoryIds = null; | ||||
if ($category->getLevel() >= 1) { | ||||
$parentCategoryIds = $this->getCategoryParentIds($category->getPath()); | ||||
$this->saveParentIdsToCache($category, $parentCategoryIds); | ||||
} | ||||
|
||||
return $parentCategoryIds; | ||||
} | ||||
|
||||
/** | ||||
* @param Store $store | ||||
* @param array $categoryIds | ||||
* | ||||
* @return CategoryCollection | ||||
* @throws LocalizedException | ||||
*/ | ||||
public function getCategoryCollectionQuery(Store $store, array $categoryIds = []) | ||||
{ | ||||
$categories = $this->categoryCollectionFactory->create() | ||||
->distinct(true) | ||||
->addNameToResult() | ||||
->setStoreId($store->getId()) | ||||
->addUrlRewriteToResult() | ||||
->addAttributeToFilter('level', ['gt' => 1]) | ||||
->addAttributeToSelect(array_merge(['name', 'is_active', 'include_in_menu'])) | ||||
->addOrderField('entity_id'); | ||||
|
||||
if ($categoryIds) { | ||||
$categories->addAttributeToFilter('entity_id', ['in' => $categoryIds]); | ||||
} | ||||
|
||||
return $categories; | ||||
} | ||||
|
||||
/** | ||||
* Get Parent Category IDS | ||||
* | ||||
* @param $path | ||||
* @return array | ||||
*/ | ||||
private function getCategoryParentIds($path): array | ||||
{ | ||||
$parentCategories = explode('/', $path); | ||||
|
||||
array_pop($parentCategories); | ||||
|
||||
return $parentCategories; | ||||
} | ||||
|
||||
/** | ||||
* Get parent ids from cache. Return null if the cache is not available | ||||
* | ||||
* @param CategoryInterface $category | ||||
* @return string[]|null | ||||
*/ | ||||
private function getParentIdsFromCache(CategoryInterface $category) | ||||
{ | ||||
if (isset($this->parentCategoryIdCache[$category->getId()])) { | ||||
return $this->parentCategoryIdCache[$category->getId()]; | ||||
} | ||||
|
||||
return null; | ||||
} | ||||
|
||||
/** | ||||
* Saves the parents category ids to internal cache to avoid redundant | ||||
* database queries | ||||
* | ||||
* @param CategoryInterface $category | ||||
* @param string[] $parentCategoryIds | ||||
*/ | ||||
private function saveParentIdsToCache(CategoryInterface $category, array $parentCategoryIds) | ||||
{ | ||||
$this->parentCategoryIdCache[$category->getId()] = $parentCategoryIds; | ||||
} | ||||
|
||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||
} | ||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can remove this method if it is not being used