From 7690a62ad492b2f5e6871693af99f88fe0745d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Tue, 25 Jun 2024 00:24:01 +0900 Subject: [PATCH] get_eventactions bugfix --- backend/app/db/crud.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/db/crud.py b/backend/app/db/crud.py index 7d8fc2d..54defa9 100644 --- a/backend/app/db/crud.py +++ b/backend/app/db/crud.py @@ -280,8 +280,8 @@ def get_events(db: Session): def get_eventactions(db: Session,eventid: str): #eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all() - blackactions = db.query(models.Action.id).join(models.EventAction,models.EventAction.actionid == models.Action.id and models.EventAction.eventid == eventid ) - eveactions = db.query(models.Action).filter(models.Action.id.notin_(blackactions)).all() + blackactions = db.query(models.Action.id).join(models.EventAction,and_(models.EventAction.actionid == models.Action.id,models.EventAction.eventid == eventid)).subquery() + eveactions = db.query(models.Action).filter(models.Action.id.notin_(blackactions)).order_by(models.Action.id).all() if not eveactions: raise HTTPException(status_code=404, detail="Data not found") return eveactions