Added delete_group_mission

api_schemas/nollning_schema.py

@@ -22,3 +22,8 @@ class NollningRead(NollningCreate):
 
 class NollningAddGroup(BaseSchema):
     group_id: int
+
+
+class NollningDeleteMission(BaseSchema):
+    group_id: int
+    mission_id: int

routes/nollning_router.py

@@ -1,9 +1,9 @@
 from fastapi import APIRouter
 from sqlalchemy import desc
-from api_schemas.nollning_schema import NollningCreate, NollningRead, NollningAddGroup
+from api_schemas.nollning_schema import NollningCreate, NollningRead, NollningAddGroup, NollningDeleteMission
 from database import DB_dependency
 from db_models.nollning_model import Nollning_DB
-from services.nollning_service import add_g_to_nollning, create_nollning, edit_nollning, remove_nollning
+from services.nollning_service import add_g_to_nollning, create_nollning, edit_nollning, remove_nollning, delete_group_m
 from user.permission import Permission
 
 nollning_router = APIRouter()
@@ -39,3 +39,12 @@ def delete_nollning(db: DB_dependency, id: int):
 )
 def add_group_to_nollning(db: DB_dependency, id: int, data: NollningAddGroup):
     return add_g_to_nollning(db, id, data)
+
+
+@nollning_router.delete(
+    "/delete_group_mission/{id}",
+    dependencies=[Permission.require("manage", "Nollning")],
+    response_model=NollningDeleteMission,
+)
+def delete_group_mission(db: DB_dependency, id: int, data: NollningDeleteMission):
+    return delete_group_m(db, id, data)

services/nollning_service.py

@@ -1,9 +1,10 @@
 from fastapi import HTTPException
 from sqlalchemy.orm import Session
-from api_schemas.nollning_schema import NollningAddGroup, NollningCreate
+from api_schemas.nollning_schema import NollningAddGroup, NollningCreate, NollningDeleteMission
 from db_models.group_model import Group_DB
 from db_models.nollning_group_model import NollningGroup_DB
 from db_models.nollning_model import Nollning_DB
+from db_models.group_mission_model import GroupMission_DB
 
 
 def create_nollning(db: Session, data: NollningCreate):
@@ -64,3 +65,21 @@ def add_g_to_nollning(db: Session, id: int, data: NollningAddGroup):
     db.refresh(nollning)
 
     return nollning
+
+
+def delete_group_m(db: Session, id: int, data: NollningDeleteMission):
+    adventure_mission = (
+        db.query(GroupMission_DB)
+        .filter(
+            GroupMission_DB.nollning_group_id == data.group_id, GroupMission_DB.adventure_mission_id == data.mission_id
+        )
+        .one_or_none()
+    )
+
+    if not adventure_mission:
+        raise HTTPException(404, detail=f"Adventure mission or group not found")
+
+    db.delete(adventure_mission)
+    db.commit()
+
+    return adventure_mission