Subteams: Fixing issue with getSubteamsByGroup + minor fixes in subteams code

Author: ainagomila

backend/api/routes/subteams.py

@@ -8,15 +8,15 @@
 subteam_router = APIRouter()
 
 #### GET Requests ####
-@subteam_router.get("/", response_model=list[SubTeam])
+@subteam_router.get("/")
 async def get_subteams():
     subteams = subteams_serial(subteams_collection.find())
     #return {"data":subteams}
     return subteams
 
 
     # get subteams within a project
-@subteam_router.get("/getSubteamsByGroup", response_model=list[SubTeam])
+@subteam_router.get("/getSubteamsByGroup")
 async def get_subteams_by_group(request: GetSubteamsByGroupRequest):
     group_id = request.group_id
     # Validate group ID
@@ -28,7 +28,7 @@ async def get_subteams_by_group(request: GetSubteamsByGroupRequest):
 
 
     # get all task for a subteam
-@subteam_router.get("/getTasksBySubteam", response_model=list[Task])
+@subteam_router.get("/getTasksBySubteam")
 async def get_tasks_by_subteam(request: GetTasksBySubteamRequest):
     team_name = request.team_name
     # Check if subteam exists
@@ -47,7 +47,7 @@ async def get_tasks_by_subteam(request: GetTasksBySubteamRequest):
     return {"data": {"subteam": team_name, "tasks": tasks}}
 
 #### POST Requests ####
-@subteam_router.post("/createSubteam", response_model=SubTeam, status_code=status.HTTP_201_CREATED)
+@subteam_router.post("/createSubteam", status_code=status.HTTP_201_CREATED)
 async def create_subteam(request : CreateSubteamRequest):
     # Check if team_name already exists
     if subteams_collection.find_one({"team_name": request.team_name}):
@@ -87,14 +87,15 @@ async def create_subteam(request : CreateSubteamRequest):
     inserted_subteam = subteams_collection.insert_one(newSubTeam)
     # created_subteam = subteams_collection.find_one({"team_name": request.team_name})
     newSubTeam["_id"] = str(inserted_subteam.inserted_id)
+    newSubTeam["group"] = str(newSubTeam["group"])
 
     # add subteam id to the groups' "subteams" field
-    updated_group = groups_collection.find_one_and_update(
-        {"_id": ObjectId(request.group)}, # find by group id
-        {"$addToSet": {"subteams": inserted_subteam.inserted_id}}, 
-        return_document=True)
+    # groups_collection.find_one_and_update(
+    #     {"_id": request.group}, # find by group id
+    #     {"$addToSet": {"subteams": inserted_subteam.inserted_id}}, 
+    #     return_document=True)
 
-    return {"message": "Subteam created successfully", "data": {newSubTeam}}
+    return {"message": "Subteam created successfully", "data":newSubTeam}
 
 #### DELETE Requests ####
 @subteam_router.delete("/deleteSubteam",  status_code=status.HTTP_201_CREATED)

backend/db/models.py

@@ -47,7 +47,7 @@ class SubTeam(BaseModel): #_id as Primary key, automatically created, can be fou
     id: Optional[str] = Field(alias="_id", default=None)
     team_name: str 
     members: List[str]  # List of Foreign Keys referencing User.email
-    tasks: List[str] # List of Foreign Keys referencing Task.id
+    tasks: Optional[List[str]] = None # List of Foreign Keys referencing Task.id
     group: str # Foreign Key referencing Group.id
 
 

backend/db/schemas.py

@@ -66,12 +66,12 @@ def _task_serial(task: dict) -> Task:
     }
 
 def _subteam_serial(subteam: dict) -> SubTeam:
-    return {
-        "team_name": subteam["team_name"],
-        "members": subteam["members"],
-        "tasks": subteam["tasks"],
-        "group": str(subteam["group"])
-    }
+    return SubTeam(  # Use the SubTeam model
+        team_name=subteam["team_name"],
+        members=subteam["members"],  # Assuming these are already emails or strings
+        tasks=[str(task_id) for task_id in subteam.get("tasks", [])],  # Convert ObjectId to str
+        group=str(subteam["group"])  # Convert group ObjectId to str
+    )
 
 def _notification_serial(notification: dict) -> Notification:
     return Notification(

backend/main.py

@@ -7,6 +7,7 @@
 from api.routes.files import files_router
 from api.routes.chat import chat_router
 from api.routes.notifications import notifications_router
+from api.routes.subteams import subteam_router
 from fastapi.middleware.cors import CORSMiddleware
 import logging
 import os
@@ -52,6 +53,7 @@
 app.include_router(chat_router, tags=["Chat"])
 app.include_router(tasks_router, prefix="/api", tags=["Task Comments"])
 app.include_router(notifications_router, prefix="/api/notifications", tags=["Notifications"])
+app.include_router(subteam_router, prefix="/api/subteams", tags=["Subteams"])
 
 if __name__ == "__main__":
     port = int(os.getenv("PORT", 8000))