Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: better ordering of query result

Browse Source 
(cherry picked from commit bfe42fdccb13ab797ac7252ada58df49af43ad54)
This commit is contained in:
ruthra kumar 2024-01-16 14:35:06 +05:30 committed by Mergify
parent 1b8f572e80
commit 5a65a10dba
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/controllers/queries.py
View File

@ -8,9 +8,10 @@ from collections import OrderedDict, defaultdict
import frappe import frappe
from frappe import qb, scrub from frappe import qb, scrub
from frappe.desk.reportview import get_filters_cond, get_match_cond from frappe.desk.reportview import get_filters_cond, get_match_cond
from frappe.query_builder import Criterion from frappe.query_builder import Criterion, CustomFunction
from frappe.query_builder.functions import Concat, Sum from frappe.query_builder.functions import Concat, Locate, Sum
from frappe.utils import nowdate, today, unique from frappe.utils import nowdate, today, unique
from pypika import Order
import erpnext import erpnext
from erpnext.stock.get_item_details import _get_item_tax_template from erpnext.stock.get_item_details import _get_item_tax_template
@ -343,6 +344,8 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
proj = qb.DocType("Project") proj = qb.DocType("Project")
qb_filter_and_conditions = [] qb_filter_and_conditions = []
qb_filter_or_conditions = [] qb_filter_or_conditions = []
ifelse = CustomFunction("IF", ["condition", "then", "else"])
if filters and filters.get("customer"): if filters and filters.get("customer"):
qb_filter_and_conditions.append(proj.customer == filters.get("customer")) qb_filter_and_conditions.append(proj.customer == filters.get("customer"))
@ -354,17 +357,29 @@ def get_project_name(doctype, txt, searchfield, start, page_len, filters):
for x in fields: for x in fields:
q = q.select(proj[x]) q = q.select(proj[x])
# ignore 'customer' and 'status' on searchfields as they must be exactly matched # don't consider 'customer' and 'status' fields for pattern search, as they must be exactly matched
searchfields = [ searchfields = [
x for x in frappe.get_meta(doctype).get_search_fields() if x not in ["customer", "status"] x for x in frappe.get_meta(doctype).get_search_fields() if x not in ["customer", "status"]
] ]
# pattern search
if txt: if txt:
for x in searchfields: for x in searchfields:
qb_filter_or_conditions.append(proj[x].like(f"%{txt}%")) qb_filter_or_conditions.append(proj[x].like(f"%{txt}%"))
q = q.where(Criterion.all(qb_filter_and_conditions)).where(Criterion.any(qb_filter_or_conditions)) q = q.where(Criterion.all(qb_filter_and_conditions)).where(Criterion.any(qb_filter_or_conditions))
# ordering
if txt:
# project_name containing search string 'txt' will be given higher precedence
q = q.orderby(ifelse(Locate(txt, proj.project_name) > 0, Locate(txt, proj.project_name), 99999))
q = q.orderby(proj.idx, order=Order.desc).orderby(proj.name)
if page_len: if page_len:
q = q.limit(page_len) q = q.limit(page_len)
if start:
q = q.offset(start)
return q.run() return q.run()