Merge pull request #226 from cuappdev/chimdi/workout-logging-testing

Refactor Workout Logging and Streak Tracking

Author: cejiogu

.dockerignore

@@ -17,4 +17,6 @@ build/
 
 .env
 
-Archive
+Archive
+
+service-account-key.json

migrations/versions/30b29f371489_make_streaks_non_null_default_0.py

@@ -0,0 +1,48 @@
+"""Make streaks non-null default 0
+
+Revision ID: 30b29f371489
+Revises: 6ec7ce03bb6a
+Create Date: 2026-02-10 18:12:25.251531
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '30b29f371489'
+down_revision = '6ec7ce03bb6a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # First complete backfill: set all streaks (active/max) to 0 if they are NULL
+    op.execute("UPDATE users SET active_streak = 0 WHERE active_streak IS NULL")
+    op.execute("UPDATE users SET max_streak = 0 WHERE max_streak IS NULL")
+
+    op.alter_column('users', 'active_streak',
+               existing_type=sa.INTEGER(),
+               nullable=False,
+               server_default=sa.text('0')
+    )
+
+    op.alter_column('users', 'max_streak',
+               existing_type=sa.INTEGER(),
+               nullable=False,
+               server_default=sa.text('0'),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('users', 'max_streak',
+               existing_type=sa.INTEGER(),
+               nullable=True)
+    op.alter_column('users', 'active_streak',
+               existing_type=sa.INTEGER(),
+               nullable=True)
+    # ### end Alembic commands ###

migrations/versions/31b1fa20772f_popular_times.py

@@ -12,7 +12,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '31b1fa20772f'
-down_revision = None
+down_revision = 'eb948c31a342'
 branch_labels = None
 depends_on = None
 

migrations/versions/48923aecacb0_debug_internal_default_conversion_to_utc.py

@@ -0,0 +1,69 @@
+"""Debug internal default conversion to UTC
+
+Revision ID: 48923aecacb0
+Revises: 
+Create Date: 2026-03-02 06:30:17.794409
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision = '48923aecacb0'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.alter_column(
+        "workout",
+        "workout_time",
+        type_=sa.DateTime(timezone=True),
+        postgresql_using="workout_time AT TIME ZONE 'UTC'",
+        existing_nullable=False,
+    )
+
+    op.alter_column(
+        "user_workout_goal_history",
+        "effective_at",
+        type_=sa.DateTime(timezone=True),
+        postgresql_using="effective_at AT TIME ZONE 'UTC'",
+        existing_nullable=False,
+    )
+
+    op.alter_column(
+        "user_workout_goal_history",
+        "effective_at",
+        server_default=sa.text("CURRENT_TIMESTAMP"),
+        existing_type=sa.DateTime(timezone=True),
+        existing_nullable=False,
+    )
+
+
+def downgrade():
+    op.alter_column(
+        "user_workout_goal_history",
+        "effective_at",
+        server_default=None,
+        existing_type=sa.DateTime(timezone=True),
+        existing_nullable=False,
+    )
+    
+    op.alter_column(
+        "user_workout_goal_history",
+        "effective_at",
+        type_=sa.DateTime(timezone=False),
+        postgresql_using="effective_at::timestamp",
+        existing_nullable=False,
+    )
+
+    op.alter_column(
+        "workout",
+        "workout_time",
+        type_=sa.DateTime(timezone=False),
+        postgresql_using="workout_time::timestamp",
+        existing_nullable=False,
+    )

migrations/versions/6ec7ce03bb6a_change_workout_goal_type_to_integer.py

@@ -0,0 +1,24 @@
+"""Change workout_goal type to integer
+
+Revision ID: 6ec7ce03bb6a
+Revises: add_friends_table
+Create Date: 2026-02-09 22:56:02.894228
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '6ec7ce03bb6a'
+down_revision = 'add_friends_table'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.alter_column("users", "workout_goal", type_=sa.Integer, postgresql_using="cardinality(workout_goal)")
+
+# NOTE: Lossy migration — cannot convert integer back to array of specific days of the week
+def downgrade():
+    raise NotImplementedError("Downgrade is possible: cannot convert integer back to array of specific days of the week")

migrations/versions/6fb4a21a1201_include_last_streak_and_last_goal_.py

@@ -0,0 +1,30 @@
+"""Include last_streak and last_goal_change to User model
+
+Revision ID: 6fb4a21a1201
+Revises: 30b29f371489
+Create Date: 2026-02-17 10:06:17.931547
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '6fb4a21a1201'
+down_revision = '30b29f371489'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('last_goal_change', sa.DateTime(), nullable=True))
+    op.add_column('users', sa.Column('last_streak', sa.Integer(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'last_streak')
+    op.drop_column('users', 'last_goal_change')
+    # ### end Alembic commands ###

migrations/versions/eb948c31a342_create_gear_table.py

@@ -0,0 +1,34 @@
+"""Create gear table
+
+Revision ID: eb948c31a342
+Revises: 6fb4a21a1201
+Create Date: 2026-03-02 06:22:00.042780
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# Import the PriceType enum used in the model so the Enum can be created
+from src.models.activity import PriceType
+
+
+# revision identifiers, used by Alembic.
+revision = 'eb948c31a342'
+down_revision = '6fb4a21a1201'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "gear",
+        sa.Column("id", sa.Integer(), primary_key=True),
+        sa.Column("activity_id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("cost", sa.Float(), nullable=False),
+        sa.Column("rate", sa.String(), nullable=True),
+        sa.Column("type", sa.Enum(PriceType), nullable=False),
+    )
+
+def downgrade():
+    op.drop_table("gear")

schema.graphql

@@ -85,6 +85,8 @@ type CreateReport {
   report: Report
 }
 
+scalar Date
+
 scalar DateTime
 
 enum DayOfWeekEnum {
@@ -187,8 +189,6 @@ type HourlyAverageCapacity {
   history: [Float]!
 }
 
-scalar JSONString
-
 type LoginUser {
   accessToken: String
   refreshToken: String
@@ -218,7 +218,7 @@ type Mutation {
   createUser(email: String!, encodedImage: String, name: String!, netId: String!): User
   editUser(email: String, encodedImage: String, name: String, netId: String!): User
   enterGiveaway(giveawayId: Int!, userNetId: String!): GiveawayInstance
-  setWorkoutGoals(userId: Int!, workoutGoal: [String]!): User
+  setWorkoutGoals(userId: Int!, workoutGoal: Int!): User
   logWorkout(facilityId: Int!, userId: Int!, workoutTime: DateTime!): Workout
   loginUser(netId: String!): LoginUser
   logoutUser: LogoutUser
@@ -269,8 +269,6 @@ type Query {
   getWorkoutsById(id: Int): [Workout]
   activities: [Activity]
   getAllReports: [Report]
-  getWorkoutGoals(id: Int!): [String]
-  getUserStreak(id: Int!): JSONString
   getHourlyAverageCapacitiesByFacilityId(facilityId: Int): [HourlyAverageCapacity]
   getUserFriends(userId: Int!): [User]
   getCapacityReminderById(id: Int!): CapacityReminder
@@ -307,20 +305,34 @@ type User {
   email: String
   netId: String!
   name: String!
-  activeStreak: Int
-  maxStreak: Int
-  workoutGoal: [DayOfWeekGraphQLEnum]
+  activeStreak: Int!
+  maxStreak: Int!
+  workoutGoal: Int
+  lastGoalChange: DateTime
+  lastStreak: Int!
   encodedImage: String
   giveaways: [Giveaway]
+  goalHistory: [WorkoutGoalHistory]
   friendRequestsSent: [Friendship]
   friendRequestsReceived: [Friendship]
   friendships: [Friendship]
   friends: [User]
+  totalGymDays: Int!
+  streakStart: Date
 }
 
 type Workout {
   id: ID!
   workoutTime: DateTime!
   userId: Int!
   facilityId: Int!
+  gymName: String!
+}
+
+type WorkoutGoalHistory {
+  id: ID!
+  userId: Int!
+  workoutGoal: Int!
+  effectiveAt: DateTime!
+  user: User
 }

src/models/user.py

@@ -1,8 +1,9 @@
-from sqlalchemy import Column, Integer, String, ARRAY, Enum, ForeignKey
+from sqlalchemy import Column, Integer, String, ARRAY, Enum, ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 from src.database import Base
 from src.models.enums import DayOfWeekEnum
 from src.models.friends import Friendship
+import sqlalchemy as sa
 
 class User(Base):
     """
@@ -14,10 +15,12 @@ class User(Base):
         - `giveaways`                             (nullable) The list of giveaways a user is entered into.
         - `net_id`                                The user's Net ID.
         - `name`                                  The user's name.
-        - `workout_goal`                          The days of the week the user has set as their personal goal.
+        - `workout_goal`                          The number of days the user has set as their personal goal.
         - `active_streak`                         The number of consecutive weeks the user has met their personal goal.
         - `max_streak`                            The maximum number of consecutive weeks the user has met their personal goal.
         - `workout_goal`                          The max number of weeks the user has met their personal goal.
+        - `last_goal_change`                      The date and time the user last changed their personal goal.
+        - `last_streak`                           The number of consecutive weeks the user has met their personal goal before the last goal change.
         - `encoded_image`                         The profile picture URL of the user.
     """
 
@@ -28,11 +31,15 @@ class User(Base):
     giveaways = relationship("Giveaway", secondary="giveaway_instance", back_populates="users")
     net_id = Column(String, nullable=False)
     name = Column(String, nullable=False)
-    active_streak = Column(Integer, nullable=True)
-    max_streak = Column(Integer, nullable=True)
-    workout_goal = Column(ARRAY(Enum(DayOfWeekEnum)), nullable=True)
+    active_streak = Column(Integer, nullable=False, default=0, server_default=sa.text('0'))
+    max_streak = Column(Integer, nullable=False, default=0, server_default=sa.text('0'))
+    workout_goal = Column(Integer, nullable=True)
+    last_goal_change = Column(DateTime, nullable=True)
+    last_streak = Column(Integer, nullable=False, default=0, server_default=sa.text('0'))
     encoded_image = Column(String, nullable=True)
 
+    goal_history = relationship("UserWorkoutGoalHistory", back_populates="user", cascade="all, delete-orphan", order_by="UserWorkoutGoalHistory.effective_at.desc()")
+
     friend_requests_sent = relationship("Friendship",
                                         foreign_keys="Friendship.user_id",
                                         back_populates="user")

src/models/user_workout_goal_history.py

@@ -0,0 +1,24 @@
+from sqlalchemy import Column, Integer, Float, ForeignKey, String, DateTime, text
+from sqlalchemy.orm import backref, relationship
+from src.database import Base
+from datetime import datetime, timezone
+
+class UserWorkoutGoalHistory(Base):
+    """
+    A history of a user's workout goals.
+
+    Attributes:
+        - `id`                  The ID of the user workout goal history.
+        - `user_id`             The ID of the user who owns the goal history.
+        - `workout_goal`        The workout goal.
+        - `effective_at`        The date and time the goal was set.
+    """
+
+    __tablename__ = "user_workout_goal_history"
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False)
+    workout_goal = Column(Integer, nullable=False)
+    effective_at = Column(DateTime(timezone=True), nullable=False, default=lambda: datetime.now(timezone.utc), server_default=text("CURRENT_TIMESTAMP"))
+
+    user = relationship("User", back_populates='goal_history')