Version 1.1.0 (#78)

* Update process attendance logic to use gspread instead of CSV export link (#64)

* Replace CSV functionality with gspread in attendance log processing

* Update test fixtures to mock gspread for tests

* Production Fix 2 (#67)

* Fix canvas url issue and alembic set-up script

* Withdrawal Form Processing  (#61)

* Student withdrawal form endpoint logic

* Updated to use a schema to accept JSON body

* Accelerate Attendance Bug (#73)

* Fix incorrect field used in accelerate/process-attendance

* Check Actvity (#69)

* Database alembic update and router logic for check activity endpoint route

* Logic to check active status using Attendance and Canvas activity

* Change Alembic config to use command line argument for environment

* Create alias for fetching threshold values from environment vars

* Removes direct env access from env.py and keeps runtime DB selection logic intact. (#70)

Co-authored-by: Nicolas Guerrero <Guerreronicolas1872@gmail.com>
Co-authored-by: Erfan <41974204+arsalaerfan@users.noreply.github.com>
Co-authored-by: Sergio Zavala <106635253+sezavala@users.noreply.github.com>
Co-authored-by: srmk-2005 <130954718+srmk-2005@users.noreply.github.com>
Co-authored-by: RAMAMUTHUKUMARAN <130954718+RAMAMUTHUKUMARAN@users.noreply.github.com>

Author: 4 people

migrations/env.py

@@ -1,9 +1,7 @@
 from logging.config import fileConfig
-import os
-
 from sqlalchemy import engine_from_config, create_engine
 from sqlalchemy import pool
-
+from src.config import settings
 from alembic import context
 
 # this is the Alembic Config object, which provides
@@ -22,14 +20,14 @@
 
 # map Alembic environment names to DB URLs
 DB_URLS = {
-    "development": os.getenv("DEV_DATABASE_URL"),
-    "production": os.getenv("PROD_DATABASE_URL"),
-    "custom": os.getenv("CUSTOM_DATABASE_URL"),
+    "development": settings.dev_database_url,
+    "production": settings.prod_database_url,
+    "custom": settings.custom_database_url,
 }
 
 def get_url() -> str:
     # Alembic Command line: alembic -x environment=development
-    env_name = config.get_main_option("environment") or "development"
+    env_name = context.get_x_argument(as_dictionary=True).get("environment") or "development"
     url = DB_URLS.get(env_name)
     if not url:
         raise RuntimeError(f"No database URL configured for environment '{env_name}'")
@@ -39,9 +37,8 @@ def get_url() -> str:
 # can be acquired:
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
-from os import environ as env
 def env_url():
-    return env.get("CTI_POSTGRES_URL")
+    return settings.cti_postgres_url
 
 def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode.

migrations/versions/ab2e5d7e05e8_add_last_canvas_access.py

@@ -0,0 +1,32 @@
+"""Add last_canvas_access
+
+Revision ID: ab2e5d7e05e8
+Revises: c0025f85a371
+Create Date: 2025-12-04 11:24:44.987577
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'ab2e5d7e05e8'
+down_revision: Union[str, None] = 'c0025f85a371'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Add last_canvas_access column to accelerate_course_progress
+    op.add_column(
+        'accelerate_course_progress',
+        sa.Column('last_canvas_access', sa.DateTime(timezone=False), nullable=True)
+    )
+
+
+def downgrade() -> None:
+    # Drop column
+    op.drop_column('accelerate_course_progress', 'last_canvas_access')
+    

src/api.py

@@ -6,8 +6,11 @@
 from src.students.alternate_emails.router import router as student_alternate_emails_router
 from src.students.attendance_log.router import router as student_attendance_log_router
 from src.students.accelerate.process_attendance.router import router as accelerate_attendance_record_router
+from src.students.accelerate.check_activity.router import router as accelerate_activity_check_router
 from src.students.missing_students.router import router as student_recover_attendance_router
 from src.students.attendance_entry.router import router as student_attendance_entry_router
+from src.students.withdrawal_processing.router import router as student_withdrawal_router
+
 from src.gsheet.refresh.router import router as gsheet_refresh_router
 from src.utils.authorization import verify_api_key
 
@@ -55,6 +58,13 @@
     tags=["Accelerate"],
 )
 
+# /api/students/accelerate/check-activity
+api_router.include_router(
+    accelerate_activity_check_router,
+    prefix="/students/accelerate/check-activity",
+    tags=["Accelerate"],
+)
+
 # /api/students/recover-attendance
 api_router.include_router(
     student_recover_attendance_router,
@@ -69,9 +79,16 @@
     tags=["Students"],
 )
 
+# /api/students/process-withdrawal
+api_router.include_router(
+    student_withdrawal_router,
+    prefix="/students/process-withdrawal",
+    tags=["Students"],
+)
+
 # /api/gsheet/refresh/...
 api_router.include_router(
     gsheet_refresh_router,
     prefix="/gsheet/refresh",
     tags=["GSheet"],
-)
+)

src/config.py

@@ -20,6 +20,11 @@ class Settings(BaseSettings):
     cti_mongo_url: Optional[str] = Field(validation_alias="CTI_MONGO_URL", default=None)
     cti_postgres_url: Optional[str] = Field(validation_alias="CTI_POSTGRES_URL", default=None)
 
+    # Alembic / Migration Database URLs
+    dev_database_url: Optional[str] = Field(validation_alias="DEV_DATABASE_URL", default=None)
+    prod_database_url: Optional[str] = Field(validation_alias="PROD_DATABASE_URL", default=None)
+    custom_database_url: Optional[str] = Field(validation_alias="CUSTOM_DATABASE_URL", default=None)
+
     # Canvas Variables, only required for Canvas specific-operations
     # NOTE: SIS ID's are needed for SIS operations, must be manually defined ahead of time
     # TODO: Rename CTI_ACCESS_TOKEN to CTI_CANVAS_TOKEN, improve clarity on token purpose and differentiate from server token
@@ -46,6 +51,14 @@ class Settings(BaseSettings):
     gs_private_key_id: Optional[str] = Field(validation_alias="GS_PRIVATE_KEY_ID", default=None)
     gs_project_id: Optional[str] = Field(validation_alias="GS_PROJECT_ID", default=None)
 
+    # Thresholds in weeks for determining if a student is active
+    activity_attendance_threshold_weeks: int = Field(validation_alias="ACTIVITY_ATTENDANCE_THRESHOLD_WEEKS",
+                                                     default=2,
+                                                     description="Number of weeks to check for attendance activity")
+    activity_canvas_threshold_weeks: int = Field(validation_alias="ACTIVITY_CANVAS_THRESHOLD_WEEKS",
+                                                 default=2,
+                                                 description="Number of weeks to check for Canvas activity")
+
     # Application Constants
     canvas_api_url: str = "https://cti-courses.instructure.com"
     canvas_api_test_url: str = "https://cti-courses.test.instructure.com"
@@ -60,4 +73,4 @@ class Settings(BaseSettings):
 APPLICATIONS_COLLECTION = "applications"
 ACCELERATE_FLEX_COLLECTION = "accelerate_flex"
 PATHWAY_GOALS_COLLECTION = "pathway_goals"
-COURSES_COLLECTION = "courses"
+COURSES_COLLECTION = "courses"

src/database/postgres/models.py

@@ -171,6 +171,7 @@ class AccelerateCourseProgress(Base):
     latest_milestone: Mapped[Optional[str]] = mapped_column(String)
     pathway_score: Mapped[Optional[float]] = mapped_column(Float(3))
     pathway_difference: Mapped[Optional[int]] = mapped_column(Integer)
+    last_canvas_access: Mapped[Optional[datetime]] = mapped_column(DateTime)
     owner: Mapped["Accelerate"] = relationship(back_populates="progress_record")
 
 class AccountabilityGroup(Base):

src/students/accelerate/check_activity/router.py

@@ -0,0 +1,30 @@
+from typing import Any, Dict, Optional
+
+from fastapi import APIRouter, Depends, Query, status
+from sqlalchemy.orm import Session
+
+from src.config import settings
+from src.database.postgres.core import make_session
+from src.utils.exceptions import handle_db_exceptions
+import src.students.accelerate.check_activity.service as service
+
+router = APIRouter()
+
+@router.post("", status_code=status.HTTP_200_OK)
+def check_all_students_activity(
+    db: Session = Depends(make_session),
+) -> Dict[str, Any]:
+    """Check and update activity for all active Accelerate students."""
+    try:
+        att_threshold = settings.activity_attendance_threshold_weeks
+        canvas_threshold = settings.activity_canvas_threshold_weeks
+        
+        results = service.check_all_students(db, att_threshold, canvas_threshold)
+        
+        if settings.app_env == "production":
+            results.pop("details", None)
+        
+        return results
+        
+    except Exception as exc:
+        handle_db_exceptions(db, exc)