Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 21f2428a7c | |||
| 809d3bedf9 | |||
| 694345e705 | |||
| 825ce5cb5c | |||
| 1fe7e3018f | |||
| 6e84ae35c2 | |||
| 254e6c8cd2 |
+2
-13
@@ -48,9 +48,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: int):
|
|||||||
try:
|
try:
|
||||||
# send already available data
|
# send already available data
|
||||||
r = processed_agent_data.select().order_by(processed_agent_data.c.timestamp)
|
r = processed_agent_data.select().order_by(processed_agent_data.c.timestamp)
|
||||||
session = SessionLocal()
|
stored_data = SessionLocal().execute(r).fetchall()
|
||||||
stored_data = session.execute(r).fetchall()
|
|
||||||
session.close()
|
|
||||||
|
|
||||||
jsonable_data = [{c.name: getattr(i, c.name) for c in processed_agent_data.columns} for i in stored_data]
|
jsonable_data = [{c.name: getattr(i, c.name) for c in processed_agent_data.columns} for i in stored_data]
|
||||||
for i in jsonable_data:
|
for i in jsonable_data:
|
||||||
@@ -200,12 +198,8 @@ def update_processed_agent_data(processed_agent_data_id: int, data: ProcessedAge
|
|||||||
session.commit()
|
session.commit()
|
||||||
|
|
||||||
updated_result = session.execute(query).fetchone()
|
updated_result = session.execute(query).fetchone()
|
||||||
return ProcessedAgentDataInDB(**updated_result._mapping)
|
|
||||||
|
|
||||||
except Exception as err:
|
return ProcessedAgentDataInDB(**updated_result._mapping)
|
||||||
session.rollback()
|
|
||||||
print(f"Database error: {err}")
|
|
||||||
raise HTTPException(status_code=500, detail="Internal Server Error")
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
session.close()
|
session.close()
|
||||||
@@ -237,11 +231,6 @@ def delete_processed_agent_data(processed_agent_data_id: int):
|
|||||||
|
|
||||||
return ProcessedAgentDataInDB(**result._mapping)
|
return ProcessedAgentDataInDB(**result._mapping)
|
||||||
|
|
||||||
except Exception as err:
|
|
||||||
session.rollback()
|
|
||||||
print(f"Database error: {err}")
|
|
||||||
raise HTTPException(status_code=500, detail="Internal Server Error")
|
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
session.close()
|
session.close()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user