From 42912040fff3f2f4017d197ee2d3013b2db8f99b Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Wed, 4 Jan 2023 13:24:49 +1300
Subject: [PATCH] Simplify getNow

---
 EditSet.tsx              | 2 +-
 EditWorkout.tsx          | 2 +-
 SetList.tsx              | 2 +-
 StartPlan.tsx            | 2 +-
 StartPlanItem.tsx        | 4 ++--
 db.ts                    | 5 +++--
 tests/EditSet.test.tsx   | 2 +-
 tests/EditSets.test.tsx  | 2 +-
 tests/StartPlan.test.tsx | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/EditSet.tsx b/EditSet.tsx
index 758caaa..af009d4 100644
--- a/EditSet.tsx
+++ b/EditSet.tsx
@@ -79,7 +79,7 @@ export default function EditSet() {
       image = await setRepo.findOne({where: {name}}).then(s => s?.image)
 
     console.log(`${EditSet.name}.handleSubmit:`, {image})
-    const [{now}] = await getNow()
+    const now = await getNow()
     const saved = await setRepo.save({
       id: set.id,
       name,
diff --git a/EditWorkout.tsx b/EditWorkout.tsx
index 72eb421..9f236a3 100644
--- a/EditWorkout.tsx
+++ b/EditWorkout.tsx
@@ -66,7 +66,7 @@ export default function EditWorkout() {
   }
 
   const add = async () => {
-    const [{now}] = await getNow()
+    const now = await getNow()
     await setRepo.save({
       ...defaultSet,
       name,
diff --git a/SetList.tsx b/SetList.tsx
index a1a010e..8c824f6 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -79,7 +79,7 @@ export default function SetList() {
   }, [term, end, offset, sets])
 
   const onAdd = useCallback(async () => {
-    const [{now}] = await getNow()
+    const now = await getNow()
     let set = sets[0]
     if (!set) set = {...defaultSet}
     set.created = now
diff --git a/StartPlan.tsx b/StartPlan.tsx
index 280facb..9adaf99 100644
--- a/StartPlan.tsx
+++ b/StartPlan.tsx
@@ -78,7 +78,7 @@ export default function StartPlan() {
   )
 
   const handleSubmit = async () => {
-    const [{now}] = await getNow()
+    const now = await getNow()
     const workout = counts[selected]
     const best = await getBestSet(workout.name)
     delete best.id
diff --git a/StartPlanItem.tsx b/StartPlanItem.tsx
index c8baedd..ed1c9b7 100644
--- a/StartPlanItem.tsx
+++ b/StartPlanItem.tsx
@@ -22,7 +22,7 @@ export default function StartPlanItem(props: Props) {
   const {navigate} = useNavigation<NavigationProp<PlanPageParams>>()
 
   const undo = useCallback(async () => {
-    const [{now}] = await getNow()
+    const now = await getNow()
     const created = now.split('T')[0]
     const first = await setRepo.findOne({
       where: {
@@ -47,7 +47,7 @@ export default function StartPlanItem(props: Props) {
   )
 
   const edit = async () => {
-    const [{now}] = await getNow()
+    const now = await getNow()
     const created = now.split('T')[0]
     const first = await setRepo.findOne({
       where: {
diff --git a/db.ts b/db.ts
index 8b90b3d..7ebc3a5 100644
--- a/db.ts
+++ b/db.ts
@@ -7,8 +7,9 @@ export const setRepo = AppDataSource.manager.getRepository(GymSet)
 export const planRepo = AppDataSource.manager.getRepository(Plan)
 export const settingsRepo = AppDataSource.manager.getRepository(Settings)
 
-export const getNow = (): Promise<{now: string}[]> => {
-  return AppDataSource.manager.query(
+export const getNow = async (): Promise<string> => {
+  const query = await AppDataSource.manager.query(
     "SELECT STRFTIME('%Y-%m-%dT%H:%M:%S','now','localtime') AS now",
   )
+  return query[0].now
 }
diff --git a/tests/EditSet.test.tsx b/tests/EditSet.test.tsx
index c89f2c6..1e78486 100644
--- a/tests/EditSet.test.tsx
+++ b/tests/EditSet.test.tsx
@@ -10,7 +10,7 @@ import SetList from '../SetList'
 import Settings from '../settings'
 
 jest.mock('../db.ts', () => ({
-  getNow: () => Promise.resolve([{now: new Date().toISOString()}]),
+  getNow: () => Promise.resolve(new Date().toISOString()),
   setRepo: {
     findOne: () => Promise.resolve({}),
     save: jest.fn(() => Promise.resolve({})),
diff --git a/tests/EditSets.test.tsx b/tests/EditSets.test.tsx
index 29d41b2..8b773c7 100644
--- a/tests/EditSets.test.tsx
+++ b/tests/EditSets.test.tsx
@@ -16,7 +16,7 @@ jest.mock('@react-navigation/native', () => ({
 }))
 
 jest.mock('../db.ts', () => ({
-  getNow: () => Promise.resolve([{now: new Date().toISOString()}]),
+  getNow: () => Promise.resolve(new Date().toISOString()),
   setRepo: {
     find: () =>
       Promise.resolve([
diff --git a/tests/StartPlan.test.tsx b/tests/StartPlan.test.tsx
index afebac2..7de29f2 100644
--- a/tests/StartPlan.test.tsx
+++ b/tests/StartPlan.test.tsx
@@ -14,7 +14,7 @@ jest.mock('../best.service.ts', () => ({
 }))
 
 jest.mock('../db.ts', () => ({
-  getNow: () => Promise.resolve([{now: new Date().toISOString()}]),
+  getNow: () => Promise.resolve(new Date().toISOString()),
   setRepo: {
     findOne: () => Promise.resolve({}),
     save: () => Promise.resolve(),