Fixed the Environment Variables

.dockerignore

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

.github/workflows/deploy-dev.yml

@@ -40,10 +40,9 @@ jobs:
             source tags
             export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
             cd docker-compose
-            docker stack rm the-stack
-            sleep 20s
-            sudo systemctl stop nginx
+            docker pull cornellappdev/uplift-dev:$IMAGE_TAG
+            # temporary container to run migrations
+            docker run --rm --env-file uplift.env -v ./certs:/usr/src/app/certs cornellappdev/uplift-dev:$IMAGE_TAG flask --app migrations db upgrade
             sudo systemctl restart nginx
             docker stack deploy -c docker-compose.yml the-stack --with-registry-auth
-            sleep 60s
-            yes | docker system prune -a
+            docker system prune -f

.github/workflows/deploy-prod.yml

@@ -39,11 +39,10 @@ jobs:
             touch tags
             source tags
             export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
-            echo "export IMAGE_TAG=${IMAGE_TAG}" > tags
             cd docker-compose
-            docker stack rm the-stack
-            sleep 20s
-            sudo systemctl stop nginx
+            docker pull cornellappdev/uplift-prod:$IMAGE_TAG
+            # temporary container to run migrations
+            docker run --rm --env-file uplift.env -v ./certs:/usr/src/app/certs cornellappdev/uplift-prod:$IMAGE_TAG flask --app migrations db upgrade
             sudo systemctl restart nginx
             docker stack deploy -c docker-compose.yml the-stack --with-registry-auth
-            yes | docker system prune -a
+            docker system prune -f

Dockerfile

@@ -6,4 +6,4 @@ COPY . .
 ENV MAX_CONCURRENT_PIP=4
 RUN pip3 install --upgrade pip
 RUN pip3 install --exists-action w -r requirements.txt
-CMD flask --app migrations db upgrade && python3 app.py
+CMD python3 app.py

app_factory.py

@@ -3,7 +3,8 @@
 from flask_jwt_extended import JWTManager
 from src.utils.constants import SERVICE_ACCOUNT_PATH, JWT_SECRET_KEY
 from datetime import datetime
-from flask import Flask, render_template
+from flask import Flask, jsonify, render_template
+from sqlalchemy import text
 from graphene import Schema
 from graphql.utils import schema_printer
 from src.database import db_session, init_db
@@ -89,6 +90,14 @@ def check_if_token_revoked(jwt_header, jwt_payload: dict) -> bool:
     def index():
         return render_template("index.html")
 
+    @app.route("/health")
+    def health_check():
+        try:
+            db_session.execute(text("SELECT 1"))
+            return jsonify({"status": "healthy", "database": "connected"}), 200
+        except Exception:
+            return jsonify({"status": "unhealthy", "database": "disconnected"}), 503
+
     app.add_url_rule("/graphql", view_func=GraphQLView.as_view("graphql", schema=schema, graphiql=True))
 
     @app.teardown_appcontext

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/46ba03c28573_make_last_streak_non_null_default_0.py

@@ -0,0 +1,33 @@
+"""make last_streak non_null default 0
+
+Revision ID: 46ba03c28573
+Revises: b09a4d8151d6
+Create Date: 2026-03-06 01:47:07.348774
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '46ba03c28573'
+down_revision = 'b09a4d8151d6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.execute("UPDATE users SET last_streak = 0 WHERE last_streak IS NULL")
+    op.alter_column('users', 'last_streak',
+        existing_type=sa.INTEGER(),
+        nullable=False,
+        server_default=sa.text('0')
+    )
+
+
+def downgrade():
+    op.alter_column('users', 'last_streak',
+        existing_type=sa.INTEGER(),
+        nullable=True,
+        server_default=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/b09a4d8151d6_merge_diverging_branches.py

@@ -0,0 +1,24 @@
+"""Merge diverging branches
+
+Revision ID: b09a4d8151d6
+Revises: eb948c31a342, 48923aecacb0
+Create Date: 2026-03-05 17:15:46.737524
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b09a4d8151d6'
+down_revision = ('eb948c31a342', '48923aecacb0')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

migrations/versions/eb948c31a342_create_gear_table.py

@@ -0,0 +1,42 @@
+"""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
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision = 'eb948c31a342'
+down_revision = '6fb4a21a1201'
+branch_labels = None
+depends_on = None
+
+### Ensures alembic does not try to create enum
+price_type_enum = postgresql.ENUM('rate', 'gear', name='pricetype', create_type=False)
+
+
+def upgrade():
+    op.execute("""
+    DO $$
+    BEGIN
+        IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'gear') THEN
+            CREATE TABLE gear (
+                id SERIAL NOT NULL,
+                activity_id INTEGER NOT NULL,
+                name VARCHAR NOT NULL,
+                cost FLOAT NOT NULL,
+                rate VARCHAR,
+                type pricetype NOT NULL,
+                PRIMARY KEY (id)
+            );
+        END IF;
+    END $$;
+    """)
+
+def downgrade():
+    op.drop_table("gear")