make it work with database

backend/src/subject/models.py

@@ -1,20 +1,18 @@
-from typing import Set
-
 from sqlalchemy import Column, ForeignKey, Table
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column
 from src.database import Base
 
 StudentSubject = Table(
     "student_subject",
     Base.metadata,
-    Column("student_id", ForeignKey("user.uid")),
+    Column("uid", ForeignKey("user.uid")),
     Column("subject_id", ForeignKey("subject.id")),
 )
 
 TeacherSubject = Table(
     "teacher_subject",
     Base.metadata,
-    Column("teacher_id", ForeignKey("user.uid")),
+    Column("uid", ForeignKey("user.uid")),
     Column("subject_id", ForeignKey("subject.id")),
 )
 

backend/src/subject/router.py

@@ -33,8 +33,8 @@ async def create_subject(subject: SubjectCreate, db: Session = Depends(get_db)):
 
 @router.delete("/{subject_id}",
                dependencies=[Depends(admin_user_validation)], status_code=200)
-async def delete_subject(subject: Subject = Depends(get_subject), db: Session = Depends(get_db)):
-    await service.delete_subject(db, subject)
+async def delete_subject(subject_id: int, db: Session = Depends(get_db)):
+    await service.delete_subject(db, subject_id)
     return "Successfully deleted"
 
 
@@ -59,6 +59,7 @@ async def get_subject_teachers(subject_id: int, db: Session = Depends(get_db)):
              status_code=201)
 async def create_subject_teacher(subject_id: int, user_id: str, db: Session = Depends(get_db)):
     await service.create_subject_teacher(db, subject_id, user_id)
+    return "Successfully added"
 
 
 @router.delete("/{subject_id}/teachers/{user_id}", dependencies=[Depends(user_permission_validation)])

backend/src/subject/service.py

@@ -11,10 +11,10 @@ async def get_subject(db: Session, subject_id: int) -> models.Subject:
 async def get_subjects(db: Session, user_id: str) -> tuple[Sequence[models.Subject],
                                                            Sequence[models.Subject]]:
     return (db.query(models.Subject).join(models.TeacherSubject).
-            filter(models.TeacherSubject.c.teacher_id == user_id).all(),
+            filter(models.TeacherSubject.c.uid == user_id).all(),
 
             db.query(models.Subject).join(models.StudentSubject).
-            filter(models.StudentSubject.c.student_id == user_id).all()
+            filter(models.StudentSubject.c.uid == user_id).all()
             )
 
 
@@ -34,18 +34,18 @@ async def create_subject(db: Session, subject: schemas.SubjectCreate) -> models.
 
 async def create_subject_teacher(db: Session, subject_id: int, user_id: str):
     insert_stmnt = models.TeacherSubject.insert().values(
-        subject_id=subject_id, teacher_id=user_id)
+        subject_id=subject_id, uid=user_id)
     db.execute(insert_stmnt)
     db.commit()
 
 
 async def delete_subject_teacher(db: Session, subject_id: int, user_id: str):
     db.query(models.TeacherSubject).filter_by(
-        subject_id=subject_id, teacher_id=user_id).delete()
+        subject_id=subject_id, uid=user_id).delete()
     db.commit()
 
 
-async def delete_subject(db: Session, subject: schemas.Subject):
+async def delete_subject(db: Session, subject_id: int):
     """Remove a subject"""
-    db.delete(subject)
+    db.query(models.Subject).filter_by(id=subject_id).delete()
     db.commit()