Make stats refresh, and add filter support to stats endpoint

features/person_overview.py

@@ -138,10 +138,6 @@ class PersonOverview:
         # Initialize the exercise sets dictionary
         exercise_sets = {exercise["id"]: {"exercise_id": exercise["id"], "name": exercise["name"], "sets": []} for exercise in exercises}
 
-        workout_start_dates = []
-        set_count = 0
-        exercise_count = len(unique_exercise_ids)
-
         for row in result:
             workout_id = row["workout_id"]
 
@@ -154,8 +150,6 @@ class PersonOverview:
                     "exercises": {exercise["id"]: [] for exercise in exercises}  # Keyed by exercise_id
                 }
 
-                workout_start_dates.append(row["start_date"])
-
             # Add topset to the corresponding exercise
             if row["exercise_id"] and row["topset_id"]:
                 # Add to workout exercises
@@ -172,7 +166,6 @@ class PersonOverview:
                     "workout_start_date": row["start_date"],
                     "exercise_name": row["exercise_name"]
                 })
-                set_count += 1
 
         # Transform into a list of rows
         for workout_id, workout in workout_map.items():
@@ -180,42 +173,11 @@ class PersonOverview:
         
         exercise_progress_graphs = self.generate_exercise_progress_graphs(person_info["person_id"], exercise_sets)
 
-        workout_count = len(workout_start_dates)
-        stats = [{"Text": "Total Workouts", "Value": workout_count},
-             {"Text": "Total Sets", "Value": set_count},
-             {"Text": "Total Exercises", "Value": exercise_count}]
-        if workout_count > 0:
-            first_workout_date = min(workout_start_dates)
-            last_workout_date = max(workout_start_dates)
-            training_duration = last_workout_date - first_workout_date
-
-            stats.append({"Text": "Days Since First Workout", "Value": (
-                date.today() - first_workout_date).days})
-            if workout_count >= 2:
-                stats.append({"Text": "Days Since Last Workout",
-                            "Value": (
-                                date.today() - last_workout_date).days})
-                stats.append({"Text": "Total duration in days",
-                                "Value": training_duration.days})
-                
-                average_number_sets_per_workout = round(
-                    set_count / workout_count, 1)
-                stats.append({"Text": "Average sets per workout",
-                            "Value": average_number_sets_per_workout})
-
-                if training_duration > timedelta(days=0):
-                    average_workouts_per_week = round(
-                        workout_count / (training_duration.days / 7), 1)
-                    stats.append({"Text": "Average Workouts Per Week",
-                                "Value": average_workouts_per_week})
-
-
         return {
             **person_info,
             "workouts": workouts,
             "selected_exercises": exercises,
-            "exercise_progress_graphs": exercise_progress_graphs,
-            "stats": stats
+            "exercise_progress_graphs": exercise_progress_graphs
         }
     
     def generate_exercise_progress_graphs(self, person_id, exercise_sets):

features/stats.py

@@ -49,11 +49,13 @@ class Stats:
         stats = [
             {"Text": "Total Workouts", "Value": workout_count},
             {"Text": "Total Sets", "Value": total_sets},
-            {"Text": "Total Exercises", "Value": exercise_count},
-            {"Text": "Average Sets Per Exercise", "Value": average_sets_per_exercise},
-            {"Text": "Average Exercises Per Workout", "Value": average_exercises_per_workout},
+            {"Text": "Average Sets Per Exercise", "Value": average_sets_per_exercise}
         ]
 
+        if exercise_count > 1:
+            stats.append({"Text": "Total Exercises", "Value": exercise_count})
+            stats.append({"Text": "Average Exercises Per Workout", "Value": average_exercises_per_workout})
+
         if people_count > 1:
             stats.append({"Text": "People Tracked", "Value": people_count})
 
@@ -82,7 +84,8 @@ class Stats:
 
         return stats
 
-    def fetch_stats_for_person(self, person_id):
+    def fetch_stats_for_person(self, person_id, min_date=None, max_date=None, selected_exercise_ids=None):
+        # Base query
         query = """
         SELECT
             t.workout_id AS "WorkoutId",
@@ -96,8 +99,26 @@ class Stats:
             JOIN exercise e ON t.exercise_id = e.exercise_id
         WHERE p.person_id = %s
         """
-        workouts_data = self.execute(query, [person_id])
 
+        # Parameters for the query
+        params = [person_id]
+
+        # Add optional filters
+        if min_date:
+            query += " AND w.start_date >= %s"
+            params.append(min_date)
+        if max_date:
+            query += " AND w.start_date <= %s"
+            params.append(max_date)
+        if selected_exercise_ids:
+            placeholders = ", ".join(["%s"] * len(selected_exercise_ids))
+            query += f" AND e.exercise_id IN ({placeholders})"
+            params.extend(selected_exercise_ids)
+
+        # Execute the query
+        workouts_data = self.execute(query, params)
+
+        # Generate stats from the retrieved data
         person_stats = self.get_stats_from_topsets(workouts_data)
         return person_stats