Skip to content

Commit 2e22dd1

Browse files
Fixed bike summary query order
1 parent e4ef0f3 commit 2e22dd1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ActivitySummary } from "../../../models/activitySummary";
22

33
export async function getActivitySummaryByBike(database: D1Database, bikeId: string): Promise<ActivitySummary[]> {
4-
return (await database.prepare("SELECT key, value FROM (SELECT activity_summary.key AS key, SUM(activity_summary.value) AS value FROM activity_summary INNER JOIN activities ON activities.bike = ?1 WHERE activity_summary.id = activities.id GROUP BY activity_summary.key UNION ALL SELECT 'activities' AS key, COUNT(id) AS value FROM activities WHERE bike = ?1)").bind(bikeId).all<ActivitySummary>()).results ?? [];
4+
return (await database.prepare("SELECT key, value FROM (SELECT 'activities' AS key, COUNT(id) AS value FROM activities WHERE bike = ?1 UNION ALL SELECT activity_summary.key AS key, SUM(activity_summary.value) AS value FROM activity_summary INNER JOIN activities ON activities.bike = ?1 WHERE activity_summary.id = activities.id GROUP BY activity_summary.key)").bind(bikeId).all<ActivitySummary>()).results ?? [];
55
};

0 commit comments

Comments
 (0)