Merge pull request #231 from cuappdev/chimdi/api-refactoring

Minor API Refactoring

Author: cejiogu

schema.graphql

@@ -85,8 +85,6 @@ type CreateReport {
   report: Report
 }
 
-scalar Date
-
 scalar DateTime
 
 enum DayOfWeekEnum {
@@ -319,7 +317,8 @@ type User {
   friendships: [Friendship]
   friends: [User]
   totalGymDays: Int!
-  streakStart: Date
+  streakStart: DateTime
+  workoutHistory: [Workout]
 }
 
 type Workout {

src/schema.py

@@ -3,7 +3,7 @@
 import os
 from flask_jwt_extended import create_access_token, create_refresh_token, get_jwt_identity, get_jwt, jwt_required
 from functools import wraps
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta, time, timezone
 from graphene_sqlalchemy import SQLAlchemyObjectType
 from graphql import GraphQLError
 from src.models.capacity import Capacity as CapacityModel
@@ -30,8 +30,10 @@
 import requests
 from firebase_admin import messaging
 import logging
+from zoneinfo import ZoneInfo
 from sqlalchemy import func, cast, Date
 
+local_tz = ZoneInfo("America/New_York")
 
 def resolve_enum_value(entry):
     """Return the raw value for Enum objects while leaving plain strings untouched."""
@@ -67,7 +69,7 @@ def to_local_time(dt):
         return None
 
     # Convert to local timezone (server-local)
-    return dt_utc.astimezone()
+    return dt_utc.astimezone(local_tz)
 
 
 def goal_at(goal_history, window_start_date):
@@ -264,9 +266,14 @@ class Meta:
     total_gym_days = graphene.Int(
         required=True, description="Get the total number of gym days (unique workout days) for user."
     )
-    streak_start = graphene.Date(
-        description="The start date of the most recent active streak, up until the current date."
+    streak_start = graphene.DateTime(
+        description="The start datetime of the most recent active streak (midnight of the day in local timezone), up until the current date."
     )
+    workout_history = graphene.List(lambda: Workout)
+
+    def resolve_workout_history(self, info):
+        query = Workout.get_query(info).filter(WorkoutModel.user_id == self.id).order_by(WorkoutModel.workout_time.desc())
+        return query.all()
 
     def resolve_total_gym_days(self, info):
         return (
@@ -432,8 +439,8 @@ def goal_for_window_start(ws_date):
             return None
 
         last_streak_start_date = workout_dates[idx_last_streak_start]
-
-        return last_streak_start_date
+        local_midnight = datetime.combine(last_streak_start_date, time.min, tzinfo=local_tz)
+        return local_midnight
 
     def resolve_max_streak(self, info):
         user = User.get_query(info).filter(UserModel.id == self.id).first()