refactor(postgres): port sales_funnel funnel counts to the query builder

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

erpnext/selling/page/sales_funnel/sales_funnel.py

@@ -5,6 +5,7 @@ from itertools import groupby
 
 import frappe
 from frappe import _
+from frappe.query_builder.functions import Count, Date
 from frappe.utils import flt
 
 from erpnext.accounts.report.utils import convert
@@ -22,33 +23,47 @@ def validate_filters(from_date, to_date, company):
 def get_funnel_data(from_date: str, to_date: str, company: str):
 	validate_filters(from_date, to_date, company)
 
-	active_leads = frappe.db.sql(
-		"""select count(*) from `tabLead`
-		where (date(`creation`) between %s and %s)
-		and company=%s""",
-		(from_date, to_date, company),
+	lead = frappe.qb.DocType("Lead")
+	active_leads = (
+		frappe.qb.from_(lead)
+		.select(Count("*"))
+		.where(Date(lead.creation).between(from_date, to_date) & (lead.company == company))
+		.run()
 	)[0][0]
 
-	opportunities = frappe.db.sql(
-		"""select count(*) from `tabOpportunity`
-		where (date(`creation`) between %s and %s)
-		and opportunity_from='Lead' and company=%s""",
-		(from_date, to_date, company),
+	opportunity = frappe.qb.DocType("Opportunity")
+	opportunities = (
+		frappe.qb.from_(opportunity)
+		.select(Count("*"))
+		.where(
+			Date(opportunity.creation).between(from_date, to_date)
+			& (opportunity.opportunity_from == "Lead")
+			& (opportunity.company == company)
+		)
+		.run()
 	)[0][0]
 
-	quotations = frappe.db.sql(
-		"""select count(*) from `tabQuotation`
-		where docstatus = 1 and (date(`creation`) between %s and %s)
-		and (opportunity!="" or quotation_to="Lead") and company=%s""",
-		(from_date, to_date, company),
+	quotation = frappe.qb.DocType("Quotation")
+	quotations = (
+		frappe.qb.from_(quotation)
+		.select(Count("*"))
+		.where(
+			(quotation.docstatus == 1)
+			& Date(quotation.creation).between(from_date, to_date)
+			& ((quotation.opportunity != "") | (quotation.quotation_to == "Lead"))
+			& (quotation.company == company)
+		)
+		.run()
 	)[0][0]
 
-	converted = frappe.db.sql(
-		"""select count(*) from `tabCustomer`
-		JOIN `tabLead` ON `tabLead`.name = `tabCustomer`.lead_name
-		WHERE (date(`tabCustomer`.creation) between %s and %s)
-		and `tabLead`.company=%s""",
-		(from_date, to_date, company),
+	customer = frappe.qb.DocType("Customer")
+	converted = (
+		frappe.qb.from_(customer)
+		.inner_join(lead)
+		.on(lead.name == customer.lead_name)
+		.select(Count("*"))
+		.where(Date(customer.creation).between(from_date, to_date) & (lead.company == company))
+		.run()
 	)[0][0]
 
 	return [

erpnext/selling/page/sales_funnel/test_sales_funnel.py

@@ -0,0 +1,125 @@
+# Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+from frappe.utils import add_days, random_string, today
+
+from erpnext.crm.doctype.opportunity.test_opportunity import make_opportunity
+from erpnext.selling.doctype.quotation.test_quotation import make_quotation
+from erpnext.selling.page.sales_funnel.sales_funnel import get_funnel_data
+from erpnext.tests.utils import ERPNextTestSuite
+
+
+class TestSalesFunnel(ERPNextTestSuite):
+	def get_stage_value(self, data, title):
+		for stage in data:
+			if stage["title"] == title:
+				return stage["value"]
+		self.fail(f"Stage {title!r} not found in funnel data: {data}")
+
+	def make_lead(self, company):
+		# The funnel filters Lead on `company`, which the shared crm make_lead()
+		# helper does not set, so build the Lead directly here.
+		return frappe.get_doc(
+			{
+				"doctype": "Lead",
+				"first_name": "_Test Funnel",
+				"last_name": random_string(6),
+				"email_id": f"funnel_{random_string(8)}@example.com",
+				"company": company,
+				"status": "Lead",
+			}
+		).insert(ignore_permissions=True)
+
+	def test_funnel_lead_and_opportunity_counts(self):
+		company = "_Test Company"
+		# validate_filters() rejects from_date >= to_date, and the query matches on
+		# Date(creation), so use [today, tomorrow] to capture docs created today.
+		from_date, to_date = today(), add_days(today(), 1)
+
+		# Baseline before creating anything (robust against pre-existing rows).
+		baseline = get_funnel_data(from_date, to_date, company)
+		baseline_leads = self.get_stage_value(baseline, "Active Leads")
+		baseline_opportunities = self.get_stage_value(baseline, "Opportunities")
+
+		# Create two leads for this company today.
+		lead_1 = self.make_lead(company)
+		self.make_lead(company)
+
+		# Create one opportunity (opportunity_from='Lead') against one of the leads.
+		opportunity = make_opportunity(
+			company=company,
+			opportunity_from="Lead",
+			lead=lead_1.name,
+		)
+		self.assertEqual(opportunity.opportunity_from, "Lead")
+		self.assertEqual(opportunity.party_name, lead_1.name)
+
+		after = get_funnel_data(from_date, to_date, company)
+		after_leads = self.get_stage_value(after, "Active Leads")
+		after_opportunities = self.get_stage_value(after, "Opportunities")
+
+		# The two new leads and one new opportunity must be reflected exactly.
+		self.assertEqual(after_leads - baseline_leads, 2)
+		self.assertEqual(after_opportunities - baseline_opportunities, 1)
+
+		# Sanity: counts are at least what we created.
+		self.assertGreaterEqual(after_leads, 2)
+		self.assertGreaterEqual(after_opportunities, 1)
+
+	def test_funnel_filters_by_company(self):
+		# A lead for a different company must not inflate the target company's count.
+		company = "_Test Company"
+		other_company = "_Test Company 1"
+		from_date, to_date = today(), add_days(today(), 1)
+
+		baseline_leads = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Active Leads")
+
+		# Lead created for a different company.
+		self.make_lead(other_company)
+
+		after_leads = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Active Leads")
+		self.assertEqual(after_leads, baseline_leads)
+
+	def test_funnel_quotations_count(self):
+		# A submitted Quotation linked to an Opportunity (the `opportunity != ""`
+		# branch of the funnel filter) must be reflected in the Quotations stage.
+		company = "_Test Company"
+		from_date, to_date = today(), add_days(today(), 1)
+
+		baseline_quotations = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Quotations")
+
+		opportunity = make_opportunity(company=company, opportunity_from="Customer")
+
+		quotation = make_quotation(party_name="_Test Customer", company=company, do_not_submit=True)
+		quotation.opportunity = opportunity.name
+		quotation.submit()
+		self.assertEqual(quotation.docstatus, 1)
+
+		after_quotations = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Quotations")
+		self.assertEqual(after_quotations - baseline_quotations, 1)
+		self.assertGreaterEqual(after_quotations, 1)
+
+	def test_funnel_converted_count(self):
+		# A Customer joined to a Lead of this company (Customer INNER JOIN Lead on
+		# lead_name) must be reflected in the Converted stage.
+		company = "_Test Company"
+		from_date, to_date = today(), add_days(today(), 1)
+
+		baseline_converted = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Converted")
+
+		lead = self.make_lead(company)
+		frappe.get_doc(
+			{
+				"doctype": "Customer",
+				"customer_name": f"_Test Funnel Customer {random_string(6)}",
+				"customer_type": "Company",
+				"customer_group": "_Test Customer Group",
+				"territory": "_Test Territory",
+				"lead_name": lead.name,
+			}
+		).insert(ignore_permissions=True)
+
+		after_converted = self.get_stage_value(get_funnel_data(from_date, to_date, company), "Converted")
+		self.assertEqual(after_converted - baseline_converted, 1)
+		self.assertGreaterEqual(after_converted, 1)