alicorn-dev/KintoneAppBuilder
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eventaction テーブル変更　eventid(event.id->event.eventid)

Browse Source
This commit is contained in:
方 柏
2024-06-24 14:46:09 +09:00
parent 26a685b872
commit ded1222003
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/api/api_v1/routers/platform.py
View File

@@ -328,7 +328,7 @@ async def event_data(
@r.get( @r.get(
"/eventactions/{eventid}", "/eventactions",
response_model=t.List[Action], response_model=t.List[Action],
response_model_exclude={"id"}, response_model_exclude={"id"},
response_model_exclude_none=True, response_model_exclude_none=True,

3
backend/app/db/crud.py
View File

@@ -280,7 +280,8 @@ def get_events(db: Session):
def get_eventactions(db: Session,eventid: str): 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 ).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: if not eveactions:
raise HTTPException(status_code=404, detail="Data not found") raise HTTPException(status_code=404, detail="Data not found")
return eveactions return eveactions

2
backend/app/db/models.py
View File

@@ -90,7 +90,7 @@ class Event(Base):
class EventAction(Base): class EventAction(Base):
__tablename__ = "eventaction" __tablename__ = "eventaction"
eventid = Column(Integer,ForeignKey("event.id")) eventid = Column(String(100),ForeignKey("event.eventid"))
actionid = Column(Integer,ForeignKey("action.id")) actionid = Column(Integer,ForeignKey("action.id"))