Updated activity bike summary

Author: nora-soderlund

src/controllers/activities/getActivityCountByBike.ts

@@ -1,5 +1,5 @@
 import { ActivitySummary } from "../../../models/activitySummary";
 
 export async function getActivitySummaryByBike(database: D1Database, bikeId: string): Promise<ActivitySummary[]> {
-    return (await database.prepare("SELECT activity_summary.key, SUM(activity_summary.value) FROM activity_summary INNER JOIN activities ON activities.bike = ? WHERE activity_summary.id = activities.id GROUP BY activity_summary.key").bind(bikeId).all<ActivitySummary>()).results ?? [];
+    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 ?? [];
 };

src/controllers/activities/summary/getActivitySummaryByBike.ts

@@ -1,4 +1,3 @@
-import { getActivityCountByBike } from "../../controllers/activities/getActivityCountByBike";
 import { getActivitySummaryByBike } from "../../controllers/activities/summary/getActivitySummaryByBike";
 import { getBikeById } from "../../controllers/bikes/getBikeById";
 import { getBikePrimaryImage } from "../../controllers/bikes/images/getBikePrimaryImage";
@@ -21,7 +20,6 @@ export async function handleBikeRequest(request: RequestWithKey, env: Env) {
         return Response.json({ success: false });
 
     const bikeSummary = await getActivitySummaryByBike(env.DATABASE, bike.id);
-    const bikeActivityCount = await getActivityCountByBike(env.DATABASE, bike.id);
     const bikeImage = await getBikePrimaryImage(env.DATABASE, bike.id);
 
     return Response.json({
@@ -33,8 +31,6 @@ export async function handleBikeRequest(request: RequestWithKey, env: Env) {
             model: bike.model,
             image: bikeImage?.image,
 
-            activities: bikeActivityCount,
-
             summary: bikeSummary.map((bikeSummary) => {
                 return {
                     key: bikeSummary.key,