edited knex query so it executes successfully (#45)

SE310-Team-1 · Aug 22, 2024 · 0d76145 · 0d76145
1 parent eb87dad
commit 0d76145
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/controllers/routines-controller.js b/server/controllers/routines-controller.js
@@ -126,11 +126,11 @@ const getAllRoutineInfo = (req, res) => {
     knex('exercises_history')
         .join('exercises', 'exercises_history.name', '=', 'exercises.name')
         .join('routines', 'exercises_history.date', '=', 'routines.date')
-        .select('routines.name as routine_name', 'routines.date', 'exercises_history.set', 'exercises.name as exercise_name', 'exercises_history.weight', 'exercises.muscle_group')
+        .select('routines.name as routine_name', 'routines.date', 'exercises_history.sets', 'exercises.name as exercise_name', 'exercises_history.weight', 'exercises.muscle_group')
         .whereRaw('exercises_history.date = routines.date')
         .then(result => {
             // Send the query result back as a JSON response
-            res.json(result);
+            res.status(200).json(result);
         })
         .catch(error => {
             // Handle any errors that occurred during the query