Skip to content

Commit

Permalink
Merge pull request #5272 from devansh-webkul/layered-navigation-optim…
Browse files Browse the repository at this point in the history 
…ization

Layered navigation ajaxified and shop routes enhanced  #4834
  • Loading branch information
@devansh-webkul
devansh-webkul committed Oct 26, 2021
2 parents 18d1cf0 + 7a1ef2b commit 02a19aa
Show file tree
Hide file tree
Showing 10 changed files with 500 additions and 368 deletions.
187 changes: 125 additions & 62 deletions packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,73 @@

namespace Webkul\Product\Repositories;

use Illuminate\Container\Container as App;
use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Core\Eloquent\Repository;

class ProductFlatRepository extends Repository
{
public function model()
{
return 'Webkul\Product\Contracts\ProductFlat';
/**
* Create a new repository instance.
*
* @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository
* @param \Illuminate\Container\Container $app
* @return void
*/
public function __construct(
AttributeRepository $attributeRepository,
App $app
) {
$this->attributeRepository = $attributeRepository;

parent::__construct($app);
}

/**
* Maximum Price of Category Product
* Specify model.
*
* @param \Webkul\Category\Contracts\Category $category
* @return float
* @return string
*/
public function getCategoryProductMaximumPrice($category = null)
public function model(): string
{
static $loadedCategoryMaxPrice = [];

if (! $category) {
return $this->model->max('max_price');
}
return \Webkul\Product\Contracts\ProductFlat::class;
}

if (array_key_exists($category->id, $loadedCategoryMaxPrice)) {
return $loadedCategoryMaxPrice[$category->id];
}
/**
* Get category product model.
*
* @param int $categoryId
* @return \Illuminate\Support\Querybuilder
*/
public function categoryProductQuerybuilder($categoryId)
{
return $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
->where('product_categories.category_id', $categoryId)
->where('product_flat.channel', core()->getCurrentChannelCode())
->where('product_flat.locale', app()->getLocale());
}

return $loadedCategoryMaxPrice[$category->id] = $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
->where('product_categories.category_id', $category->id)
->max('max_price');
/**
* Update `product_flat` custom column.
*
* @param \Webkul\Attribute\Models\Attribute $attribute
* @param \Webkul\Product\Listeners\ProductFlat $listener
* @return object
*/
public function updateAttributeColumn(
\Webkul\Attribute\Models\Attribute $attribute,
\Webkul\Product\Listeners\ProductFlat $listener
) {
return $this->model
->leftJoin('product_attribute_values as v', function ($join) use ($attribute) {
$join->on('product_flat.id', '=', 'v.product_id')
->on('v.attribute_id', '=', \DB::raw($attribute->id));
})->update(['product_flat.' . $attribute->code => \DB::raw($listener->attributeTypeFields[$attribute->type] . '_value')]);
}

/**
* get Category Product Attribute
* Get category product attribute.
*
* @param int $categoryId
* @return array
Expand All @@ -49,20 +81,20 @@ public function getCategoryProductAttribute($categoryId)
$productIds = $qb->pluck('product_flat.product_id')->toArray();

$childProductIds = $this->model->distinct()
->whereIn('parent_id', $productFlatIds)
->pluck('product_id')->toArray();
->whereIn('parent_id', $productFlatIds)
->pluck('product_id')->toArray();

$productIds = array_merge($productIds, $childProductIds);

$attributeValues = $this->model
->distinct()
->leftJoin('product_attribute_values as pa', 'product_flat.product_id', 'pa.product_id')
->leftJoin('attributes as at', 'pa.attribute_id', 'at.id')
->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id')
->select('pa.integer_value', 'pa.text_value', 'pa.attribute_id', 'ps.attribute_id as attributeId')
->where('is_filterable', 1)
->WhereIn('pa.product_id', $productIds)
->get();
->distinct()
->leftJoin('product_attribute_values as pa', 'product_flat.product_id', 'pa.product_id')
->leftJoin('attributes as at', 'pa.attribute_id', 'at.id')
->leftJoin('product_super_attributes as ps', 'product_flat.product_id', 'ps.product_id')
->select('pa.integer_value', 'pa.text_value', 'pa.attribute_id', 'ps.attribute_id as attributeId')
->where('is_filterable', 1)
->WhereIn('pa.product_id', $productIds)
->get();

$attributeInfo['attributeOptions'] = $attributeInfo['attributes'] = [];

Expand Down Expand Up @@ -92,24 +124,9 @@ public function getCategoryProductAttribute($categoryId)
}

/**
* get Category Product Model
*
* @param int $categoryId
* @return \Illuminate\Support\Querybuilder
*/
public function categoryProductQuerybuilder($categoryId) {

return $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
->where('product_categories.category_id', $categoryId)
->where('product_flat.channel', core()->getCurrentChannelCode())
->where('product_flat.locale', app()->getLocale());
}

/**
* filter attributes according to products
* Filter attributes according to products.
*
* @param array $category
* @param \Webkul\Category\Contracts\Category $category
* @return \Illuminate\Support\Collection
*/
public function getProductsRelatedFilterableAttributes($category)
Expand All @@ -129,32 +146,78 @@ public function getProductsRelatedFilterableAttributes($category)

$allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryArrributes['attributes'])));

$attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->getModel()::with(['options' => function($query) use ($productCategoryArrributes) {
$attributes = $this->attributeRepository->getModel()::with([
'options' => function ($query) use ($productCategoryArrributes) {
return $query->whereIn('id', $productCategoryArrributes['attributeOptions'])
->orderBy('sort_order');
->orderBy('sort_order');
}
])->whereIn('id', $allFilterableAttributes)->get();

return $loadedCategoryAttributes[$category->id] = $attributes;
} else {

return $loadedCategoryAttributes[$category->id] = $category->filterableAttributes;
}
}

/**
* update product_flat custom column
* Maximum price of category product.
*
* @param \Webkul\Attribute\Models\Attribute $attribute
* @param \Webkul\Product\Listeners\ProductFlat $listener
* @param \Webkul\Category\Contracts\Category $category
* @return float
*/
public function updateAttributeColumn(
\Webkul\Attribute\Models\Attribute $attribute ,
\Webkul\Product\Listeners\ProductFlat $listener ) {
return $this->model
->leftJoin('product_attribute_values as v', function($join) use ($attribute) {
$join->on('product_flat.id', '=', 'v.product_id')
->on('v.attribute_id', '=', \DB::raw($attribute->id));
})->update(['product_flat.'.$attribute->code => \DB::raw($listener->attributeTypeFields[$attribute->type] .'_value')]);
public function getCategoryProductMaximumPrice($category = null)
{
static $loadedCategoryMaxPrice = [];

if (! $category) {
return $this->model->max('max_price');
}

if (array_key_exists($category->id, $loadedCategoryMaxPrice)) {
return $loadedCategoryMaxPrice[$category->id];
}

return $loadedCategoryMaxPrice[$category->id] = $this->model
->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
->where('product_categories.category_id', $category->id)
->max('max_price');
}

/**
* Get filter attributes.
*
* @param \Webkul\Category\Contracts\Category $category
* @return array
*/
public function getFilterAttributes($category)
{
$filterAttributes = [];

if (isset($category)) {
$filterAttributes = $this->getProductsRelatedFilterableAttributes($category);
}

if (! count($filterAttributes) > 0) {
$filterAttributes = $this->attributeRepository->getFilterAttributes();
}

return $filterAttributes;
}

/**
* Handle category product max price.
*
* @param \Webkul\Category\Contracts\Category $category
* @return float
*/
public function handleCategoryProductMaximumPrice($category)
{
$maxPrice = 0;

if (isset($category)) {
$maxPrice = core()->convertPrice($this->getCategoryProductMaximumPrice($category));
}

return $maxPrice;
}
}
}

0 comments on commit 02a19aa

Please sign in to comment.