diff --git a/src/server/routes/vehicles.ts b/src/server/routes/vehicles.ts index fb9c0ff..73f8ae4 100644 --- a/src/server/routes/vehicles.ts +++ b/src/server/routes/vehicles.ts @@ -509,7 +509,8 @@ async function getWeeklyStats(): Promise { // GET /api/vehicles/summary app.get('/summary', async (c) => { - const [vehicles, weekly] = await Promise.all([getVehiclesForUser(c), getWeeklyStats()]); + const [vehicles, weeklyIds] = await Promise.all([getVehiclesForUser(c), getWeeklyTruckIds()]); + const vehicleIds = new Set(vehicles.map(v => String(v.id))); const summary: SummaryData = { totalAssets: vehicles.length, operating: { @@ -525,11 +526,11 @@ app.get('/summary', async (c) => { abnormal: vehicles.filter((v) => v.status === 'Abnormal').length, }, pendingDelivery: vehicles.filter((v) => v.status === 'Pending').length, - weeklyNew: weekly.weeklyNew, - weeklyRemoved: weekly.weeklyRemoved, - weeklyDelivered: weekly.weeklyDelivered, - weeklyReturned: weekly.weeklyReturned, - weeklyReplaced: weekly.weeklyReplaced, + weeklyNew: 0, + weeklyRemoved: 0, + weeklyDelivered: [...weeklyIds.delivered].filter(id => vehicleIds.has(id)).length, + weeklyReturned: [...weeklyIds.returned].filter(id => vehicleIds.has(id)).length, + weeklyReplaced: [...weeklyIds.replaced].filter(id => vehicleIds.has(id)).length, }; return c.json(summary); });