perf: Optimize get_attribute_filters (#26729)

* perf: Optimize get_attribute_filters

* fix: handle when filter attributes are undefined

* chore: unused imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
This commit is contained in:
Faris Ansari
2021-09-14 11:41:19 +05:30
committed by marination
parent b6dc71679e
commit 666e8cd076
2 changed files with 26 additions and 32 deletions

View File

@@ -96,38 +96,32 @@ class ProductFiltersBuilder:
return return
attributes = [row.attribute for row in self.doc.filter_attributes] attributes = [row.attribute for row in self.doc.filter_attributes]
attribute_docs = [
frappe.get_doc('Item Attribute', attribute) for attribute in attributes
]
valid_attributes = [] if not attributes:
return []
for attr_doc in attribute_docs: result = frappe.db.sql(
selected_attributes = [] """
for attr in attr_doc.item_attribute_values: select
or_filters = [] distinct attribute, attribute_value
filters= [ from
["Item Variant Attribute", "attribute", "=", attr.parent], `tabItem Variant Attribute`
["Item Variant Attribute", "attribute_value", "=", attr.attribute_value] where
] attribute in %(attributes)s
if self.item_group: and attribute_value is not null
or_filters.extend([ """,
["item_group", "=", self.item_group], {"attributes": attributes},
["Website Item Group", "item_group", "=", self.item_group] as_dict=1,
]) )
if frappe.db.get_all("Item", filters, or_filters=or_filters, limit=1): attribute_value_map = {}
selected_attributes.append(attr) for d in result:
attribute_value_map.setdefault(d.attribute, []).append(d.attribute_value)
if selected_attributes: out = []
valid_attributes.append( for name, values in attribute_value_map.items():
_dict( out.append(frappe._dict(name=name, item_attribute_values=values))
item_attribute_values=selected_attributes, return out
name=attr_doc.name
)
)
return valid_attributes
def get_discount_filters(self, discounts): def get_discount_filters(self, discounts):
discount_filters = [] discount_filters = []

View File

@@ -339,15 +339,15 @@
<div class="filter-options"> <div class="filter-options">
{% for attr_value in attribute.item_attribute_values %} {% for attr_value in attribute.item_attribute_values %}
<div class="checkbox"> <div class="checkbox">
<label data-value="{{ attr_value }}"> <label>
<input type="checkbox" <input type="checkbox"
class="product-filter attribute-filter" class="product-filter attribute-filter"
id="{{attr_value.name}}" id="{{ attr_value }}"
data-attribute-name="{{ attribute.name }}" data-attribute-name="{{ attribute.name }}"
data-attribute-value="{{ attr_value.attribute_value }}" data-attribute-value="{{ attr_value }}"
style="width: 14px !important" style="width: 14px !important"
{% if attr_value.checked %} checked {% endif %}> {% if attr_value.checked %} checked {% endif %}>
<span class="label-area">{{ attr_value.attribute_value }}</span> <span class="label-area">{{ attr_value }}</span>
</label> </label>
</div> </div>
{% endfor %} {% endfor %}