two changes this commit: update sqlalchemy to conform better to sqlalchemy 2.0 and add project update (untested) capabilities

Author: thesleepyniko

api/auth/main.py

@@ -184,6 +184,7 @@ async def is_user_authenticated(request: Request) -> dict:
         ):
             raise HTTPException(status_code=401)
     # TODO: add email verification implementation once postgres is set up
+    # i think the above is checking that the user is still valid
     except Exception as e:
         raise HTTPException(status_code=401) from e
     return decoded_jwt

api/projects/main.py

@@ -8,6 +8,7 @@
 import sqlalchemy
 from fastapi import APIRouter, Depends, HTTPException, Request
 from pydantic import BaseModel
+from typing import Optional, Any, List
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 
@@ -21,6 +22,15 @@ class CreateProjectRequest(BaseModel):
 
     project_name: str
 
+class updateProjectRequest(BaseModel):
+    "Update project request from client"
+    
+    project_id: int
+    project_name: Optional[str] = None
+    hackatime_projects: Optional[List[str]] = None
+
+    class Config:
+        extra = "forbid"  
 
 router = APIRouter()
 
@@ -29,10 +39,40 @@ class CreateProjectRequest(BaseModel):
 
 
 # @protect
-async def update_project():
+@router.post("/api/projects/update")
+async def update_project(
+    request: Request,
+    project_request: updateProjectRequest,
+    session: AsyncSession = Depends(get_db)
+):
     """Update project details"""
-    # TODO: implement update project functionality
 
+    user_email = request.state.user["sub"]
+
+    project_raw = await session.execute(
+        sqlalchemy.select(UserProject).where(
+            UserProject.id == project_request.project_id,
+            UserProject.user_email == user_email
+        )
+        
+    )
+
+    project = project_raw.scalar_one_or_none()
+
+    if project is None:
+        raise HTTPException(
+            status_code=500
+        ) # if you get this good on you lmao
+    
+    update_data = project_request.model_dump(exclude_unset=True, exclude={"project_id"})
+
+    for field, value in update_data.items():
+        setattr(project, field, value)
+
+    await session.commit()
+    await session.refresh(project)
+
+    return {"success": True}
 
 @router.get("/api/projects")
 @require_auth
@@ -77,26 +117,11 @@ async def create_project(
         user_email=user_email,
         hackatime_projects=[],
         hackatime_total_hours=0.0,
-        last_updated=datetime.datetime.now(datetime.timezone.utc),
+        # last_updated=datetime.datetime.now(datetime.timezone.utc), this should no longer need manual setting
     )
 
     session.add(new_project)
     await session.commit()
     await session.refresh(new_project)
 
     return {"success": True}
-
-
-# async def run():
-#     conn = await asyncpg.connect(user='user', password='password',
-#                                  database='database', host='127.0.0.1')
-#     values = await conn.fetch(
-#         'SELECT * FROM mytable WHERE id = $1',
-#         10,
-#     )
-#     await conn.close()
-
-# asyncio.run(run())
-
-# def foo():
-#     return "abc"

models/user.py

@@ -13,7 +13,7 @@
     SmallInteger,
     String,
 )
-from sqlalchemy.orm import declarative_base, relationship
+from sqlalchemy.orm import declarative_base, relationship, Mapped, MappedColumn
 
 Base = declarative_base()
 
@@ -23,10 +23,10 @@ class User(Base):
 
     __tablename__ = "users"
 
-    id = Column(Integer, autoincrement=True, primary_key=True, unique=True)
-    email = Column(String, nullable=False, unique=True)
-    permissions = Column(ARRAY(SmallInteger), nullable=False, server_default="{}")
-    projects = relationship(
+    id: Mapped[int] = MappedColumn(Integer, autoincrement=True, primary_key=True, unique=True)
+    email: Mapped[str] = MappedColumn(String, nullable=False, unique=True)
+    permissions: Mapped[list[int]] = MappedColumn(ARRAY(SmallInteger), nullable=False, server_default="{}")
+    projects: Mapped[list["UserProject"]] = relationship(
         "UserProject", back_populates="user", cascade="all, delete-orphan"
     )
 
@@ -36,20 +36,18 @@ class UserProject(Base):
 
     __tablename__ = "projects"
 
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    name = Column(String, nullable=False)
-    user_email = Column(String, ForeignKey("users.email"), nullable=False)
-    hackatime_projects = Column(JSON, nullable=False, default=list)
-    hackatime_total_hours = Column(Float, nullable=False, default=0.0)
-    last_updated = Column(
+    id: Mapped[int] = MappedColumn(Integer, primary_key=True, autoincrement=True)
+    name: Mapped[str] = MappedColumn(String, nullable=False)
+    user_email: Mapped[str] = MappedColumn(String, ForeignKey("users.email"), nullable=False)
+    hackatime_projects: Mapped[list[str]] = MappedColumn(JSON, nullable=False, default=list)
+    hackatime_total_hours: Mapped[float] = MappedColumn(Float, nullable=False, default=0.0)
+    last_updated: Mapped[DateTime] = MappedColumn(
         DateTime(timezone=True),
         nullable=False,
         default=lambda: datetime.now(timezone.utc),
+        onupdate=lambda: datetime.now(timezone.utc),
     )
 
     # Relationship back to user
-    user = relationship("User", back_populates="projects")
+    user: Mapped["User"] = relationship("User", back_populates="projects")
 
-
-# class UserProject(Base):
-#     id = Column(String, primary_key=True)