From a1589e75358558eada7ffc2efc7e3fa7160d233e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Mon, 25 Sep 2017 13:50:49 +0200 Subject: Reformat codebase and fix spelling errors --- opendc/api/v1/rooms/roomId/endpoint.py | 19 +++++++++++-------- opendc/api/v1/rooms/roomId/tiles/endpoint.py | 14 ++++++++------ 2 files changed, 19 insertions(+), 14 deletions(-) (limited to 'opendc/api/v1/rooms') diff --git a/opendc/api/v1/rooms/roomId/endpoint.py b/opendc/api/v1/rooms/roomId/endpoint.py index 6d7ab261..1dfc32cc 100644 --- a/opendc/api/v1/rooms/roomId/endpoint.py +++ b/opendc/api/v1/rooms/roomId/endpoint.py @@ -1,7 +1,8 @@ from opendc.models.room import Room -from opendc.util import database, exceptions +from opendc.util import exceptions from opendc.util.rest import Response + def GET(request): """Get this Room.""" @@ -9,7 +10,7 @@ def GET(request): try: request.check_required_parameters( - path = { + path={ 'roomId': 'int' } ) @@ -41,24 +42,25 @@ def GET(request): room.to_JSON() ) + def PUT(request): """Update this Room's name and type.""" # Make sure required parameters are there - + try: request.check_required_parameters( - path = { + path={ 'roomId': 'int' }, - body = { + body={ 'room': { 'name': 'string', 'roomType': 'string' } } ) - + except exceptions.ParameterError as e: return Response(400, e.message) @@ -94,6 +96,7 @@ def PUT(request): room.to_JSON() ) + def DELETE(request): """Delete this Room.""" @@ -101,7 +104,7 @@ def DELETE(request): try: request.check_required_parameters( - path = { + path={ 'roomId': 'int' } ) @@ -129,6 +132,6 @@ def DELETE(request): return Response( 200, - 'Sucessfully deleted {}.'.format(room), + 'Successfully deleted {}.'.format(room), room.to_JSON() ) diff --git a/opendc/api/v1/rooms/roomId/tiles/endpoint.py b/opendc/api/v1/rooms/roomId/tiles/endpoint.py index 9d17c644..a4ef51e7 100644 --- a/opendc/api/v1/rooms/roomId/tiles/endpoint.py +++ b/opendc/api/v1/rooms/roomId/tiles/endpoint.py @@ -1,8 +1,9 @@ -from opendc.models.tile import Tile from opendc.models.room import Room -from opendc.util import database, exceptions +from opendc.models.tile import Tile +from opendc.util import exceptions from opendc.util.rest import Response + def GET(request): """Get this Room's Tiles.""" @@ -10,7 +11,7 @@ def GET(request): try: request.check_required_parameters( - path = { + path={ 'roomId': 'int' } ) @@ -45,6 +46,7 @@ def GET(request): [x.to_JSON() for x in tiles] ) + def POST(request): """Add a Tile.""" @@ -52,10 +54,10 @@ def POST(request): try: request.check_required_parameters( - path = { + path={ 'roomId': 'int' }, - body = { + body={ 'tile': { 'roomId': 'int', 'positionX': 'int', @@ -104,7 +106,7 @@ def POST(request): if e.message == 'OccupiedTilePosition': return Response(409, 'Tile position occupied.') - + elif e.message == 'InvalidTilePosition': return Response(400, 'Invalid Tile position (new Tiles must neighbor existing Tiles).') -- cgit v1.2.3