feat: add track to users. modify: adjusted sync users function to add track based on groupName ('faction name' or 's2+')

Author: tejasai2007

alembic/versions/efcbeca45721_add_track_column_to_users.py

@@ -0,0 +1,29 @@
+"""add: track column to users
+
+Revision ID: efcbeca45721
+Revises: 40774b92ab4a
+Create Date: 2025-08-15 03:41:47.298109
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'efcbeca45721'
+down_revision: Union[str, None] = '40774b92ab4a'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    op.add_column('users', sa.Column('track', sa.Integer(), nullable=False ))
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    op.drop_column('users', 'track')
+    

app/db/crud.py

@@ -67,8 +67,9 @@ def submit_task(db: Session, mentee_id: int, task_id: int, start_date: date, com
         credentials = ServiceAccountCredentials.from_json_keyfile_name(CREDS_FILE, SCOPE)
         client = gspread.authorize(credentials)
         if(task.track_id == 1):
-            sheet = client.open("Copy of Praveshan 2025 Master DB").worksheet("S1 Submissions")
+            sheet = client.open("Copy of Praveshan 2025 Master DB").worksheet("Sheet16") # Change sheet name
             cell = sheet.find(mentee.name)
+            print(sheet)
             if not cell:
                 name_column = sheet.col_values(1)
                 row = len(name_column) + 1
@@ -78,7 +79,7 @@ def submit_task(db: Session, mentee_id: int, task_id: int, start_date: date, com
                 row = cell.row
                 sheet.update_cell(row, task.task_no+2, commit_hash)
         elif(task.track_id == 2):
-            sheet = client.open("Copy of Praveshan 2025 Master DB").worksheet("S2 Submissions")
+            sheet = client.open("Copy of Praveshan 2025 Master DB").worksheet("Sheet16") # Change sheet name
             cell = sheet.find(mentee.name)
             if not cell:
                 name_column = sheet.col_values(1)
@@ -179,8 +180,8 @@ def get_submissions_for_user(db: Session, email: str, track_id: Optional[int] =
 def get_sheet_data():
     creds = ServiceAccountCredentials.from_json_keyfile_name(CREDS_FILE, SCOPE)
     client = gspread.authorize(creds)
-    worksheet = client.open_by_key(os.getenv("GOOGLE_SHEET_ID")).worksheet("Praveshan Phase 3") # Change sheet name
-    expected_headers = ["Name", "Email Address"]
+    worksheet = client.open_by_key(os.getenv("GOOGLE_SHEET_ID")).worksheet("Sheet17") # Change sheet name
+    expected_headers = ["Name", "Email Address","Faction name"]
     data = worksheet.get_all_records(expected_headers=expected_headers)
     return data
 
@@ -191,13 +192,18 @@ def sync_users_from_sheet():
         print(f"Loaded {len(rows)} rows from sheet.")
         inserted_count = 0
         for row in rows:
+            Faction_name = row.get("Faction name", "")
             email = row.get("Email Address", "").strip()
             name = row.get("Name", "").strip()
             if not email or not name:
                 continue
             if get_user_by_email(db, email):
                 continue 
-            user = models.User(name=name, email=email, role="mentee")
+            if Faction_name=="S2+":
+                track = 2
+            else:
+                track=1
+            user = models.User(name=name, email=email, role="mentee",group_name=Faction_name ,track=track)
             db.add(user)
             inserted_count += 1
 
@@ -206,4 +212,5 @@ def sync_users_from_sheet():
     except Exception as e:
         print(f"Error syncing users: {e}")
     finally:
-        db.close()
+        db.close()
+

app/db/models.py

@@ -10,6 +10,7 @@ class User(Base):
     name = Column(String, nullable=False)
     role = Column(String, nullable=False)  # "mentor" or "mentee"
     group_name = Column(String, nullable=True)
+    track = Column(Integer, nullable=False)  # first year or s2+
 
 class Track(Base):
     __tablename__ = "tracks"