diff options
Diffstat (limited to 'opendc/api/v2')
45 files changed, 96 insertions, 102 deletions
diff --git a/opendc/api/v2/datacenters/datacenterId/endpoint.py b/opendc/api/v2/datacenters/datacenterId/endpoint.py index 3265abb2..67fbfcd8 100644 --- a/opendc/api/v2/datacenters/datacenterId/endpoint.py +++ b/opendc/api/v2/datacenters/datacenterId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.datacenter import Datacenter +from opendc.models_old.datacenter import Datacenter from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/datacenters/datacenterId/rooms/endpoint.py b/opendc/api/v2/datacenters/datacenterId/rooms/endpoint.py index 593b38a7..96ee7028 100644 --- a/opendc/api/v2/datacenters/datacenterId/rooms/endpoint.py +++ b/opendc/api/v2/datacenters/datacenterId/rooms/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.datacenter import Datacenter -from opendc.models.room import Room +from opendc.models_old.datacenter import Datacenter +from opendc.models_old.room import Room from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/endpoint.py b/opendc/api/v2/experiments/experimentId/endpoint.py index 4ae4abf2..bc2b139e 100644 --- a/opendc/api/v2/experiments/experimentId/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.experiment import Experiment +from opendc.models_old.experiment import Experiment from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/last-simulated-tick/endpoint.py b/opendc/api/v2/experiments/experimentId/last-simulated-tick/endpoint.py index 554c03b5..3309502c 100644 --- a/opendc/api/v2/experiments/experimentId/last-simulated-tick/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/last-simulated-tick/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.experiment import Experiment +from opendc.models_old.experiment import Experiment from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/machine-states/endpoint.py b/opendc/api/v2/experiments/experimentId/machine-states/endpoint.py index e903e691..c7dcad9a 100644 --- a/opendc/api/v2/experiments/experimentId/machine-states/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/machine-states/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.machine_state import MachineState +from opendc.models_old.experiment import Experiment +from opendc.models_old.machine_state import MachineState from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/rack-states/endpoint.py b/opendc/api/v2/experiments/experimentId/rack-states/endpoint.py index a1841bf0..f3acf56a 100644 --- a/opendc/api/v2/experiments/experimentId/rack-states/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/rack-states/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.rack_state import RackState +from opendc.models_old.experiment import Experiment +from opendc.models_old.rack_state import RackState from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/room-states/endpoint.py b/opendc/api/v2/experiments/experimentId/room-states/endpoint.py index 19ecec22..db3f8b14 100644 --- a/opendc/api/v2/experiments/experimentId/room-states/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/room-states/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.room_state import RoomState +from opendc.models_old.experiment import Experiment +from opendc.models_old.room_state import RoomState from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/statistics/task-durations/endpoint.py b/opendc/api/v2/experiments/experimentId/statistics/task-durations/endpoint.py index 6bc0d4bd..498db239 100644 --- a/opendc/api/v2/experiments/experimentId/statistics/task-durations/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/statistics/task-durations/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.task_duration import TaskDuration +from opendc.models_old.experiment import Experiment +from opendc.models_old.task_duration import TaskDuration from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/experiments/experimentId/task-states/endpoint.py b/opendc/api/v2/experiments/experimentId/task-states/endpoint.py index b4d8a702..c0ae47fc 100644 --- a/opendc/api/v2/experiments/experimentId/task-states/endpoint.py +++ b/opendc/api/v2/experiments/experimentId/task-states/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.task_state import TaskState +from opendc.models_old.experiment import Experiment +from opendc.models_old.task_state import TaskState from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/jobs/jobId/endpoint.py b/opendc/api/v2/jobs/jobId/endpoint.py index 4dc43728..45eedf3f 100644 --- a/opendc/api/v2/jobs/jobId/endpoint.py +++ b/opendc/api/v2/jobs/jobId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.job import Job +from opendc.models_old.job import Job from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/jobs/jobId/tasks/endpoint.py b/opendc/api/v2/jobs/jobId/tasks/endpoint.py index f2cb3384..cae5ac90 100644 --- a/opendc/api/v2/jobs/jobId/tasks/endpoint.py +++ b/opendc/api/v2/jobs/jobId/tasks/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.job import Job -from opendc.models.task import Task +from opendc.models_old.job import Job +from opendc.models_old.task import Task from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/paths/pathId/branches/endpoint.py b/opendc/api/v2/paths/pathId/branches/endpoint.py index d3256e8c..6b0eebbd 100644 --- a/opendc/api/v2/paths/pathId/branches/endpoint.py +++ b/opendc/api/v2/paths/pathId/branches/endpoint.py @@ -1,13 +1,13 @@ from datetime import datetime -from opendc.models.datacenter import Datacenter -from opendc.models.machine import Machine -from opendc.models.object import Object -from opendc.models.path import Path -from opendc.models.rack import Rack -from opendc.models.room import Room -from opendc.models.section import Section -from opendc.models.tile import Tile +from opendc.models_old.datacenter import Datacenter +from opendc.models_old.machine import Machine +from opendc.models_old.object import Object +from opendc.models_old.path import Path +from opendc.models_old.rack import Rack +from opendc.models_old.room import Room +from opendc.models_old.section import Section +from opendc.models_old.tile import Tile from opendc.util import database, exceptions from opendc.util.rest import Request, Response diff --git a/opendc/api/v2/paths/pathId/endpoint.py b/opendc/api/v2/paths/pathId/endpoint.py index 42357fc5..a3348618 100644 --- a/opendc/api/v2/paths/pathId/endpoint.py +++ b/opendc/api/v2/paths/pathId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.path import Path +from opendc.models_old.path import Path from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/paths/pathId/sections/endpoint.py b/opendc/api/v2/paths/pathId/sections/endpoint.py index a983ff1f..8f3e270b 100644 --- a/opendc/api/v2/paths/pathId/sections/endpoint.py +++ b/opendc/api/v2/paths/pathId/sections/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.path import Path -from opendc.models.section import Section +from opendc.models_old.path import Path +from opendc.models_old.section import Section from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/room-types/endpoint.py b/opendc/api/v2/room-types/endpoint.py index 14675c86..71efc75d 100644 --- a/opendc/api/v2/room-types/endpoint.py +++ b/opendc/api/v2/room-types/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.room_type import RoomType +from opendc.models_old.room_type import RoomType from opendc.util.rest import Response diff --git a/opendc/api/v2/room-types/name/allowed-objects/endpoint.py b/opendc/api/v2/room-types/name/allowed-objects/endpoint.py index 166781e8..7b605c2b 100644 --- a/opendc/api/v2/room-types/name/allowed-objects/endpoint.py +++ b/opendc/api/v2/room-types/name/allowed-objects/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.allowed_object import AllowedObject +from opendc.models_old.allowed_object import AllowedObject from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/rooms/roomId/endpoint.py b/opendc/api/v2/rooms/roomId/endpoint.py index 90bcdfd6..663760aa 100644 --- a/opendc/api/v2/rooms/roomId/endpoint.py +++ b/opendc/api/v2/rooms/roomId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.room import Room +from opendc.models_old.room import Room from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/rooms/roomId/tiles/endpoint.py b/opendc/api/v2/rooms/roomId/tiles/endpoint.py index 971514ec..3385dd36 100644 --- a/opendc/api/v2/rooms/roomId/tiles/endpoint.py +++ b/opendc/api/v2/rooms/roomId/tiles/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.room import Room -from opendc.models.tile import Tile +from opendc.models_old.room import Room +from opendc.models_old.tile import Tile from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/schedulers/endpoint.py b/opendc/api/v2/schedulers/endpoint.py index 224ecfb8..4f3948a9 100644 --- a/opendc/api/v2/schedulers/endpoint.py +++ b/opendc/api/v2/schedulers/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.scheduler import Scheduler +from opendc.models_old.scheduler import Scheduler from opendc.util.rest import Response diff --git a/opendc/api/v2/sections/sectionId/endpoint.py b/opendc/api/v2/sections/sectionId/endpoint.py index 80e15328..58af44b5 100644 --- a/opendc/api/v2/sections/sectionId/endpoint.py +++ b/opendc/api/v2/sections/sectionId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.section import Section +from opendc.models_old.section import Section from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/endpoint.py b/opendc/api/v2/simulations/endpoint.py index 3eb7e903..7ef90e97 100644 --- a/opendc/api/v2/simulations/endpoint.py +++ b/opendc/api/v2/simulations/endpoint.py @@ -1,11 +1,11 @@ from datetime import datetime -from opendc.models.authorization import Authorization -from opendc.models.datacenter import Datacenter -from opendc.models.path import Path -from opendc.models.section import Section -from opendc.models.simulation import Simulation -from opendc.models.user import User +from opendc.models_old.authorization import Authorization +from opendc.models_old.datacenter import Datacenter +from opendc.models_old.path import Path +from opendc.models_old.section import Section +from opendc.models_old.simulation import Simulation +from opendc.models_old.user import User from opendc.util import database, exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py b/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py index b0a54524..bc1a7dc3 100644 --- a/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/authorizations/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.authorization import Authorization -from opendc.models.simulation import Simulation +from opendc.models_old.authorization import Authorization +from opendc.models_old.simulation import Simulation from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/authorizations/userId/endpoint.py b/opendc/api/v2/simulations/simulationId/authorizations/userId/endpoint.py index 19d13a65..d132b1dd 100644 --- a/opendc/api/v2/simulations/simulationId/authorizations/userId/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/authorizations/userId/endpoint.py @@ -1,6 +1,6 @@ -from opendc.models.authorization import Authorization -from opendc.models.simulation import Simulation -from opendc.models.user import User +from opendc.models_old.authorization import Authorization +from opendc.models_old.simulation import Simulation +from opendc.models_old.user import User from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/datacenters/endpoint.py b/opendc/api/v2/simulations/simulationId/datacenters/endpoint.py index c1d49228..dbef2e8f 100644 --- a/opendc/api/v2/simulations/simulationId/datacenters/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/datacenters/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.datacenter import Datacenter -from opendc.models.simulation import Simulation +from opendc.models_old.datacenter import Datacenter +from opendc.models_old.simulation import Simulation from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/endpoint.py b/opendc/api/v2/simulations/simulationId/endpoint.py index 4aa33c7a..09714560 100644 --- a/opendc/api/v2/simulations/simulationId/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/endpoint.py @@ -1,6 +1,6 @@ from datetime import datetime -from opendc.models.simulation import Simulation +from opendc.models_old.simulation import Simulation from opendc.util import database, exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/experiments/endpoint.py b/opendc/api/v2/simulations/simulationId/experiments/endpoint.py index 07305690..5ecaffb7 100644 --- a/opendc/api/v2/simulations/simulationId/experiments/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/experiments/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.experiment import Experiment -from opendc.models.simulation import Simulation +from opendc.models_old.experiment import Experiment +from opendc.models_old.simulation import Simulation from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/simulations/simulationId/paths/endpoint.py b/opendc/api/v2/simulations/simulationId/paths/endpoint.py index 69a302ba..4e4a1ec7 100644 --- a/opendc/api/v2/simulations/simulationId/paths/endpoint.py +++ b/opendc/api/v2/simulations/simulationId/paths/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.path import Path -from opendc.models.simulation import Simulation +from opendc.models_old.path import Path +from opendc.models_old.simulation import Simulation from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/cpus/endpoint.py b/opendc/api/v2/specifications/cpus/endpoint.py index 87975221..b2ec36f4 100644 --- a/opendc/api/v2/specifications/cpus/endpoint.py +++ b/opendc/api/v2/specifications/cpus/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.cpu import CPU +from opendc.models_old.cpu import CPU from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/cpus/id/endpoint.py b/opendc/api/v2/specifications/cpus/id/endpoint.py index 205b61c5..83cda92d 100644 --- a/opendc/api/v2/specifications/cpus/id/endpoint.py +++ b/opendc/api/v2/specifications/cpus/id/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.cpu import CPU +from opendc.models_old.cpu import CPU from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/failure-models/endpoint.py b/opendc/api/v2/specifications/failure-models/endpoint.py index 6397e27e..63807ed2 100644 --- a/opendc/api/v2/specifications/failure-models/endpoint.py +++ b/opendc/api/v2/specifications/failure-models/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.failure_model import FailureModel +from opendc.models_old.failure_model import FailureModel from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/failure-models/id/endpoint.py b/opendc/api/v2/specifications/failure-models/id/endpoint.py index db450f70..bfba4f16 100644 --- a/opendc/api/v2/specifications/failure-models/id/endpoint.py +++ b/opendc/api/v2/specifications/failure-models/id/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.failure_model import FailureModel +from opendc.models_old.failure_model import FailureModel from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/gpus/endpoint.py b/opendc/api/v2/specifications/gpus/endpoint.py index 24beb873..d536ba47 100644 --- a/opendc/api/v2/specifications/gpus/endpoint.py +++ b/opendc/api/v2/specifications/gpus/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.gpu import GPU +from opendc.models_old.gpu import GPU from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/gpus/id/endpoint.py b/opendc/api/v2/specifications/gpus/id/endpoint.py index 489b7e8d..9a0c0f75 100644 --- a/opendc/api/v2/specifications/gpus/id/endpoint.py +++ b/opendc/api/v2/specifications/gpus/id/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.gpu import GPU +from opendc.models_old.gpu import GPU from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/memories/endpoint.py b/opendc/api/v2/specifications/memories/endpoint.py index 95025418..7a8f6a7a 100644 --- a/opendc/api/v2/specifications/memories/endpoint.py +++ b/opendc/api/v2/specifications/memories/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.memory import Memory +from opendc.models_old.memory import Memory from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/memories/id/endpoint.py b/opendc/api/v2/specifications/memories/id/endpoint.py index f34ca36f..f8922833 100644 --- a/opendc/api/v2/specifications/memories/id/endpoint.py +++ b/opendc/api/v2/specifications/memories/id/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.memory import Memory +from opendc.models_old.memory import Memory from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/storages/endpoint.py b/opendc/api/v2/specifications/storages/endpoint.py index 945b89b2..20b9b794 100644 --- a/opendc/api/v2/specifications/storages/endpoint.py +++ b/opendc/api/v2/specifications/storages/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.storage import Storage +from opendc.models_old.storage import Storage from opendc.util.rest import Response diff --git a/opendc/api/v2/specifications/storages/id/endpoint.py b/opendc/api/v2/specifications/storages/id/endpoint.py index 1b7a5ac7..39c20fef 100644 --- a/opendc/api/v2/specifications/storages/id/endpoint.py +++ b/opendc/api/v2/specifications/storages/id/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.storage import Storage +from opendc.models_old.storage import Storage from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/tiles/tileId/endpoint.py b/opendc/api/v2/tiles/tileId/endpoint.py index 4a1a5447..e1efda77 100644 --- a/opendc/api/v2/tiles/tileId/endpoint.py +++ b/opendc/api/v2/tiles/tileId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.tile import Tile +from opendc.models_old.tile import Tile from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/tiles/tileId/rack/endpoint.py b/opendc/api/v2/tiles/tileId/rack/endpoint.py index 2a5803e4..b5c7fde6 100644 --- a/opendc/api/v2/tiles/tileId/rack/endpoint.py +++ b/opendc/api/v2/tiles/tileId/rack/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.rack import Rack -from opendc.models.tile import Tile +from opendc.models_old.rack import Rack +from opendc.models_old.tile import Tile from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py b/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py index 34d3866e..7980d676 100644 --- a/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py +++ b/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.machine import Machine -from opendc.models.rack import Rack +from opendc.models_old.machine import Machine +from opendc.models_old.rack import Rack from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py b/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py index 72fd44d5..dc598162 100644 --- a/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py +++ b/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.machine import Machine -from opendc.models.rack import Rack +from opendc.models_old.machine import Machine +from opendc.models_old.rack import Rack from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/traces/endpoint.py b/opendc/api/v2/traces/endpoint.py index 610be73e..58cc6153 100644 --- a/opendc/api/v2/traces/endpoint.py +++ b/opendc/api/v2/traces/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.trace import Trace +from opendc.models_old.trace import Trace from opendc.util.rest import Response diff --git a/opendc/api/v2/traces/traceId/endpoint.py b/opendc/api/v2/traces/traceId/endpoint.py index 720d3fd0..f6442a31 100644 --- a/opendc/api/v2/traces/traceId/endpoint.py +++ b/opendc/api/v2/traces/traceId/endpoint.py @@ -1,4 +1,4 @@ -from opendc.models.trace import Trace +from opendc.models_old.trace import Trace from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/traces/traceId/jobs/endpoint.py b/opendc/api/v2/traces/traceId/jobs/endpoint.py index eec52b56..af681b70 100644 --- a/opendc/api/v2/traces/traceId/jobs/endpoint.py +++ b/opendc/api/v2/traces/traceId/jobs/endpoint.py @@ -1,5 +1,5 @@ -from opendc.models.job import Job -from opendc.models.trace import Trace +from opendc.models_old.job import Job +from opendc.models_old.trace import Trace from opendc.util import exceptions from opendc.util.rest import Response diff --git a/opendc/api/v2/users/userId/endpoint.py b/opendc/api/v2/users/userId/endpoint.py index 6de26e64..9418f70a 100644 --- a/opendc/api/v2/users/userId/endpoint.py +++ b/opendc/api/v2/users/userId/endpoint.py @@ -1,5 +1,5 @@ +from opendc.models.user import User from opendc.util import exceptions -from opendc.util.database import DB from opendc.util.rest import Response @@ -11,12 +11,13 @@ def GET(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user = DB.fetch_one({'_id': request.params_path['userId']}, 'users') + user = User(request.params_path['userId']) - if user is None: - return Response(404, f'User with ID {request.params_path["userId"]} not found.') - - return Response(200, f'Successfully retrieved {user}.', user) + validation_error = user.validate() + if validation_error is None: + return Response(200, f'Successfully retrieved {user}.', user.obj) + else: + return validation_error def PUT(request): @@ -31,22 +32,18 @@ def PUT(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user_id = request.params_path['userId'] - user = DB.fetch_one({'_id': user_id}, 'users') - - if user is None: - return Response(404, f'User with ID {user_id} not found.') + user = User(request.params_path['userId']) - print(user['googleId'], request.google_id) - if user['googleId'] != request.google_id: - return Response(403, f'Forbidden from editing {user}.') + validation_error = user.validate(request.google_id) + if validation_error is not None: + return validation_error - user['givenName'] = request.params_body['user']['givenName'] - user['familyName'] = request.params_body['user']['familyName'] + user.set_property('givenName', request.params_body['user']['givenName']) + user.set_property('familyName', request.params_body['user']['familyName']) - DB.update(user_id, user, 'users') + user.update() - return Response(200, f'Successfully updated {user}.', user) + return Response(200, f'Successfully updated {user}.', user.obj) def DELETE(request): @@ -57,15 +54,12 @@ def DELETE(request): except exceptions.ParameterError as e: return Response(400, str(e)) - user_id = request.params_path['userId'] - user = DB.fetch_one({'_id': user_id}, 'users') - - if user is None: - return Response(404, f'User with ID {user_id} not found.') + user = User(request.params_path['userId']) - if user['googleId'] != request.google_id: - return Response(403, f'Forbidden from editing {user}.') + validation_error = user.validate(request.google_id) + if validation_error is not None: + return validation_error - DB.delete_one({'_id': user_id}, 'users') + user.delete() - return Response(200, f'Successfully deleted {user}.', user) + return Response(200, f'Successfully deleted {user}.', user.obj) |