refactored existing code in user context which had attempted to store…

… data without using favourite workout token. All CRUD operations were so updated
chrismcanulty · Jul 6, 2023 · cfb7464 · cfb7464
1 parent af2af34
commit cfb7464
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 13 deletions.
diff --git a/src/component/FavouriteTableRow.tsx b/src/component/FavouriteTableRow.tsx
@@ -82,6 +82,8 @@ export default function FavouriteTableRow({
     }
   };
 
+  const selectedFavouriteToken = token;
+
   // console.log('token', token);
   // console.log('title', title);
   // console.log('item', item);
@@ -122,14 +124,28 @@ export default function FavouriteTableRow({
         )}
         <DataTable.Cell style={styles.cell}>
           <TouchableOpacity
-            onPress={() => favouriteClickComplete({row, index, workoutId})}>
+            onPress={() =>
+              favouriteClickComplete({
+                row,
+                index,
+                workoutId,
+                selectedFavouriteToken,
+              })
+            }>
             <WorkoutIcon name={row.Completion} />
           </TouchableOpacity>
         </DataTable.Cell>
         <DataTable.Cell style={styles.cell}>
           <TouchableOpacity
             onPress={() =>
-              favouriteEditSet({row, index, workoutId, reps, weight})
+              favouriteEditSet({
+                row,
+                index,
+                workoutId,
+                reps,
+                weight,
+                selectedFavouriteToken,
+              })
             }>
             {row.Edit ? (
               <WorkoutIcon name="check" />
@@ -140,7 +156,9 @@ export default function FavouriteTableRow({
         </DataTable.Cell>
         <DataTable.Cell style={styles.cell}>
           <TouchableOpacity
-            onPress={() => favouriteDeleteSet({index, workoutId})}>
+            onPress={() =>
+              favouriteDeleteSet({index, workoutId, selectedFavouriteToken})
+            }>
             <WorkoutIcon name="trash" />
           </TouchableOpacity>
         </DataTable.Cell>

diff --git a/src/component/FavouriteWorkout.tsx b/src/component/FavouriteWorkout.tsx
@@ -95,6 +95,8 @@ export default function FavouriteWorkout({
 
   const headers = ['Set', 'Reps', 'Weight', 'Done', 'Edit', 'Delete'];
 
+  const selectedFavouriteToken = token;
+
   // need to pass down required props - token (favouriteWorkoutData is available from user context)
 
   const saveFavouriteWorkoutData = async () => {
@@ -173,7 +175,8 @@ export default function FavouriteWorkout({
           token={token}
         />
       </DataTable>
-      <InfoButton onPress={() => addFavouriteSet({workoutId})}>
+      <InfoButton
+        onPress={() => addFavouriteSet({workoutId, selectedFavouriteToken})}>
         <AddText>Add set</AddText>
         <AddIcon name="plus" size={14} color={'rgb(169,169,169)'} />
       </InfoButton>

diff --git a/src/context/User.Context.js b/src/context/User.Context.js
@@ -135,14 +135,20 @@ const UserProvider = ({children}) => {
     setWorkout(tempWorkout);
   };
 
-  const favouriteClickComplete = ({row, index, workoutId}) => {
+  const favouriteClickComplete = ({
+    row,
+    index,
+    workoutId,
+    selectedFavouriteToken,
+  }) => {
     const tempWorkout = {...favouriteWorkoutData};
     const modifyComplete =
       row.Completion === 'check-circle'
         ? {...row, Completion: 'circle'}
         : {...row, Completion: 'check-circle'};
     tempWorkout[workoutId][index] = modifyComplete;
     setFavouriteWorkoutData(tempWorkout);
+    storeWorkoutData(tempWorkout, selectedFavouriteToken);
   };
 
   // add logic to remove trailing zeroes
@@ -169,7 +175,14 @@ const UserProvider = ({children}) => {
     setWorkout(tempWorkout);
   };
 
-  const favouriteEditSet = ({row, index, workoutId, reps, weight}) => {
+  const favouriteEditSet = ({
+    row,
+    index,
+    workoutId,
+    reps,
+    weight,
+    selectedFavouriteToken,
+  }) => {
     if (reps === '') {
       reps = '0';
     }
@@ -182,14 +195,15 @@ const UserProvider = ({children}) => {
     if (weight.slice(-1) === '.') {
       weight = weight.replace('.', '');
     }
+    console.log('edit', selectedFavouriteToken);
     const tempWorkout = {...favouriteWorkoutData};
     const editRow =
       row.Edit === true
         ? {...row, Edit: false, Reps: reps, Weight: weight}
         : {...row, Edit: true};
     tempWorkout[workoutId][index] = editRow;
     setFavouriteWorkoutData(tempWorkout);
-    storeWorkoutData(tempWorkout);
+    storeWorkoutData(tempWorkout, selectedFavouriteToken);
   };
 
   const addSet = ({workoutId}) => {
@@ -205,16 +219,21 @@ const UserProvider = ({children}) => {
     setWorkout(tempWorkout);
   };
 
-  const storeWorkoutData = async value => {
+  const storeWorkoutData = async (value, selectedFavouriteToken) => {
+    console.log('selected', selectedFavouriteToken);
     try {
       const jsonValue = JSON.stringify(value);
-      await AsyncStorage.setItem('@workout_key', jsonValue);
+      await AsyncStorage.setItem(
+        `@workout_key-${selectedFavouriteToken}`,
+        jsonValue,
+      );
     } catch (e) {
       // saving error
     }
   };
 
-  const addFavouriteSet = ({workoutId}) => {
+  const addFavouriteSet = ({workoutId, selectedFavouriteToken}) => {
+    console.log('add', selectedFavouriteToken);
     const tempWorkout = {...favouriteWorkoutData};
     const setNumber = tempWorkout[workoutId].length + 1;
     const newSet = {
@@ -225,7 +244,7 @@ const UserProvider = ({children}) => {
     };
     tempWorkout[workoutId].push(newSet);
     setFavouriteWorkoutData(tempWorkout);
-    storeWorkoutData(tempWorkout);
+    storeWorkoutData(tempWorkout, selectedFavouriteToken);
   };
 
   const deleteSet = ({index, workoutId}) => {
@@ -237,14 +256,15 @@ const UserProvider = ({children}) => {
     setWorkout(tempWorkout);
   };
 
-  const favouriteDeleteSet = ({index, workoutId}) => {
+  const favouriteDeleteSet = ({index, workoutId, selectedFavouriteToken}) => {
+    console.log('delete', selectedFavouriteToken);
     const tempWorkout = {...favouriteWorkoutData};
     tempWorkout[workoutId].splice(index, 1);
     tempWorkout[workoutId].map((set, index) => {
       set.Set = index + 1;
     });
     setFavouriteWorkoutData(tempWorkout);
-    storeWorkoutData(tempWorkout);
+    storeWorkoutData(tempWorkout, selectedFavouriteToken);
   };
 
   const clearWorkout = ({navigation}) => {