update env variables

Author: ganidande905

app/db/crud.py

@@ -1,16 +1,22 @@
+import os
+import json
+import gspread
 from typing import Optional
 from app.schemas.submission import SubmissionOut
-from sqlalchemy.orm import Session,joinedload
+from sqlalchemy.orm import Session
 from app.db import models
 from datetime import datetime, date, timedelta
 from sqlalchemy import func
 from app.db.db import SessionLocal
-import gspread
-from oauth2client.service_account import ServiceAccountCredentials
-import os
 
-SCOPE = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
-CREDS_FILE = "credentials.json"
+def _get_gspread_client():
+    creds_json_str = os.getenv("GOOGLE_CREDENTIALS_JSON")
+    if not creds_json_str:
+        raise ValueError("GOOGLE_CREDENTIALS_JSON environment variable is not set.")
+    
+    creds_info = json.loads(creds_json_str)
+    client = gspread.service_account_from_dict(creds_info)
+    return client
 
 def get_user_by_email(db: Session, email: str):
     return db.query(models.User).filter(models.User.email == email).first()
@@ -21,20 +27,17 @@ def get_task(db: Session, track_id: int, task_no: int):
 def submit_task(db: Session, mentee_id: int, task_id: int, reference_link: str, start_date: date, commit_hash: str):
     existing = db.query(models.Submission).filter_by(mentee_id=mentee_id, task_id=task_id).first()
     if existing:
-        return None  # Already submitted
+        return None
 
     mentee = db.query(models.User).filter(models.User.id == mentee_id).first()
-
     task = db.query(models.Task).filter(models.Task.id == task_id).first()
     if not task:
         raise Exception("Task not found")
 
-    # convert start_date into a datetime object
     start_date = datetime.combine(start_date, datetime.min.time()) 
     deadline = start_date + timedelta(days=task.deadline_days)
     submitted_at = datetime.now()
 
-    # Check if the submission is late
     if deadline >= submitted_at:
         submitted_late = False
     elif deadline + timedelta(hours=12) >= submitted_at:
@@ -52,35 +55,29 @@ def submit_task(db: Session, mentee_id: int, task_id: int, reference_link: str,
         status="submitted",
         start_date=start_date,
         submitted_late=submitted_late,
-        commit_hash = commit_hash
+        commit_hash=commit_hash
     )
 
-    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")
-        cell = sheet.find(mentee.name)
-        if not cell:
-            name_column = sheet.col_values(1)
-            row = len(name_column) + 1
-            sheet.update_cell(row, 1, mentee.name)
-            sheet.update_cell(row, task.task_no+2, commit_hash)
-        else:
-            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")
+    client = _get_gspread_client()
+    sheet_name = "Copy of Praveshan 2025 Master DB"
+    
+    if task.track_id == 1:
+        worksheet_name = "S1 Submissions"
+    elif task.track_id == 2:
+        worksheet_name = "S2 Submissions"
+    else:
+        worksheet_name = None
+
+    if worksheet_name:
+        sheet = client.open(sheet_name).worksheet(worksheet_name)
         cell = sheet.find(mentee.name)
         if not cell:
-            name_column = sheet.col_values(1)
-            row = len(name_column) + 1
+            row = len(sheet.col_values(1)) + 1
             sheet.update_cell(row, 1, mentee.name)
-            sheet.update_cell(row, task.task_no+2, commit_hash)
+            sheet.update_cell(row, task.task_no + 2, commit_hash)
         else:
             row = cell.row
-            sheet.update_cell(row, task.task_no+2, commit_hash)
-    
-    
+            sheet.update_cell(row, task.task_no + 2, commit_hash)
 
     db.add(submission)
     db.commit()
@@ -106,7 +103,6 @@ def is_mentor_of(db: Session, mentor_id: int, mentee_id: int):
     return db.query(models.MentorMenteeMap).filter_by(mentor_id=mentor_id, mentee_id=mentee_id).first() is not None
 
 def get_leaderboard_data(db: Session, track_id: int):
-
     return (
         db.query(
             models.User.name,
@@ -121,6 +117,7 @@ def get_leaderboard_data(db: Session, track_id: int):
         .order_by(func.sum(models.Task.points).desc())
         .all()
     )
+
 def get_otp_by_email(db, email):
     return db.query(models.OTP).filter(models.OTP.email == email).first()
 
@@ -134,7 +131,6 @@ def create_or_update_otp(db, email, otp, expires_at):
         db.add(entry)
     db.commit()
 
-
 def get_submissions_for_user(db: Session, email: str, track_id: Optional[int] = None) -> list[SubmissionOut]:
     user = db.query(models.User).filter(models.User.email == email).first()
     if not user:
@@ -167,9 +163,12 @@ 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
+    client = _get_gspread_client()
+    sheet_id = os.getenv("GOOGLE_SHEET_ID")
+    if not sheet_id:
+        raise ValueError("GOOGLE_SHEET_ID environment variable not set.")
+
+    worksheet = client.open_by_key(sheet_id).worksheet("Form Responses 1")
     expected_headers = ["Name", "Email Address"]
     data = worksheet.get_all_records(expected_headers=expected_headers)
     return data
@@ -178,7 +177,6 @@ def sync_users_from_sheet():
     db: Session = SessionLocal()
     try:
         rows = get_sheet_data() 
-        print(f"Loaded {len(rows)} rows from sheet.")
         inserted_count = 0
         for row in rows:
             email = row.get("Email Address", "").strip()
@@ -192,8 +190,5 @@ def sync_users_from_sheet():
             inserted_count += 1
 
         db.commit()
-        print(f"Inserted {inserted_count} new users.")
-    except Exception as e:
-        print(f"Error syncing users: {e}")
     finally:
         db.close()