From ded12220038bf1daa713805e6cc2ebe267d53482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Mon, 24 Jun 2024 14:46:09 +0900 Subject: [PATCH] =?UTF-8?q?eventaction=20=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E5=A4=89=E6=9B=B4=E3=80=80eventid(event.id->event.eve?= =?UTF-8?q?ntid)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/api_v1/routers/platform.py | 2 +- backend/app/db/crud.py | 3 ++- backend/app/db/models.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/app/api/api_v1/routers/platform.py b/backend/app/api/api_v1/routers/platform.py index 0a3e421..f199563 100644 --- a/backend/app/api/api_v1/routers/platform.py +++ b/backend/app/api/api_v1/routers/platform.py @@ -328,7 +328,7 @@ async def event_data( @r.get( - "/eventactions/{eventid}", + "/eventactions", response_model=t.List[Action], response_model_exclude={"id"}, response_model_exclude_none=True, diff --git a/backend/app/db/crud.py b/backend/app/db/crud.py index 9250a54..7d8fc2d 100644 --- a/backend/app/db/crud.py +++ b/backend/app/db/crud.py @@ -280,7 +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() - eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid != models.Action.id and models.EventAction.eventid == eventid ).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() if not eveactions: raise HTTPException(status_code=404, detail="Data not found") return eveactions diff --git a/backend/app/db/models.py b/backend/app/db/models.py index c0876d5..bbc789e 100644 --- a/backend/app/db/models.py +++ b/backend/app/db/models.py @@ -90,7 +90,7 @@ class Event(Base): class EventAction(Base): __tablename__ = "eventaction" - eventid = Column(Integer,ForeignKey("event.id")) + eventid = Column(String(100),ForeignKey("event.eventid")) actionid = Column(Integer,ForeignKey("action.id"))