From f55028d8d7d703f348190598d2fce93103070d17 Mon Sep 17 00:00:00 2001 From: Botond Hende Date: Sun, 1 Sep 2024 00:58:59 +0200 Subject: ship customization: renaming --- apirouters/tasks.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'apirouters/tasks.py') diff --git a/apirouters/tasks.py b/apirouters/tasks.py index 806de91..293ab52 100644 --- a/apirouters/tasks.py +++ b/apirouters/tasks.py @@ -1,8 +1,6 @@ from typing import Annotated from fastapi import APIRouter, Depends -from ..modules.database import cursor, conn -from ..modules.ships import Ship from ..modules import task_type from .agents import auth_agent, Agent @@ -12,9 +10,9 @@ router = APIRouter() @router.get("/tasks") async def get_tasks(agent: Annotated[Agent, Depends(auth_agent)]): ships = [] - for ship in agent.ships.values(): - ship.load_task() - ships.append({"symbol": ship.symbol, "task": ship.task}) + for current_ship in agent.ships.values(): + current_ship.load_task() + ships.append(current_ship.get_data()) return {"ships": ships} @@ -24,7 +22,7 @@ async def get_tasks(ship_symbol: str, agent: Annotated[Agent, Depends(auth_agent for current_ship in agent.ships.values(): if current_ship.symbol == ship_symbol: current_ship.load_task() - return {"symbol": current_ship.symbol, "task": current_ship.task} + return current_ship.get_data() return {"error": "Unknown ship symbol."} @@ -37,6 +35,7 @@ async def get_tasks(ship_symbol: str, task: str, agent: Annotated[Agent, Depends for current_ship in agent.ships.values(): if current_ship.symbol == ship_symbol: current_ship.set_task(task) - return {"symbol": current_ship.symbol, "task": current_ship.task} + return current_ship.get_data() return {"error": "Unknown ship symbol."} + -- cgit v1.2.3-70-g09d2