Merge pull request #511 from sivertschou/dexie-improvements

Dexie improvements

Author: sivertschou

apps/frontend/src/db.ts

@@ -56,11 +56,10 @@ export const defaultWorkoutState: WorkoutState = {
 };
 
 export const startNewWorkout = async () => {
-  db.transaction('rw', db.workoutState, async () => {
-    const state =
-      (await db.workoutState.toCollection().last()) ?? defaultWorkoutState;
+  await db.transaction('rw', db.workoutState, async () => {
+    const state = await getWorkoutState();
 
-    await db.workoutState.add({
+    return db.workoutState.add({
       ...defaultWorkoutState,
       workoutNumber: state.workoutNumber + 1,
       route: state.route,
@@ -69,34 +68,32 @@ export const startNewWorkout = async () => {
 };
 
 export const addLap = async () => {
-  db.transaction('rw', db.workoutState, async () => {
-    const state =
-      (await db.workoutState.orderBy('workoutNumber').last()) ??
-      defaultWorkoutState;
+  await db.transaction('rw', db.workoutState, async () => {
+    const state = await getWorkoutState();
 
     const lapNumber = state.lapNumber + 1;
-    await db.workoutState.update(state.workoutNumber, {
+    return db.workoutState.update(state.workoutNumber, {
       lapNumber,
     });
   });
 };
 
 const getLastDatapoint = async () => {
-  const state =
-    (await db.workoutState.orderBy('workoutNumber').last()) ??
-    defaultWorkoutState;
+  const state = await getWorkoutState();
 
   return (
-    (await db.workoutDataPoint
+    db.workoutDataPoint
       .where('workoutNumber')
       .equals(state.workoutNumber)
       .filter((item) => item.tracking)
-      .last()) ?? null
+      .last() ?? null
   );
 };
 
 const getWorkoutState = async () => {
-  return (await db.workoutState.toCollection().last()) ?? defaultWorkoutState;
+  const state = await db.workoutState.orderBy('workoutNumber').last();
+
+  return state ?? defaultWorkoutState;
 };
 
 export const addDatapoint = async (
@@ -140,7 +137,7 @@ export const addDatapoint = async (
 
       const coordinates = distanceToCoordinates(routeWaypoints, totalDistance);
 
-      db.workoutDataPoint.add({
+      await db.workoutDataPoint.add({
         ...dataPoint,
         timestamp: new Date(),
         deltaTime: delta,
@@ -162,47 +159,45 @@ export const addDatapoint = async (
       const maxHeartRate = workoutState.maxHeartRate ?? 0;
 
       if (maxHeartRate < heartRate) {
-        setMaxHeartRate(heartRate);
+        return setMaxHeartRate(heartRate);
       }
     }
   );
 };
 
 export const addElapsedTime = async (delta: number) => {
-  db.transaction('rw', db.workoutState, async () => {
-    const state =
-      (await db.workoutState.toCollection().last()) ?? defaultWorkoutState;
+  await db.transaction('rw', db.workoutState, async () => {
+    const state = await getWorkoutState();
 
-    await db.workoutState.update(state.workoutNumber, {
+    return db.workoutState.update(state.workoutNumber, {
       elapsedTime: state.elapsedTime + delta,
     });
   });
 };
 
 export const initWorkoutstate = async () => {
-  db.transaction('rw', db.workoutState, async () => {
-    const state = await db.workoutState.toCollection().last();
+  await db.transaction('rw', db.workoutState, async () => {
+    const state = await db.workoutState.orderBy('workoutNumber').last();
 
     if (!state) {
-      await db.workoutState.add(defaultWorkoutState);
+      return db.workoutState.add(defaultWorkoutState);
     }
   });
 };
 
 const setMaxHeartRate = async (heartRate: number) => {
-  const state =
-    (await db.workoutState.toCollection().last()) ?? defaultWorkoutState;
+  const state = await getWorkoutState();
 
-  await db.workoutState.update(state.workoutNumber, {
+  return db.workoutState.update(state.workoutNumber, {
     maxHeartRate: heartRate,
   });
 };
+
 export const setRoute = async (route: Route) => {
-  db.transaction('rw', db.workoutState, async () => {
-    const state =
-      (await db.workoutState.toCollection().last()) ?? defaultWorkoutState;
+  await db.transaction('rw', db.workoutState, async () => {
+    const state = await getWorkoutState();
 
-    await db.workoutState.update(state.workoutNumber, {
+    return db.workoutState.update(state.workoutNumber, {
       route,
     });
   });
@@ -223,7 +218,7 @@ export const createNewWorkoutIfOldData = async () => {
         );
 
         if (time.hours >= hoursToRecoverWorkout) {
-          startNewWorkout();
+          return startNewWorkout();
         }
       }
     }

apps/frontend/src/hooks/useWorkoutState.ts

@@ -18,7 +18,7 @@ export const useWorkoutState = () => {
         db.workoutDataPoint
           .where('workoutNumber')
           .equals(state.workoutNumber)
-          .filter((datapoint) => datapoint.tracking)
+          .and((datapoint) => datapoint.tracking)
           .toArray(),
       [state.workoutNumber]
     ) ?? [];
@@ -27,26 +27,26 @@ export const useWorkoutState = () => {
     useLiveQuery(
       () =>
         db.workoutDataPoint
-          .where({
-            workoutNumber: state.workoutNumber,
-            lapNumber: state.lapNumber,
-          })
-          .filter((datapoint) => datapoint.tracking)
+          .where(['workoutNumber', 'lapNumber'])
+          .equals([state.workoutNumber, state.lapNumber])
+          .and((datapoint) => datapoint.tracking)
           .toArray(),
       [state.workoutNumber, state.lapNumber]
     ) ?? [];
 
   const graphData =
     useLiveQuery(
-      () =>
-        db.workoutDataPoint
-          .where('workoutNumber')
-          .equals(state.workoutNumber)
-          .reverse()
-          .limit(numberOfGraphDataPoints)
-          .toArray(),
+      async () =>
+        (
+          await db.workoutDataPoint
+            .where('workoutNumber')
+            .equals(state.workoutNumber)
+            .reverse()
+            .limit(numberOfGraphDataPoints)
+            .toArray()
+        ).toReversed(),
       [state.workoutNumber]
-    )?.toReversed() ?? [];
+    ) ?? [];
 
   const firstDatapoint =
     useLiveQuery(
@@ -70,17 +70,6 @@ export const useWorkoutState = () => {
       [state.workoutNumber]
     ) ?? null;
 
-  const lastUntrackedDatapoint =
-    useLiveQuery(
-      () =>
-        db.workoutDataPoint
-          .where('workoutNumber')
-          .equals(state.workoutNumber)
-          .and((dataPoint) => !dataPoint.tracking)
-          .last(),
-      [state.workoutNumber]
-    ) ?? null;
-
   useEffect(() => {
     createNewWorkoutIfOldData();
   }, []);