From f08e883b085f26a3b4a25805e54dce4255287f87 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 14 Sep 2022 17:14:28 +0530 Subject: [PATCH 1/4] Optimized getting category filterable attributes --- .../Webkul/Attribute/src/Repositories/AttributeRepository.php | 3 ++- packages/Webkul/Category/src/Models/Category.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index d75e110ae..326754277 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -136,7 +136,8 @@ class AttributeRepository extends Repository */ public function getFilterAttributes() { - return $this->model->where('is_filterable', 1)->with('options')->get(); + dd(111); + return $this->model->with(['options', 'translations'])->where('is_filterable', 1)->get(); } /** diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php index 422030fbd..449ff9d40 100755 --- a/packages/Webkul/Category/src/Models/Category.php +++ b/packages/Webkul/Category/src/Models/Category.php @@ -90,6 +90,8 @@ class Category extends TranslatableModel implements CategoryContract 'options' => function ($query) { $query->orderBy('sort_order'); }, + 'translations', + 'options.translations' ]); } From d5c812d6eb6be04517d90434d8ab2d835542838a Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 14 Sep 2022 17:15:20 +0530 Subject: [PATCH 2/4] Added eager load to attribute options translation --- .../Webkul/Attribute/src/Repositories/AttributeRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 326754277..60c161494 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -137,7 +137,7 @@ class AttributeRepository extends Repository public function getFilterAttributes() { dd(111); - return $this->model->with(['options', 'translations'])->where('is_filterable', 1)->get(); + return $this->model->with(['options', 'options.translations'])->where('is_filterable', 1)->get(); } /** From f4198b2ad7ba2958cc859420594ef8787aa70888 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 14 Sep 2022 17:16:09 +0530 Subject: [PATCH 3/4] Remove dd --- .../Webkul/Attribute/src/Repositories/AttributeRepository.php | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php index 60c161494..2bd168138 100755 --- a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php +++ b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php @@ -136,7 +136,6 @@ class AttributeRepository extends Repository */ public function getFilterAttributes() { - dd(111); return $this->model->with(['options', 'options.translations'])->where('is_filterable', 1)->get(); } From 9005f26c5033bea52af8fe73e01d1e562ea55ce2 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 14 Sep 2022 17:16:34 +0530 Subject: [PATCH 4/4] Fixed coding style --- packages/Webkul/Category/src/Models/Category.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php index 449ff9d40..4bf67577a 100755 --- a/packages/Webkul/Category/src/Models/Category.php +++ b/packages/Webkul/Category/src/Models/Category.php @@ -91,7 +91,7 @@ class Category extends TranslatableModel implements CategoryContract $query->orderBy('sort_order'); }, 'translations', - 'options.translations' + 'options.translations', ]); }