From 0e8faf499d9bd7b6f4fb2a6342edea8aae4c9c9b Mon Sep 17 00:00:00 2001 From: Max Metz Date: Mon, 12 Aug 2024 20:35:37 +0200 Subject: [PATCH] GET ships no longer returns deleted ships --- src/server/BreCal/api/ships.py | 2 +- src/server/BreCal/impl/ships.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/BreCal/api/ships.py b/src/server/BreCal/api/ships.py index d968476..8690a5c 100644 --- a/src/server/BreCal/api/ships.py +++ b/src/server/BreCal/api/ships.py @@ -59,7 +59,7 @@ def PutShip(): user_data = check_jwt() content = request.get_json(force=True) - loadedModel = model.Ship().load(data=content, many=False, partial=True, unknown=EXCLUDE) + loadedModel = model.ShipSchema().load(data=content, many=False, partial=True, unknown=EXCLUDE) # validate the request data & user permissions InputValidationShip.evaluate_put_data(user_data, loadedModel, content) diff --git a/src/server/BreCal/impl/ships.py b/src/server/BreCal/impl/ships.py index 0733071..0fda7fd 100644 --- a/src/server/BreCal/impl/ships.py +++ b/src/server/BreCal/impl/ships.py @@ -17,7 +17,7 @@ def GetShips(token): commands = pydapper.using(pooledConnection) # query = SQLQuery.get_ships() # data = commands.query(query, model=model.Ship) - data = commands.query("SELECT id, name, imo, callsign, participant_id, length, width, is_tug, bollard_pull, eni, created, modified, deleted FROM ship ORDER BY name", model=model.Ship) + data = commands.query("SELECT id, name, imo, callsign, participant_id, length, width, is_tug, bollard_pull, eni, created, modified, deleted FROM ship WHERE deleted=0 ORDER BY name", model=model.Ship) return json.dumps(data, default=model.obj_dict), 200, {'Content-Type': 'application/json; charset=utf-8'}