- Add queryTimed() wrapper and logPerf() for per-endpoint timing metrics - Add api_perf_log table flush mechanism with background thread batching - Add application-scope cache (appCacheGet/Put/Invalidate) with TTL - Cache businesses/get (5m), addresses/states (24h), menu/items (2m) - Fix N+1 queries in orders/history, orders/listForKDS (batch fetch) - Fix correlated subquery in orders/getDetail (LEFT JOIN) - Combine 4 queries into 1 in portal/stats (subselects) - Optimize getForBuilder tree building with pre-indexed parent lookup - Add cache invalidation in update, saveBrandColor, updateHours, saveFromBuilder - New admin/perf.cfm dashboard (localhost-protected) - Instrument top 10 endpoints with queryTimed + logPerf Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
235 lines
No EOL
8.5 KiB
Text
235 lines
No EOL
8.5 KiB
Text
<cfsetting showdebugoutput="false">
|
|
<cfsetting enablecfoutputonly="true">
|
|
|
|
<cffunction name="apiAbort" access="public" returntype="void" output="true">
|
|
<cfargument name="payload" type="struct" required="true">
|
|
<cfcontent type="application/json; charset=utf-8">
|
|
<cfoutput>#serializeJSON(arguments.payload)#</cfoutput>
|
|
<cfabort>
|
|
</cffunction>
|
|
|
|
<cffunction name="readJsonBody" access="public" returntype="struct" output="false">
|
|
<cfset var raw = getHttpRequestData().content>
|
|
<cfif isNull(raw) OR len(trim(raw)) EQ 0>
|
|
<cfreturn {}>
|
|
</cfif>
|
|
<cftry>
|
|
<cfset var data = deserializeJSON(raw)>
|
|
<cfif isStruct(data)>
|
|
<cfreturn data>
|
|
<cfelse>
|
|
<cfreturn {}>
|
|
</cfif>
|
|
<cfcatch>
|
|
<cfreturn {}>
|
|
</cfcatch>
|
|
</cftry>
|
|
</cffunction>
|
|
|
|
<cfset data = readJsonBody()>
|
|
<cfset BusinessID = val( structKeyExists(data,"BusinessID") ? data.BusinessID : 0 )>
|
|
<cfset ServicePointID = val( structKeyExists(data,"ServicePointID") ? data.ServicePointID : 0 )>
|
|
<cfset StationID = val( structKeyExists(data,"StationID") ? data.StationID : 0 )>
|
|
|
|
<cfif BusinessID LTE 0>
|
|
<cfset apiAbort({ "OK": false, "ERROR": "missing_params", "MESSAGE": "BusinessID is required.", "DETAIL": "" })>
|
|
</cfif>
|
|
|
|
<cftry>
|
|
<!--- Build WHERE clause for filtering --->
|
|
<cfset whereClauses = ["o.OrderBusinessID = ?"]>
|
|
<cfset params = [ { value = BusinessID, cfsqltype = "cf_sql_integer" } ]>
|
|
|
|
<!--- Filter by service point if provided --->
|
|
<cfif ServicePointID GT 0>
|
|
<cfset arrayAppend(whereClauses, "o.OrderServicePointID = ?")>
|
|
<cfset arrayAppend(params, { value = ServicePointID, cfsqltype = "cf_sql_integer" })>
|
|
</cfif>
|
|
|
|
<!--- Only show submitted orders (StatusID >= 1) --->
|
|
<cfset arrayAppend(whereClauses, "o.OrderStatusID >= 1")>
|
|
|
|
<!--- Don't show completed orders (assuming StatusID 4 is completed) --->
|
|
<cfset arrayAppend(whereClauses, "o.OrderStatusID < 4")>
|
|
|
|
<cfset whereSQL = arrayToList(whereClauses, " AND ")>
|
|
|
|
<!--- If filtering by station, only get orders that have items for that station --->
|
|
<cfif StationID GT 0>
|
|
<cfset stationParams = duplicate(params)>
|
|
<cfset arrayAppend(stationParams, { value = StationID, cfsqltype = "cf_sql_integer" })>
|
|
<cfset qOrders = queryTimed("
|
|
SELECT DISTINCT
|
|
o.OrderID,
|
|
o.OrderUUID,
|
|
o.OrderUserID,
|
|
o.OrderBusinessID,
|
|
o.OrderTypeID,
|
|
o.OrderStatusID,
|
|
o.OrderServicePointID,
|
|
o.OrderRemarks,
|
|
o.OrderSubmittedOn,
|
|
o.OrderLastEditedOn,
|
|
sp.ServicePointName,
|
|
u.UserFirstName,
|
|
u.UserLastName
|
|
FROM Orders o
|
|
LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.OrderServicePointID
|
|
LEFT JOIN Users u ON u.UserID = o.OrderUserID
|
|
INNER JOIN OrderLineItems oli ON oli.OrderLineItemOrderID = o.OrderID
|
|
INNER JOIN Items i ON i.ItemID = oli.OrderLineItemItemID
|
|
WHERE #whereSQL#
|
|
AND i.ItemStationID = ?
|
|
AND oli.OrderLineItemIsDeleted = b'0'
|
|
ORDER BY o.OrderSubmittedOn ASC, o.OrderID ASC
|
|
", stationParams, { datasource = "payfrit" })>
|
|
<cfelse>
|
|
<cfset qOrders = queryTimed("
|
|
SELECT
|
|
o.OrderID,
|
|
o.OrderUUID,
|
|
o.OrderUserID,
|
|
o.OrderBusinessID,
|
|
o.OrderTypeID,
|
|
o.OrderStatusID,
|
|
o.OrderServicePointID,
|
|
o.OrderRemarks,
|
|
o.OrderSubmittedOn,
|
|
o.OrderLastEditedOn,
|
|
sp.ServicePointName,
|
|
u.UserFirstName,
|
|
u.UserLastName
|
|
FROM Orders o
|
|
LEFT JOIN ServicePoints sp ON sp.ServicePointID = o.OrderServicePointID
|
|
LEFT JOIN Users u ON u.UserID = o.OrderUserID
|
|
WHERE #whereSQL#
|
|
ORDER BY o.OrderSubmittedOn ASC, o.OrderID ASC
|
|
", params, { datasource = "payfrit" })>
|
|
</cfif>
|
|
|
|
<cfset orders = []>
|
|
|
|
<!--- Batch fetch ALL line items for all orders in one query (eliminates N+1) --->
|
|
<cfset orderIds = valueList(qOrders.OrderID)>
|
|
<cfset lineItemsByOrder = {}>
|
|
<cfif len(orderIds)>
|
|
<cfif StationID GT 0>
|
|
<cfset qAllLineItems = queryTimed("
|
|
SELECT
|
|
oli.OrderLineItemOrderID,
|
|
oli.OrderLineItemID,
|
|
oli.OrderLineItemParentOrderLineItemID,
|
|
oli.OrderLineItemItemID,
|
|
oli.OrderLineItemPrice,
|
|
oli.OrderLineItemQuantity,
|
|
oli.OrderLineItemRemark,
|
|
oli.OrderLineItemIsDeleted,
|
|
i.ItemName,
|
|
i.ItemParentItemID,
|
|
i.ItemIsCheckedByDefault,
|
|
i.ItemStationID,
|
|
parent.ItemName AS ItemParentName
|
|
FROM OrderLineItems oli
|
|
INNER JOIN Items i ON i.ItemID = oli.OrderLineItemItemID
|
|
LEFT JOIN Items parent ON parent.ItemID = i.ItemParentItemID
|
|
WHERE oli.OrderLineItemOrderID IN (#orderIds#)
|
|
AND oli.OrderLineItemIsDeleted = b'0'
|
|
AND (i.ItemStationID = ? OR i.ItemStationID = 0 OR i.ItemStationID IS NULL OR oli.OrderLineItemParentOrderLineItemID > 0)
|
|
ORDER BY oli.OrderLineItemOrderID, oli.OrderLineItemID
|
|
", [ { value = StationID, cfsqltype = "cf_sql_integer" } ], { datasource = "payfrit" })>
|
|
<cfelse>
|
|
<cfset qAllLineItems = queryTimed("
|
|
SELECT
|
|
oli.OrderLineItemOrderID,
|
|
oli.OrderLineItemID,
|
|
oli.OrderLineItemParentOrderLineItemID,
|
|
oli.OrderLineItemItemID,
|
|
oli.OrderLineItemPrice,
|
|
oli.OrderLineItemQuantity,
|
|
oli.OrderLineItemRemark,
|
|
oli.OrderLineItemIsDeleted,
|
|
i.ItemName,
|
|
i.ItemParentItemID,
|
|
i.ItemIsCheckedByDefault,
|
|
i.ItemStationID,
|
|
parent.ItemName AS ItemParentName
|
|
FROM OrderLineItems oli
|
|
INNER JOIN Items i ON i.ItemID = oli.OrderLineItemItemID
|
|
LEFT JOIN Items parent ON parent.ItemID = i.ItemParentItemID
|
|
WHERE oli.OrderLineItemOrderID IN (#orderIds#)
|
|
AND oli.OrderLineItemIsDeleted = b'0'
|
|
ORDER BY oli.OrderLineItemOrderID, oli.OrderLineItemID
|
|
", [], { datasource = "payfrit" })>
|
|
</cfif>
|
|
|
|
<!--- Group line items by OrderID --->
|
|
<cfloop query="qAllLineItems">
|
|
<cfset oid = qAllLineItems.OrderLineItemOrderID>
|
|
<cfif NOT structKeyExists(lineItemsByOrder, oid)>
|
|
<cfset lineItemsByOrder[oid] = []>
|
|
</cfif>
|
|
<cfset arrayAppend(lineItemsByOrder[oid], {
|
|
"OrderLineItemID": qAllLineItems.OrderLineItemID,
|
|
"OrderLineItemParentOrderLineItemID": qAllLineItems.OrderLineItemParentOrderLineItemID,
|
|
"OrderLineItemItemID": qAllLineItems.OrderLineItemItemID,
|
|
"OrderLineItemPrice": qAllLineItems.OrderLineItemPrice,
|
|
"OrderLineItemQuantity": qAllLineItems.OrderLineItemQuantity,
|
|
"OrderLineItemRemark": qAllLineItems.OrderLineItemRemark,
|
|
"ItemName": qAllLineItems.ItemName,
|
|
"ItemParentItemID": qAllLineItems.ItemParentItemID,
|
|
"ItemParentName": qAllLineItems.ItemParentName,
|
|
"ItemIsCheckedByDefault": qAllLineItems.ItemIsCheckedByDefault,
|
|
"ItemStationID": qAllLineItems.ItemStationID
|
|
})>
|
|
</cfloop>
|
|
</cfif>
|
|
|
|
<!--- Build orders array using pre-fetched line items --->
|
|
<cfloop query="qOrders">
|
|
<cfset lineItems = structKeyExists(lineItemsByOrder, qOrders.OrderID) ? lineItemsByOrder[qOrders.OrderID] : []>
|
|
|
|
<!--- Determine order type name --->
|
|
<cfset orderTypeName = "">
|
|
<cfswitch expression="#qOrders.OrderTypeID#">
|
|
<cfcase value="1"><cfset orderTypeName = "Dine-In"></cfcase>
|
|
<cfcase value="2"><cfset orderTypeName = "Takeaway"></cfcase>
|
|
<cfcase value="3"><cfset orderTypeName = "Delivery"></cfcase>
|
|
<cfdefaultcase><cfset orderTypeName = ""></cfdefaultcase>
|
|
</cfswitch>
|
|
|
|
<cfset arrayAppend(orders, {
|
|
"OrderID": qOrders.OrderID,
|
|
"OrderUUID": qOrders.OrderUUID,
|
|
"OrderUserID": qOrders.OrderUserID,
|
|
"OrderBusinessID": qOrders.OrderBusinessID,
|
|
"OrderTypeID": qOrders.OrderTypeID,
|
|
"OrderTypeName": orderTypeName,
|
|
"OrderStatusID": qOrders.OrderStatusID,
|
|
"OrderServicePointID": qOrders.OrderServicePointID,
|
|
"OrderRemarks": qOrders.OrderRemarks,
|
|
"OrderSubmittedOn": qOrders.OrderSubmittedOn,
|
|
"OrderLastEditedOn": qOrders.OrderLastEditedOn,
|
|
"ServicePointName": qOrders.ServicePointName,
|
|
"UserFirstName": qOrders.UserFirstName,
|
|
"UserLastName": qOrders.UserLastName,
|
|
"LineItems": lineItems
|
|
})>
|
|
</cfloop>
|
|
|
|
<cfset logPerf()>
|
|
<cfset apiAbort({
|
|
"OK": true,
|
|
"ERROR": "",
|
|
"ORDERS": orders,
|
|
"STATION_FILTER": StationID
|
|
})>
|
|
|
|
<cfcatch>
|
|
<cfset apiAbort({
|
|
"OK": false,
|
|
"ERROR": "server_error",
|
|
"MESSAGE": "DB error loading orders for KDS",
|
|
"DETAIL": cfcatch.message
|
|
})>
|
|
</cfcatch>
|
|
</cftry> |