dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GET ships no longer returns deleted ships

Browse Source
This commit is contained in:
Max Metz 2024-08-12 20:35:37 +02:00
parent 22009eb469
commit 0e8faf499d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/BreCal/api/ships.py
View File

@ -59,7 +59,7 @@ def PutShip():
user_data = check_jwt() user_data = check_jwt()
content = request.get_json(force=True) 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 # validate the request data & user permissions
InputValidationShip.evaluate_put_data(user_data, loadedModel, content) InputValidationShip.evaluate_put_data(user_data, loadedModel, content)

2
src/server/BreCal/impl/ships.py
View File

@ -17,7 +17,7 @@ def GetShips(token):
commands = pydapper.using(pooledConnection) commands = pydapper.using(pooledConnection)
# query = SQLQuery.get_ships() # query = SQLQuery.get_ships()
# data = commands.query(query, model=model.Ship) # 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'} return json.dumps(data, default=model.obj_dict), 200, {'Content-Type': 'application/json; charset=utf-8'}