Merge pull request #73 from Khushal928/praveshan

remove submitted_late, reference_link and resolve merge issues with alembic

Author: ganidande905

alembic/versions/b54e3fce90a9_create_initial_tables.py renamed to alembic/versions/40774b92ab4a_remove_reference_link_from_submissions.py

@@ -1,8 +1,8 @@
-"""Create initial tables
+"""remove reference_link from submissions
 
-Revision ID: b54e3fce90a9
-Revises: 12599f674ee9
-Create Date: 2025-08-02 00:29:32.968656
+Revision ID: 40774b92ab4a
+Revises: 8f84ff4de4af
+Create Date: 2025-08-05 09:27:59.401932
 
 """
 from typing import Sequence, Union
@@ -12,21 +12,21 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = 'b54e3fce90a9'
-down_revision: Union[str, None] = '12599f674ee9'
+revision: str = '40774b92ab4a'
+down_revision: Union[str, None] = '8f84ff4de4af'
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    pass
+    op.drop_column('submissions', 'reference_link')
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    pass
+    op.add_column('submissions', sa.Column('reference_link', sa.TEXT(), autoincrement=False, nullable=False))
     # ### end Alembic commands ###

alembic/versions/8f84ff4de4af_remove_submitted_late.py

@@ -0,0 +1,28 @@
+"""remove submitted_late
+
+Revision ID: 8f84ff4de4af
+Revises: 12599f674ee9
+Create Date: 2025-07-30 06:27:06.564253
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '8f84ff4de4af'
+down_revision: Union[str, None] = '12599f674ee9'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    op.drop_column('submissions', 'submitted_late')
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    op.add_column('your_table_name', sa.Column('submitted_late', sa.Boolean(), default=False))

app/db/crud.py

@@ -1,89 +1,86 @@
-import os
-import json
-import gspread
 from typing import Optional
 from app.schemas.submission import SubmissionOut
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session,joinedload
 from app.db import models
-from datetime import datetime, date, timedelta
+from datetime import date, timedelta
 from sqlalchemy import func
 from app.db.db import SessionLocal
+import gspread
+from oauth2client.service_account import ServiceAccountCredentials
+import os
 
-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
+SCOPE = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
+CREDS_FILE = "credentials.json"
 
 def get_user_by_email(db: Session, email: str):
     return db.query(models.User).filter(models.User.email == email).first()
 
 def get_task(db: Session, track_id: int, task_no: int):
     return db.query(models.Task).filter_by(track_id=track_id, task_no=task_no).first()
 
-def submit_task(db: Session, mentee_id: int, task_id: int, reference_link: str, start_date: date, commit_hash: str):
+def submit_task(db: Session, mentee_id: int, task_id: int, 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
+        return None  # Already submitted
 
     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")
 
-    start_date = datetime.combine(start_date, datetime.min.time()) 
+    # convert start_date into a datetime object
+    start_date = start_date
     deadline = start_date + timedelta(days=task.deadline_days)
-    submitted_at = datetime.now()
+    submitted_at = date.today()
 
+    # Check if the submission is late
     if deadline >= submitted_at:
-        submitted_late = False
-    elif deadline + timedelta(hours=12) >= submitted_at:
-        submitted_late = True
-    else:
-        return "late submission not allowed"
-
-    submission = models.Submission(
-        mentee_id=mentee_id,
-        task_id=task.id,
-        task_name=task.title,     
-        task_no=task.task_no,    
-        reference_link=reference_link,
-        submitted_at=date.today(),
-        status="submitted",
-        start_date=start_date,
-        submitted_late=submitted_late,
-        commit_hash=commit_hash
-    )
+        submission = models.Submission(
+            mentee_id=mentee_id,
+            task_id=task.id,
+            task_name=task.title,     
+            task_no=task.task_no,    
+            submitted_at=date.today(),
+            status="submitted",
+            start_date=start_date,
+            commit_hash = commit_hash
+        )
 
-    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"
+        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")
+            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)
+        
+        
+
+        db.add(submission)
+        db.commit()
+        db.refresh(submission)
+        
+        return submission
     else:
-        worksheet_name = None
-
-    if worksheet_name:
-        sheet = client.open(sheet_name).worksheet(worksheet_name)
-        cell = sheet.find(mentee.name)
-        if not cell:
-            row = len(sheet.col_values(1)) + 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)
-
-    db.add(submission)
-    db.commit()
-    db.refresh(submission)
-    
-    return submission
+        return "late submission not allowed"
 
 def approve_submission(db: Session, submission_id: int, mentor_feedback: str, status: str):
     sub = db.query(models.Submission).filter_by(id=submission_id).first()
@@ -103,6 +100,7 @@ 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,
@@ -117,7 +115,6 @@ 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()
 
@@ -131,6 +128,7 @@ 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:
@@ -152,7 +150,6 @@ def get_submissions_for_user(db: Session, email: str, track_id: Optional[int] =
             task_id=sub.task_id,
             task_name=sub.task_name,
             task_no=sub.task_no,
-            reference_link=sub.reference_link,
             status=sub.status,
             submitted_at=sub.submitted_at.date() if sub.submitted_at else None,
             approved_at=sub.approved_at.date() if sub.approved_at else None,
@@ -163,12 +160,9 @@ def get_submissions_for_user(db: Session, email: str, track_id: Optional[int] =
     ]
 
 def get_sheet_data():
-    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")
+    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"]
     data = worksheet.get_all_records(expected_headers=expected_headers)
     return data
@@ -177,6 +171,7 @@ 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()
@@ -190,5 +185,8 @@ 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()

app/db/models.py

@@ -40,13 +40,11 @@ class Submission(Base):
     task_id = Column(Integer, ForeignKey("tasks.id"), nullable=False)
     task_name = Column(String, nullable=False) 
     task_no = Column(Integer, nullable=False) 
-    reference_link = Column(Text, nullable=False)
     status = Column(String, default="submitted")  # submitted / approved / paused / rejected
     submitted_at = Column(DateTime, default=datetime.utcnow)
     start_date = Column(DateTime, nullable=False)
     approved_at = Column(DateTime, nullable=True)
     mentor_feedback = Column(Text, nullable=True)
-    submitted_late = Column(Boolean, default=False)
     mentee = relationship("User")
     task = relationship("Task")
     commit_hash = Column(String, nullable=False)

app/routes/progress.py

@@ -19,7 +19,7 @@ def submit_task(data: SubmissionCreate, db: Session = Depends(get_db)):
         raise HTTPException(status_code=404, detail="Task not found")
 
     # 3. Submit
-    submission = crud.submit_task(db, mentee_id=mentee.id, task_id=task.id, reference_link=data.reference_link, start_date=data.start_date, commit_hash=data.commit_hash)
+    submission = crud.submit_task(db, mentee_id=mentee.id, task_id=task.id, start_date=data.start_date, commit_hash=data.commit_hash)
     if not submission:
         raise HTTPException(status_code=400, detail="Task already submitted")
     if submission == "late submission not allowed":

app/schemas/submission.py

@@ -1,11 +1,10 @@
 from pydantic import BaseModel
 from typing import Optional
-from datetime import date,datetime
+from datetime import date
 
 class SubmissionBase(BaseModel):
     track_id: int
     task_no: int
-    reference_link: str
     start_date: date
 class SubmissionCreate(SubmissionBase):
     mentee_email: str
@@ -18,13 +17,11 @@ class SubmissionOut(BaseModel):
     task_id: int
     task_no: int
     task_name: str 
-    reference_link: str
     status: str
     submitted_at: date
     approved_at: Optional[date] = None
     mentor_feedback: Optional[str] = None   
     start_date: date
-    submitted_late: bool
     commit_hash: str
     class Config:
         orm_mode = True