Pause converting to typeorm due to odd error

ERROR  TypeError: Cannot read property 'getItem' of undefined

This error is located at:
    in FlatList (created by SetList)
    in RCTView (created by View)
    in View (created by Page)
    in Page (created by SetList)
    in SetList (created by SceneView)
...

I found an open issue on the react-native github which seems
related https://github.com/facebook/react-native/issues/31523
but after following all of their suggestions I still have the
same error. I tried:
- Removing @babel/plugin-proposal-class-properties & @babel/plugin-transform-flow-strip-types
- Adding @babel/plugin-transform-flow-strip-types

.prettierrc.js

@@ -4,4 +4,4 @@ module.exports = {
   bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'all',
-};
+}

App.tsx

@@ -13,11 +13,10 @@ import {
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons';
 import {Color} from './color';
 import {lightColors} from './colors';
-import {runMigrations} from './db';
+import {runMigrations, settingsRepo} from './db';
 import MassiveSnack from './MassiveSnack';
 import Routes from './Routes';
 import Settings from './settings';
-import {getSettings} from './settings.service';
 import {SettingsContext} from './use-settings';
 
 export const CombinedDefaultTheme = {
@@ -51,7 +50,7 @@ const App = () => {
 
   useEffect(() => {
     runMigrations().then(async () => {
-      const gotSettings = await getSettings();
+      const gotSettings = await settingsRepo.findOne({where: {}});
       console.log(`${App.name}.runMigrations:`, {gotSettings});
       setSettings(gotSettings);
       if (gotSettings.color) setColor(gotSettings.color);

BestList.tsx

@@ -6,25 +6,40 @@ import {
 import {useCallback, useState} from 'react';
 import {FlatList, Image} from 'react-native';
 import {List} from 'react-native-paper';
-import {getBestReps, getBestWeights} from './best.service';
 import {BestPageParams} from './BestPage';
+import {setRepo} from './db';
 import DrawerHeader from './DrawerHeader';
+import GymSet from './gym-set';
 import Page from './Page';
-import Set from './set';
 import {useSettings} from './use-settings';
 
 export default function BestList() {
-  const [bests, setBests] = useState<Set[]>();
+  const [bests, setBests] = useState<GymSet[]>();
   const [term, setTerm] = useState('');
   const navigation = useNavigation<NavigationProp<BestPageParams>>();
   const {settings} = useSettings();
 
   const refresh = useCallback(async (value: string) => {
-    const weights = await getBestWeights(value);
+    const weights = await setRepo
+      .createQueryBuilder()
+      .select()
+      .addSelect('MAX(weight)', 'weight')
+      .where('name LIKE :name', {name: `%${value}%`})
+      .andWhere('NOT hidden')
+      .groupBy('name')
+      .getMany();
     console.log(`${BestList.name}.refresh:`, {length: weights.length});
-    let newBest: Set[] = [];
+    let newBest: GymSet[] = [];
     for (const set of weights) {
-      const reps = await getBestReps(set.name, set.weight);
+      const reps = await setRepo
+        .createQueryBuilder()
+        .select()
+        .addSelect('MAX(reps)', 'reps')
+        .where('name = :name', {name: set.name})
+        .andWhere('weight = :weight', {weight: set.weight})
+        .andWhere('NOT hidden')
+        .groupBy('name')
+        .getMany();
       newBest.push(...reps);
     }
     setBests(newBest);
@@ -44,7 +59,7 @@ export default function BestList() {
     [refresh],
   );
 
-  const renderItem = ({item}: {item: Set}) => (
+  const renderItem = ({item}: {item: GymSet}) => (
     <List.Item
       key={item.name}
       title={item.name}

BestPage.tsx

@@ -1,13 +1,13 @@
 import {createStackNavigator} from '@react-navigation/stack';
 import BestList from './BestList';
-import Set from './set';
+import GymSet from './gym-set';
 import ViewBest from './ViewBest';
 
 const Stack = createStackNavigator<BestPageParams>();
 export type BestPageParams = {
   BestList: {};
   ViewBest: {
-    best: Set;
+    best: GymSet;
   };
 };
 

Chart.tsx

@@ -4,7 +4,7 @@ import {Grid, LineChart, XAxis, YAxis} from 'react-native-svg-charts';
 import {CombinedDarkTheme, CombinedDefaultTheme} from './App';
 import {useColor} from './color';
 import {MARGIN, PADDING} from './constants';
-import Set from './set';
+import GymSet from './gym-set';
 import useDark from './use-dark';
 
 export default function Chart({
@@ -14,7 +14,7 @@ export default function Chart({
   yFormat,
 }: {
   yData: number[];
-  xData: Set[];
+  xData: GymSet[];
   xFormat: (value: any, index: number) => string;
   yFormat: (value: any) => string;
 }) {

DrawerMenu.tsx

@@ -4,18 +4,18 @@ import DocumentPicker from 'react-native-document-picker';
 import {FileSystem} from 'react-native-file-access';
 import {Divider, IconButton, Menu} from 'react-native-paper';
 import ConfirmDialog from './ConfirmDialog';
+import {AppDataSource, planRepo} from './db';
 import {DrawerParamList} from './drawer-param-list';
+import GymSet from './gym-set';
 import {useSnackbar} from './MassiveSnack';
 import {Plan} from './plan';
-import {addPlans, deletePlans, getAllPlans} from './plan.service';
-import Set from './set';
-import {addSets, deleteSets, getAllSets} from './set.service';
 import useDark from './use-dark';
 import {write} from './write';
 
 const setFields =
   'id,name,reps,weight,created,unit,hidden,sets,minutes,seconds';
 const planFields = 'id,days,workouts';
+const setRepo = AppDataSource.manager.getRepository(GymSet);
 
 export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   const [showMenu, setShowMenu] = useState(false);
@@ -25,14 +25,14 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   const dark = useDark();
 
   const exportSets = useCallback(async () => {
-    const sets = await getAllSets();
+    const sets = await setRepo.find({});
     const data = [setFields]
       .concat(
         sets.map(set =>
           setFields
             .split(',')
             .map(fieldString => {
-              const field = fieldString as keyof Set;
+              const field = fieldString as keyof GymSet;
               if (field === 'unit') return set[field] || 'kg';
               return set[field];
             })
@@ -45,7 +45,7 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   }, []);
 
   const exportPlans = useCallback(async () => {
-    const plans: Plan[] = await getAllPlans();
+    const plans = await planRepo.find({});
     const data = [planFields]
       .concat(plans.map(set => `"${set.id}","${set.days}","${set.workouts}"`))
       .join('\n');
@@ -62,14 +62,14 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   const uploadSets = useCallback(async () => {
     const result = await DocumentPicker.pickSingle();
     const file = await FileSystem.readFile(result.uri);
-    console.log(`${DrawerMenu.name}.${uploadSets.name}:`, file.length);
+    console.log(`${DrawerMenu.name}.uploadSets:`, file.length);
     const lines = file.split('\n');
     console.log(lines[0]);
     if (!setFields.includes(lines[0])) return toast('Invalid csv.', 3000);
     const values = lines
       .slice(1)
       .filter(line => line)
-      .map(set => {
+      .map(line => {
         let [
           ,
           setName,
@@ -81,15 +81,22 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
           sets,
           minutes,
           seconds,
-        ] = set.split(',');
-        unit = unit || 'kg';
-        hidden = hidden || '0';
-        return `('${setName}',${reps},${weight},'${created}','${unit}',${hidden},${
-          sets ?? 3
-        },${minutes ?? 3},${seconds ?? 30})`;
-      })
-      .join(',');
-    await addSets(setFields.split(',').slice(1).join(','), values);
+        ] = line.split(',');
+        const set: GymSet = {
+          name: setName,
+          reps: +reps,
+          weight: +weight,
+          created,
+          unit: unit ?? 'kg',
+          hidden: !!Number(hidden),
+          sets: +sets,
+          minutes: +minutes,
+          seconds: +seconds,
+        };
+        return set;
+      });
+    console.log(`${DrawerMenu.name}.uploadSets:`, {values});
+    await setRepo.insert(values);
     toast('Data imported.', 3000);
     reset({index: 0, routes: [{name}]});
   }, [reset, name, toast]);
@@ -108,10 +115,13 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
         const [, days, workouts] = set
           .split('","')
           .map(cell => cell.replace(/"/g, ''));
-        return `('${days}','${workouts}')`;
-      })
-      .join(',');
-    await addPlans(values);
+        const plan: Plan = {
+          days,
+          workouts,
+        };
+        return plan;
+      });
+    await planRepo.insert(values);
     toast('Data imported.', 3000);
   }, [toast]);
 
@@ -125,8 +135,8 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   const remove = useCallback(async () => {
     setShowMenu(false);
     setShowRemove(false);
-    if (name === 'Home') await deleteSets();
-    else if (name === 'Plans') await deletePlans();
+    if (name === 'Home') await setRepo.delete({});
+    else if (name === 'Plans') await planRepo.delete({});
     toast('All data has been deleted.', 4000);
     reset({index: 0, routes: [{name}]});
   }, [reset, name, toast]);

EditPlan.tsx

@@ -8,10 +8,9 @@ import {useCallback, useEffect, useState} from 'react';
 import {ScrollView, StyleSheet, View} from 'react-native';
 import {Button, Text} from 'react-native-paper';
 import {MARGIN, PADDING} from './constants';
+import {planRepo, setRepo} from './db';
 import {DrawerParamList} from './drawer-param-list';
 import {PlanPageParams} from './plan-page-params';
-import {addPlan, updatePlan} from './plan.service';
-import {getNames} from './set.service';
 import StackHeader from './StackHeader';
 import Switch from './Switch';
 import {DAYS} from './time';
@@ -29,10 +28,15 @@ export default function EditPlan() {
   const navigation = useNavigation<NavigationProp<DrawerParamList>>();
 
   useEffect(() => {
-    getNames().then(n => {
-      console.log(EditPlan.name, {n});
-      setNames(n);
-    });
+    setRepo
+      .createQueryBuilder()
+      .select('name')
+      .distinct(true)
+      .getRawMany()
+      .then(values => {
+        console.log(EditPlan.name, {values});
+        setNames(values.map(value => value.name));
+      });
   }, []);
 
   const save = useCallback(async () => {
@@ -40,14 +44,7 @@ export default function EditPlan() {
     if (!days || !workouts) return;
     const newWorkouts = workouts.filter(workout => workout).join(',');
     const newDays = days.filter(day => day).join(',');
-    if (typeof plan.id === 'undefined')
-      await addPlan({days: newDays, workouts: newWorkouts});
-    else
-      await updatePlan({
-        days: newDays,
-        workouts: newWorkouts,
-        id: plan.id,
-      });
+    await planRepo.save({days: newDays, workouts: newWorkouts, id: plan.id});
     navigation.goBack();
   }, [days, workouts, plan, navigation]);
 

EditSet.tsx

@@ -2,10 +2,10 @@ import {RouteProp, useNavigation, useRoute} from '@react-navigation/native';
 import {useCallback} from 'react';
 import {NativeModules, View} from 'react-native';
 import {PADDING} from './constants';
+import {getNow, setRepo} from './db';
+import GymSet from './gym-set';
 import {HomePageParams} from './home-page-params';
 import {useSnackbar} from './MassiveSnack';
-import Set from './set';
-import {addSet, getSet, updateSet} from './set.service';
 import SetForm from './SetForm';
 import StackHeader from './StackHeader';
 import {useSettings} from './use-settings';
@@ -20,7 +20,7 @@ export default function EditSet() {
   const startTimer = useCallback(
     async (name: string) => {
       if (!settings.alarm) return;
-      const {minutes, seconds} = await getSet(name);
+      const {minutes, seconds} = await setRepo.findOne({where: {name}});
       const milliseconds = (minutes ?? 3) * 60 * 1000 + (seconds ?? 0) * 1000;
       NativeModules.AlarmModule.timer(
         milliseconds,
@@ -32,37 +32,32 @@ export default function EditSet() {
     [settings],
   );
 
-  const update = useCallback(
-    async (value: Set) => {
-      console.log(`${EditSet.name}.update`, value);
-      await updateSet(value);
-      navigation.goBack();
-    },
-    [navigation],
-  );
-
   const add = useCallback(
-    async (value: Set) => {
-      console.log(`${EditSet.name}.add`, {set: value});
+    async (value: GymSet) => {
       startTimer(value.name);
-      await addSet(value);
-      if (!settings.notify) return navigation.goBack();
+      const [{now}] = await getNow();
+      value.created = now;
+      value.hidden = false;
+      console.log(`${EditSet.name}.add`, {set: value});
+      const result = await setRepo.save(value);
+      console.log({result});
+      if (!settings.notify) return;
       if (
         value.weight > set.weight ||
         (value.reps > set.reps && value.weight === set.weight)
       )
         toast("Great work King! That's a new record.", 3000);
-      navigation.goBack();
     },
-    [navigation, startTimer, set, toast, settings],
+    [startTimer, set, toast, settings],
   );
 
   const save = useCallback(
-    async (value: Set) => {
-      if (typeof set.id === 'number') return update(value);
-      return add(value);
+    async (value: GymSet) => {
+      if (typeof set.id === 'number') await setRepo.save(value);
+      else await add(value);
+      navigation.goBack();
     },
-    [update, add, set.id],
+    [add, set.id, navigation],
   );
 
   return (

EditWorkout.tsx

@@ -3,12 +3,12 @@ import {useCallback, useRef, useState} from 'react';
 import {ScrollView, TextInput, View} from 'react-native';
 import DocumentPicker from 'react-native-document-picker';
 import {Button, Card, TouchableRipple} from 'react-native-paper';
+import {Like} from 'typeorm';
 import ConfirmDialog from './ConfirmDialog';
 import {MARGIN, PADDING} from './constants';
+import {getNow, planRepo, setRepo} from './db';
 import MassiveInput from './MassiveInput';
 import {useSnackbar} from './MassiveSnack';
-import {updatePlanWorkouts} from './plan.service';
-import {addSet, updateManySet, updateSetImage} from './set.service';
 import StackHeader from './StackHeader';
 import {useSettings} from './use-settings';
 import {WorkoutsPageParams} from './WorkoutsPage';
@@ -36,21 +36,29 @@ export default function EditWorkout() {
   const {settings} = useSettings();
 
   const update = async () => {
-    await updateManySet({
-      oldName: params.value.name,
-      newName: name || params.value.name,
-      sets: sets ?? '3',
-      seconds: seconds?.toString() ?? '30',
-      minutes: minutes?.toString() ?? '3',
-      steps,
-    });
-    await updatePlanWorkouts(params.value.name, name || params.value.name);
-    if (uri || removeImage) await updateSetImage(params.value.name, uri || '');
+    await setRepo.update(
+      {name: params.value.name},
+      {
+        name: name || params.value.name,
+        sets: Number(sets),
+        minutes: +minutes,
+        seconds: +seconds,
+        steps,
+        image: removeImage ? '' : uri,
+      },
+    );
+    await planRepo.query(
+      `UPDATE plans 
+       SET workouts = REPLACE(workouts, $1, $2) 
+       WHERE workouts LIKE $3`,
+      [params.value.name, name, `%${params.value.name}%`],
+    );
     navigation.goBack();
   };
 
   const add = async () => {
-    await addSet({
+    const [{now}] = await getNow();
+    await setRepo.save({
       name,
       reps: 0,
       weight: 0,
@@ -60,6 +68,7 @@ export default function EditWorkout() {
       seconds: seconds ? +seconds : 30,
       sets: sets ? +sets : 3,
       steps,
+      created: now,
     });
     navigation.goBack();
   };

PlanItem.tsx

@@ -7,9 +7,9 @@ import {useCallback, useMemo, useState} from 'react';
 import {GestureResponderEvent, Text} from 'react-native';
 import {Divider, List, Menu} from 'react-native-paper';
 import {getBestSet} from './best.service';
+import {planRepo} from './db';
 import {Plan} from './plan';
 import {PlanPageParams} from './plan-page-params';
-import {deletePlan} from './plan.service';
 import {DAYS} from './time';
 
 export default function PlanItem({
@@ -33,7 +33,7 @@ export default function PlanItem({
   );
 
   const remove = useCallback(async () => {
-    if (typeof item.id === 'number') await deletePlan(item.id);
+    if (typeof item.id === 'number') await planRepo.delete(item.id);
     setShow(false);
     onRemove();
   }, [setShow, item.id, onRemove]);
@@ -42,6 +42,7 @@ export default function PlanItem({
     const workouts = item.workouts.split(',');
     const first = workouts[0];
     const set = await getBestSet(first);
+    console.log(`${PlanItem.name}.start:`, {set});
     setShow(false);
     navigation.navigate('StartPlan', {plan: item, set});
   }, [item, navigation]);

PlanList.tsx

@@ -6,11 +6,12 @@ import {
 import {useCallback, useState} from 'react';
 import {FlatList} from 'react-native';
 import {List} from 'react-native-paper';
+import {Like} from 'typeorm';
+import {planRepo} from './db';
 import DrawerHeader from './DrawerHeader';
 import Page from './Page';
 import {Plan} from './plan';
 import {PlanPageParams} from './plan-page-params';
-import {getPlans} from './plan.service';
 import PlanItem from './PlanItem';
 
 export default function PlanList() {
@@ -19,7 +20,11 @@ export default function PlanList() {
   const navigation = useNavigation<NavigationProp<PlanPageParams>>();
 
   const refresh = useCallback(async (value: string) => {
-    getPlans(value).then(setPlans);
+    planRepo
+      .find({
+        where: [{days: Like(`%${value}%`)}, {workouts: Like(`%${value}%`)}],
+      })
+      .then(setPlans);
   }, []);
 
   useFocusEffect(

SetForm.tsx

@@ -4,18 +4,18 @@ import DocumentPicker from 'react-native-document-picker';
 import {Button, Card, TouchableRipple} from 'react-native-paper';
 import ConfirmDialog from './ConfirmDialog';
 import {MARGIN} from './constants';
+import {setRepo} from './db';
+import GymSet from './gym-set';
 import MassiveInput from './MassiveInput';
 import {useSnackbar} from './MassiveSnack';
-import Set from './set';
-import {getSets} from './set.service';
 import {useSettings} from './use-settings';
 
 export default function SetForm({
   save,
   set,
 }: {
-  set: Set;
-  save: (set: Set) => void;
+  set: GymSet;
+  save: (set: GymSet) => void;
 }) {
   const [name, setName] = useState(set.name);
   const [reps, setReps] = useState(set.reps.toString());
@@ -39,9 +39,8 @@ export default function SetForm({
     if (!name) return;
     let image = newImage;
     if (!newImage && !removeImage)
-      image = await getSets({term: name, limit: 1, offset: 0}).then(
-        ([gotSet]) => gotSet?.image,
-      );
+      image = await setRepo.findOne({where: {name}}).then(s => s.image);
+
     console.log(`${SetForm.name}.handleSubmit:`, {image});
     save({
       name,

SetItem.tsx

@@ -2,9 +2,9 @@ import {NavigationProp, useNavigation} from '@react-navigation/native';
 import {useCallback, useState} from 'react';
 import {GestureResponderEvent, Image} from 'react-native';
 import {Divider, List, Menu, Text} from 'react-native-paper';
+import {setRepo} from './db';
+import GymSet from './gym-set';
 import {HomePageParams} from './home-page-params';
-import Set from './set';
-import {deleteSet} from './set.service';
 import {format} from './time';
 import useDark from './use-dark';
 import {useSettings} from './use-settings';
@@ -13,7 +13,7 @@ export default function SetItem({
   item,
   onRemove,
 }: {
-  item: Set;
+  item: GymSet;
   onRemove: () => void;
 }) {
   const [showMenu, setShowMenu] = useState(false);
@@ -23,13 +23,13 @@ export default function SetItem({
   const navigation = useNavigation<NavigationProp<HomePageParams>>();
 
   const remove = useCallback(async () => {
-    if (typeof item.id === 'number') await deleteSet(item.id);
+    if (typeof item.id === 'number') await setRepo.delete(item.id);
     setShowMenu(false);
     onRemove();
   }, [setShowMenu, onRemove, item.id]);
 
   const copy = useCallback(() => {
-    const set: Set = {...item};
+    const set: GymSet = {...item};
     delete set.id;
     setShowMenu(false);
     navigation.navigate('EditSet', {set});

SetList.tsx

@@ -3,35 +3,37 @@ import {
   useFocusEffect,
   useNavigation,
 } from '@react-navigation/native';
-import {useCallback, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {FlatList} from 'react-native';
 import {List} from 'react-native-paper';
+import {Like} from 'typeorm';
+import {getNow, setRepo} from './db';
 import DrawerHeader from './DrawerHeader';
+import GymSet from './gym-set';
 import {HomePageParams} from './home-page-params';
 import Page from './Page';
-import Set from './set';
-import {defaultSet, getSets, getToday} from './set.service';
 import SetItem from './SetItem';
 
 const limit = 15;
 
 export default function SetList() {
-  const [sets, setSets] = useState<Set[]>();
-  const [set, setSet] = useState<Set>();
+  const [sets, setSets] = useState<GymSet[]>([]);
+  const [set, setSet] = useState<GymSet>();
   const [offset, setOffset] = useState(0);
   const [term, setTerm] = useState('');
   const [end, setEnd] = useState(false);
   const navigation = useNavigation<NavigationProp<HomePageParams>>();
 
+  useEffect(() => console.log({sets}), [sets]);
+
   const refresh = useCallback(async (value: string) => {
-    const todaysSet = await getToday();
-    if (todaysSet) setSet({...todaysSet});
-    const newSets = await getSets({
-      term: `%${value}%`,
-      limit,
-      offset: 0,
+    const newSets = await setRepo.find({
+      where: {name: Like(`%${value}%`), hidden: 0 as any},
+      take: limit,
+      skip: 0,
+      order: {created: 'DESC'},
     });
-    console.log(`${SetList.name}.refresh:`, {newSets});
+    setSet(newSets[0]);
     if (newSets.length === 0) return setSets([]);
     setSets(newSets);
     setOffset(0);
@@ -45,7 +47,7 @@ export default function SetList() {
   );
 
   const renderItem = useCallback(
-    ({item}: {item: Set}) => (
+    ({item}: {item: GymSet}) => (
       <SetItem item={item} key={item.id} onRemove={() => refresh(term)} />
     ),
     [refresh, term],
@@ -55,22 +57,33 @@ export default function SetList() {
     if (end) return;
     const newOffset = offset + limit;
     console.log(`${SetList.name}.next:`, {offset, newOffset, term});
-    const newSets = await getSets({
-      term: `%${term}%`,
-      limit,
-      offset: newOffset,
+    const newSets = await setRepo.find({
+      where: {name: Like(`%${term}%`), hidden: 0 as any},
+      take: limit,
+      skip: newOffset,
+      order: {created: 'DESC'},
     });
     if (newSets.length === 0) return setEnd(true);
     if (!sets) return;
-    setSets([...sets, ...newSets]);
+    // setSets([...sets, ...newSets]);
     if (newSets.length < limit) return setEnd(true);
     setOffset(newOffset);
   }, [term, end, offset, sets]);
 
   const onAdd = useCallback(async () => {
     console.log(`${SetList.name}.onAdd`, {set});
+    const [{now}] = await getNow();
     navigation.navigate('EditSet', {
-      set: set || {...defaultSet},
+      set: set || {
+        hidden: false,
+        minutes: 3,
+        name: '',
+        reps: 0,
+        seconds: 30,
+        sets: 3,
+        weight: 0,
+        created: now,
+      },
     });
   }, [navigation, set]);
 
@@ -96,7 +109,10 @@ export default function SetList() {
             data={sets}
             style={{flex: 1}}
             renderItem={renderItem}
-            keyExtractor={s => s.id!.toString()}
+            getItem={(data: any, index: number) => {
+              console.log({data, index});
+              return data[index];
+            }}
             onEndReached={next}
           />
         )}

SettingsPage.tsx

@@ -8,12 +8,12 @@ import {useColor} from './color';
 import {darkColors, lightColors} from './colors';
 import ConfirmDialog from './ConfirmDialog';
 import {MARGIN} from './constants';
+import {settingsRepo} from './db';
 import DrawerHeader from './DrawerHeader';
 import Input from './input';
 import {useSnackbar} from './MassiveSnack';
 import Page from './Page';
 import Settings from './settings';
-import {updateSettings} from './settings.service';
 import Switch from './Switch';
 import {useSettings} from './use-settings';
 
@@ -50,8 +50,8 @@ export default function SettingsPage() {
 
   const update = useCallback(
     (value: boolean, field: keyof Settings) => {
-      updateSettings({...settings, [field]: +value});
-      setSettings({...settings, [field]: +value});
+      settingsRepo.update({}, {[field]: value});
+      setSettings({...settings, [field]: value});
     },
     [settings, setSettings],
   );
@@ -81,7 +81,7 @@ export default function SettingsPage() {
       copyTo: 'documentDirectory',
     });
     if (!fileCopyUri) return;
-    updateSettings({sound: fileCopyUri} as Settings);
+    settingsRepo.update({}, {sound: fileCopyUri});
     setSettings({...settings, sound: fileCopyUri});
     toast('This song will now play after rest timers complete.', 4000);
   }, [toast, setSettings, settings]);
@@ -150,28 +150,28 @@ export default function SettingsPage() {
   );
 
   const switches: Input<boolean>[] = [
-    {name: 'Rest timers', value: !!alarm, onChange: changeAlarmEnabled},
-    {name: 'Vibrate', value: !!vibrate, onChange: changeVibrate},
-    {name: 'Disable sound', value: !!noSound, onChange: changeNoSound},
-    {name: 'Record notifications', value: !!notify, onChange: changeNotify},
-    {name: 'Show images', value: !!images, onChange: changeImages},
-    {name: 'Show unit', value: !!showUnit, onChange: changeUnit},
-    {name: 'Show steps', value: !!steps, onChange: changeSteps},
-    {name: 'Show date', value: !!showDate, onChange: changeShowDate},
-    {name: 'Show sets', value: !!showSets, onChange: changeShowSets},
+    {name: 'Rest timers', value: alarm, onChange: changeAlarmEnabled},
+    {name: 'Vibrate', value: vibrate, onChange: changeVibrate},
+    {name: 'Disable sound', value: noSound, onChange: changeNoSound},
+    {name: 'Record notifications', value: notify, onChange: changeNotify},
+    {name: 'Show images', value: images, onChange: changeImages},
+    {name: 'Show unit', value: showUnit, onChange: changeUnit},
+    {name: 'Show steps', value: steps, onChange: changeSteps},
+    {name: 'Show date', value: showDate, onChange: changeShowDate},
+    {name: 'Show sets', value: showSets, onChange: changeShowSets},
   ];
 
   const changeTheme = useCallback(
     (value: string) => {
-      updateSettings({...settings, theme: value as any});
-      setSettings({...settings, theme: value as any});
+      settingsRepo.update({}, {theme: value});
+      setSettings({...settings, theme: value});
     },
     [settings, setSettings],
   );
 
   const changeDate = useCallback(
     (value: string) => {
-      updateSettings({...settings, date: value as any});
+      settingsRepo.update({}, {date: value});
       setSettings({...settings, date: value as any});
     },
     [settings, setSettings],

StartPlan.tsx

@@ -6,11 +6,12 @@ import {Button} from 'react-native-paper';
 import {getBestSet} from './best.service';
 import {PADDING} from './constants';
 import CountMany from './count-many';
+import {AppDataSource, getNow, setRepo} from './db';
+import GymSet from './gym-set';
 import MassiveInput from './MassiveInput';
 import {useSnackbar} from './MassiveSnack';
 import {PlanPageParams} from './plan-page-params';
-import Set from './set';
-import {addSet, countMany} from './set.service';
+import {countMany} from './set.service';
 import SetForm from './SetForm';
 import StackHeader from './StackHeader';
 import StartPlanItem from './StartPlanItem';
@@ -26,7 +27,7 @@ export default function StartPlan() {
   const {toast} = useSnackbar();
   const [minutes, setMinutes] = useState(set.minutes);
   const [seconds, setSeconds] = useState(set.seconds);
-  const [best, setBest] = useState<Set>(set);
+  const [best, setBest] = useState<GymSet>(set);
   const [selected, setSelected] = useState(0);
   const {settings} = useSettings();
   const [counts, setCounts] = useState<CountMany[]>();
@@ -41,10 +42,26 @@ export default function StartPlan() {
   });
 
   const refresh = useCallback(() => {
-    return countMany(workouts).then(newCounts => {
-      setCounts(newCounts);
-      console.log(`${StartPlan.name}.focus:`, {newCounts});
-    });
+    const questions = workouts.map(_ => '(?)').join(',');
+    const condition = `
+      sets.name = workouts.name
+        AND sets.created LIKE STRFTIME('%Y-%m-%d%%', 'now', 'localtime')
+        AND NOT sets.hidden
+    `;
+    return AppDataSource.manager
+      .createQueryBuilder()
+      .select('COUNT(sets.id)', 'total')
+      .addSelect('workouts')
+      .from(`(SELECT 0 AS name UNION values ${questions})`, 'workouts')
+      .leftJoin('sets', condition)
+      .groupBy('workouts.name')
+      .limit(-1)
+      .offset(1)
+      .getRawMany()
+      .then(newCounts => {
+        setCounts(newCounts);
+        console.log(`${StartPlan.name}.focus:`, {newCounts});
+      });
   }, [workouts]);
 
   useFocusEffect(
@@ -55,7 +72,8 @@ export default function StartPlan() {
 
   const handleSubmit = async () => {
     console.log(`${SetForm.name}.handleSubmit:`, {reps, weight, unit, best});
-    await addSet({
+    const [{now}] = await getNow();
+    await setRepo.save({
       name,
       weight: +weight,
       reps: +reps,
@@ -64,6 +82,7 @@ export default function StartPlan() {
       steps: set.steps,
       image: set.image,
       unit,
+      created: now,
     });
     await refresh();
     if (
@@ -92,11 +111,12 @@ export default function StartPlan() {
   const select = useCallback(
     async (index: number) => {
       setSelected(index);
-      console.log(`${StartPlan.name}.next:`, {name});
+      console.log(`${StartPlan.name}.next:`, {name, index});
       if (!counts) return;
       const workout = counts[index];
       console.log(`${StartPlan.name}.next:`, {workout});
       const newBest = await getBestSet(workout.name);
+      console.log(`${StartPlan.name}.next:`, {newBest});
       setMinutes(newBest.minutes);
       setSeconds(newBest.seconds);
       setName(newBest.name);

StartPlanItem.tsx

@@ -3,7 +3,7 @@ import {GestureResponderEvent, ListRenderItemInfo, View} from 'react-native';
 import {List, Menu, RadioButton} from 'react-native-paper';
 import {useColor} from './color';
 import CountMany from './count-many';
-import {deleteFirst} from './set.service';
+import {setRepo} from './db';
 
 interface Props extends ListRenderItemInfo<CountMany> {
   onSelect: (index: number) => void;
@@ -18,10 +18,15 @@ export default function StartPlanItem(props: Props) {
   const [showMenu, setShowMenu] = useState(false);
 
   const undo = useCallback(async () => {
-    await deleteFirst(item.name);
+    const first = await setRepo.findOne({
+      where: {name: item.name, hidden: 0 as any},
+      order: {created: 'desc'},
+    });
+    console.log({first});
+    await setRepo.delete(first.id);
     setShowMenu(false);
     onUndo();
-  }, [setShowMenu, item.name, onUndo]);
+  }, [setShowMenu, onUndo, item.name]);
 
   const longPress = useCallback(
     (e: GestureResponderEvent) => {

ViewBest.tsx

@@ -2,13 +2,14 @@ import {Picker} from '@react-native-picker/picker';
 import {RouteProp, useRoute} from '@react-navigation/native';
 import {useEffect, useState} from 'react';
 import {View} from 'react-native';
-import {getOneRepMax, getVolumes, getWeightsBy} from './best.service';
+import {getOneRepMax} from './best.service';
 import {BestPageParams} from './BestPage';
 import Chart from './Chart';
 import {PADDING} from './constants';
+import {setRepo} from './db';
+import GymSet from './gym-set';
 import {Metrics} from './metrics';
 import {Periods} from './periods';
-import Set from './set';
 import StackHeader from './StackHeader';
 import {formatMonth} from './time';
 import useDark from './use-dark';
@@ -17,7 +18,7 @@ import Volume from './volume';
 export default function ViewBest() {
   const {params} = useRoute<RouteProp<BestPageParams, 'ViewBest'>>();
   const dark = useDark();
-  const [weights, setWeights] = useState<Set[]>([]);
+  const [weights, setWeights] = useState<GymSet[]>([]);
   const [volumes, setVolumes] = useState<Volume[]>([]);
   const [metric, setMetric] = useState(Metrics.Weight);
   const [period, setPeriod] = useState(Periods.Monthly);
@@ -25,12 +26,34 @@ export default function ViewBest() {
   useEffect(() => {
     console.log(`${ViewBest.name}.useEffect`, {metric});
     console.log(`${ViewBest.name}.useEffect`, {period});
+    let difference = '-7 days';
+    if (period === Periods.Monthly) difference = '-1 months';
+    else if (period === Periods.Yearly) difference = '-1 years';
+    let group = '%Y-%m-%d';
+    if (period === Periods.Yearly) group = '%Y-%m';
+    const builder = setRepo
+      .createQueryBuilder()
+      .select("STRFTIME('%Y-%m-%d', created)", 'created')
+      .addSelect('unit')
+      .where('name = :name', {name: params.best.name})
+      .andWhere('NOT hidden')
+      .andWhere("DATE(created) >= DATE('now', 'weekday 0', :difference)", {
+        difference,
+      })
+      .groupBy('name')
+      .addGroupBy(`STRFTIME('${group}', created)`);
     switch (metric) {
       case Metrics.Weight:
-        getWeightsBy(params.best.name, period).then(setWeights);
+        builder
+          .addSelect('MAX(weight)', 'weight')
+          .getRawMany()
+          .then(setWeights);
         break;
       case Metrics.Volume:
-        getVolumes(params.best.name, period).then(setVolumes);
+        builder
+          .addSelect('SUM(weight * reps)', 'value')
+          .getRawMany()
+          .then(setVolumes);
         break;
       default:
         getOneRepMax({name: params.best.name, period}).then(setWeights);

WorkoutItem.tsx

@@ -3,8 +3,8 @@ import {useCallback, useMemo, useState} from 'react';
 import {GestureResponderEvent, Image} from 'react-native';
 import {List, Menu, Text} from 'react-native-paper';
 import ConfirmDialog from './ConfirmDialog';
-import Set from './set';
-import {deleteSetsBy} from './set.service';
+import {setRepo} from './db';
+import GymSet from './gym-set';
 import {useSettings} from './use-settings';
 import {WorkoutsPageParams} from './WorkoutsPage';
 
@@ -12,7 +12,7 @@ export default function WorkoutItem({
   item,
   onRemove,
 }: {
-  item: Set;
+  item: GymSet;
   onRemove: () => void;
 }) {
   const [showMenu, setShowMenu] = useState(false);
@@ -22,7 +22,7 @@ export default function WorkoutItem({
   const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
 
   const remove = useCallback(async () => {
-    await deleteSetsBy(item.name);
+    await setRepo.delete({name: item.name});
     setShowMenu(false);
     onRemove();
   }, [setShowMenu, onRemove, item.name]);

WorkoutList.tsx

@@ -8,27 +8,30 @@ import {FlatList} from 'react-native';
 import {List} from 'react-native-paper';
 import DrawerHeader from './DrawerHeader';
 import Page from './Page';
-import Set from './set';
-import {getDistinctSets} from './set.service';
+import GymSet from './gym-set';
 import SetList from './SetList';
 import WorkoutItem from './WorkoutItem';
 import {WorkoutsPageParams} from './WorkoutsPage';
+import {setRepo} from './db';
 
 const limit = 15;
 
 export default function WorkoutList() {
-  const [workouts, setWorkouts] = useState<Set[]>();
+  const [workouts, setWorkouts] = useState<GymSet[]>();
   const [offset, setOffset] = useState(0);
   const [term, setTerm] = useState('');
   const [end, setEnd] = useState(false);
   const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
 
   const refresh = useCallback(async (value: string) => {
-    const newWorkouts = await getDistinctSets({
-      term: `%${value}%`,
-      limit,
-      offset: 0,
-    });
+    const newWorkouts = await setRepo
+      .createQueryBuilder()
+      .select()
+      .where('name LIKE :name', {name: `%${value}%`})
+      .groupBy('name')
+      .orderBy('name')
+      .limit(limit)
+      .getMany();
     console.log(`${WorkoutList.name}`, {newWorkout: newWorkouts[0]});
     setWorkouts(newWorkouts);
     setOffset(0);
@@ -42,7 +45,7 @@ export default function WorkoutList() {
   );
 
   const renderItem = useCallback(
-    ({item}: {item: Set}) => (
+    ({item}: {item: GymSet}) => (
       <WorkoutItem item={item} key={item.name} onRemove={() => refresh(term)} />
     ),
     [refresh, term],
@@ -57,11 +60,15 @@ export default function WorkoutList() {
       newOffset,
       term,
     });
-    const newWorkouts = await getDistinctSets({
-      term: `%${term}%`,
-      limit,
-      offset: newOffset,
-    });
+    const newWorkouts = await setRepo
+      .createQueryBuilder()
+      .select()
+      .where('name LIKE :name', {name: `%${term}%`})
+      .groupBy('name')
+      .orderBy('name')
+      .limit(limit)
+      .offset(newOffset)
+      .getMany();
     if (newWorkouts.length === 0) return setEnd(true);
     if (!workouts) return;
     setWorkouts([...workouts, ...newWorkouts]);
@@ -71,7 +78,7 @@ export default function WorkoutList() {
 
   const onAdd = useCallback(async () => {
     navigation.navigate('EditWorkout', {
-      value: {name: '', sets: 3, image: '', steps: '', reps: 0, weight: 0},
+      value: new GymSet(),
     });
   }, [navigation]);
 

WorkoutsPage.tsx

@@ -1,12 +1,12 @@
 import {createStackNavigator} from '@react-navigation/stack';
 import EditWorkout from './EditWorkout';
-import Set from './set';
+import GymSet from './gym-set';
 import WorkoutList from './WorkoutList';
 
 export type WorkoutsPageParams = {
   WorkoutList: {};
   EditWorkout: {
-    value: Set;
+    value: GymSet;
   };
 };
 

babel.config.js

@@ -1,6 +1,12 @@
 module.exports = {
   presets: ['module:metro-react-native-babel-preset'],
-  plugins: ['react-native-reanimated/plugin', 'react-native-paper/babel'],
+  plugins: [
+    '@babel/plugin-transform-flow-strip-types',
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-proposal-decorators', { legacy: true }],
+    'react-native-reanimated/plugin',
+    'react-native-paper/babel',
+  ],
   env: {
     production: {
       plugins: ['transform-remove-console'],

best.service.ts

@@ -1,8 +1,6 @@
-import {db} from './db';
+import {db, setRepo} from './db';
+import GymSet from './gym-set';
 import {Periods} from './periods';
-import Set from './set';
-import {defaultSet} from './set.service';
-import Volume from './volume';
 
 export const getOneRepMax = async ({
   name,
@@ -29,89 +27,15 @@ export const getOneRepMax = async ({
   return result.rows.raw();
 };
 
-export const getBestSet = async (name: string): Promise<Set> => {
-  const bestWeight = `
-    SELECT name, reps, unit, MAX(weight) AS weight 
-    FROM sets
-    WHERE name = ?
-    GROUP BY name;
-  `;
-  const bestReps = `
-    SELECT name, MAX(reps) as reps, unit, weight, sets, minutes, seconds, image
-    FROM sets
-    WHERE name = ? AND weight = ?
-    GROUP BY name;
-  `;
-  const [weightResult] = await db.executeSql(bestWeight, [name]);
-  if (!weightResult.rows.length) return {...defaultSet};
-  const [repsResult] = await db.executeSql(bestReps, [
-    name,
-    weightResult.rows.item(0).weight,
-  ]);
-  return repsResult.rows.item(0);
-};
-
-export const getWeightsBy = async (
-  name: string,
-  period: Periods,
-): Promise<Set[]> => {
-  const select = `
-    SELECT max(weight) AS weight, 
-    STRFTIME('%Y-%m-%d', created) as created, unit
-    FROM sets
-    WHERE name = ? AND NOT hidden
-    AND DATE(created) >= DATE('now', 'weekday 0', ?)
-    GROUP BY name, STRFTIME(?, created)
-  `;
-  let difference = '-7 days';
-  if (period === Periods.Monthly) difference = '-1 months';
-  else if (period === Periods.Yearly) difference = '-1 years';
-  let group = '%Y-%m-%d';
-  if (period === Periods.Yearly) group = '%Y-%m';
-  const [result] = await db.executeSql(select, [name, difference, group]);
-  return result.rows.raw();
-};
-
-export const getVolumes = async (
-  name: string,
-  period: Periods,
-): Promise<Volume[]> => {
-  const select = `
-    SELECT sum(weight * reps) AS value, 
-    STRFTIME('%Y-%m-%d', created) as created, unit
-    FROM sets
-    WHERE name = ? AND NOT hidden
-    AND DATE(created) >= DATE('now', 'weekday 0', ?)
-    GROUP BY name, STRFTIME('%Y-%m-%d', created)
-  `;
-  let difference = '-7 days';
-  if (period === Periods.Monthly) difference = '-1 months';
-  else if (period === Periods.Yearly) difference = '-1 years';
-  const [result] = await db.executeSql(select, [name, difference]);
-  return result.rows.raw();
-};
-
-export const getBestWeights = async (search: string): Promise<Set[]> => {
-  const select = `
-    SELECT name, reps, unit, MAX(weight) AS weight 
-    FROM sets
-    WHERE name LIKE ? AND NOT hidden
-    GROUP BY name;
-  `;
-  const [result] = await db.executeSql(select, [`%${search}%`]);
-  return result.rows.raw();
-};
-
-export const getBestReps = async (
-  name: string,
-  weight: number,
-): Promise<Set[]> => {
-  const select = `
-    SELECT name, MAX(reps) as reps, unit, weight, image
-    FROM sets
-    WHERE name = ? AND weight = ? AND NOT hidden
-    GROUP BY name;
-  `;
-  const [result] = await db.executeSql(select, [name, weight]);
-  return result.rows.raw();
+export const getBestSet = async (name: string): Promise<GymSet> => {
+  return setRepo
+    .createQueryBuilder()
+    .select()
+    .addSelect('MAX(weight)', 'weight')
+    .where('name = :name', {name})
+    .groupBy('name')
+    .addGroupBy('reps')
+    .orderBy('weight', 'DESC')
+    .addOrderBy('reps', 'DESC')
+    .getOne();
 };

db.ts

@@ -3,6 +3,10 @@ import {
   openDatabase,
   SQLiteDatabase,
 } from 'react-native-sqlite-storage';
+import {DataSource} from 'typeorm';
+import GymSet from './gym-set';
+import {Plan} from './plan';
+import Settings from './settings';
 
 enablePromise(true);
 
@@ -127,7 +131,25 @@ const migrations = [
 
 export let db: SQLiteDatabase;
 
+export const AppDataSource = new DataSource({
+  type: 'react-native',
+  database: 'massive.db',
+  location: 'default',
+  entities: [GymSet, Plan, Settings],
+});
+
+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(
+    "SELECT STRFTIME('%Y-%m-%dT%H:%M:%S','now','localtime') AS now",
+  );
+};
+
 export const runMigrations = async () => {
+