From f320d16c4b0e5889522656759fc6a30bcb17c920 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Thu, 22 Sep 2022 14:32:37 +1200
Subject: [PATCH] Fix adding new set with no plan

Closes #36
---
 SetList.tsx     | 3 ++-
 best.service.ts | 3 ++-
 db.ts           | 8 --------
 set.service.ts  | 3 +--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/SetList.tsx b/SetList.tsx
index d8237d11..aaa450ef 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -47,7 +47,7 @@ export default function SetList() {
     if (!settings.predict) return setSet({...defaultSet});
     const todaysPlan = await getTodaysPlan();
     console.log(`${SetList.name}.predict:`, {todaysPlan});
-    if (todaysPlan.length === 0) return;
+    if (todaysPlan.length === 0) return setSet({...defaultSet});
     const todaysSets = await getTodaysSets();
     const todaysWorkouts = todaysPlan[0].workouts.split(',');
     let workout = todaysWorkouts[0];
@@ -114,6 +114,7 @@ export default function SetList() {
   }, [search, end, offset, sets]);
 
   const onAdd = useCallback(async () => {
+    console.log(`${SetList.name}.onAdd`, {set, defaultSet, workouts});
     navigation.navigate('EditSet', {
       set: set || {...defaultSet},
       workouts,
diff --git a/best.service.ts b/best.service.ts
index d8c78ae0..4b60533b 100644
--- a/best.service.ts
+++ b/best.service.ts
@@ -1,6 +1,7 @@
-import {db, defaultSet} from './db';
+import {db} from './db';
 import {Periods} from './periods';
 import Set from './set';
+import {defaultSet} from './set.service';
 import Volume from './volume';
 
 export const getBestSet = async (name: string): Promise<Set> => {
diff --git a/db.ts b/db.ts
index e9ca6868..d86a9a4f 100644
--- a/db.ts
+++ b/db.ts
@@ -140,11 +140,3 @@ export interface PageParams {
   limit: number;
   offset: number;
 }
-
-export const defaultSet = {
-  name: '',
-  id: 0,
-  reps: 10,
-  weight: 20,
-  unit: 'kg',
-};
diff --git a/set.service.ts b/set.service.ts
index 57a0e01c..24a51cf9 100644
--- a/set.service.ts
+++ b/set.service.ts
@@ -84,9 +84,8 @@ export const getTodaysSets = async (): Promise<Set[]> => {
   return result.rows.raw();
 };
 
-export const defaultSet = {
+export const defaultSet: Set = {
   name: '',
-  id: 0,
   reps: 10,
   weight: 20,
   unit: 'kg',