fixed and extended apis

api/recorder_api.py

@@ -8,25 +8,30 @@ Login through API does not start a new session, but instead returns JWT.
 from flask_jwt_extended import jwt_required
 from flask_restplus import fields, Resource
 
-from backend import db
+from backend import db, app
 from backend.api import api_recorder
 from backend.models.recorder_model import Recorder, RecorderModel, RecorderCommand
+from backend.models.room_model import Room
 
 recorder_model = api_recorder.model('Recorder', {
     'id': fields.String(required=False, description='The recorder\'s identifier'),
     'created_at': fields.DateTime(required=False, description='Creation date of the recorder'),
-    'name': fields.String(required=True, description='The recorder\'s name'),
+    'name': fields.String(min_length=3, required=True, description='The recorder\'s name'),
     'description': fields.String(required=False, description='The recorder\'s description'),
     'ip': fields.String(required=False, description='The recorder\'s IP address'),
     'network_name': fields.String(required=False, description='The recorder\'s network name'),
     'recorder_model': fields.Nested(api_recorder.model('recorder_model',
                                                        {'id': fields.Integer(), 'name': fields.String()}),
                                     required=False,
+                                    allow_null=True,
+                                    skip_none=False,
                                     description='Model of the recorder.'),
     'room': fields.Nested(api_recorder.model('recorder_room',
                                              {'id': fields.Integer(), 'name': fields.String(),
                                               'number': fields.String(), 'alternate_name': fields.String()}),
                           required=False,
+                          allow_null=True,
+                          skip_none=False,
                           description='Room in which the recorder is located.')
 })
 
@@ -39,7 +44,7 @@ recorder_model = api_recorder.model('Recorder', {
 class RecorderResource(Resource):
     @jwt_required
     @api_recorder.doc('get_recorder')
-    @api_recorder.marshal_with(recorder_model)
+    @api_recorder.marshal_with(recorder_model, skip_none=False)
     def get(self, id):
         """Fetch a recorder given its identifier"""
         recorder = Recorder.query.get(id)
@@ -62,7 +67,6 @@ class RecorderResource(Resource):
     @jwt_required
     @api_recorder.doc('update_recorder')
     @api_recorder.expect(recorder_model)
-    @api_recorder.marshal_with(recorder_model)
     def put(self, id):
         """Update a recorder given its identifier"""
         num_rows_matched = Recorder.query.filter_by(id=id).update(api_recorder.payload)
@@ -72,12 +76,11 @@ class RecorderResource(Resource):
         return "ok"
 
 
-
 @api_recorder.route('')
 class RecorderList(Resource):
     @jwt_required
     @api_recorder.doc('recorders')
-    @api_recorder.marshal_list_with(recorder_model)
+    @api_recorder.marshal_list_with(recorder_model, skip_none=False)
     def get(self):
         """
         List all recorders
@@ -88,8 +91,26 @@ class RecorderList(Resource):
     @jwt_required
     @api_recorder.doc('create_recorder')
     @api_recorder.expect(recorder_model)
-    @api_recorder.marshal_with(recorder_model, code=201)
+    @api_recorder.marshal_with(recorder_model, skip_none=False, code=201)
     def post(self):
+        if "room_id" in api_recorder.payload:
+            if api_recorder.payload["room_id"] is None:
+                api_recorder.payload["room"] = None
+            else:
+                room = Room.query.get(api_recorder.payload["room_id"])
+                if room is not None:
+                    api_recorder.payload["room"] = room
+                else:
+                    return "specified room (id: {}) does not exist!".format(api_recorder.payload["room_id"]), 404
+        if "recorder_model_id" in api_recorder.payload:
+            if api_recorder.payload["recorder_model_id"] is None:
+                api_recorder.payload["recorder_model"] = None
+            else:
+                rec_model = RecorderModel.query.get(api_recorder.payload["recorder_model_id"])
+                if rec_model is not None:
+                    api_recorder.payload["recorder_model"] = rec_model
+                else:
+                    return "specified recorder model (id: {}) does not exist!".format(api_recorder.payload["recorder_model_id"]), 404
         recorder = Recorder(**api_recorder.payload)
         db.session.add(recorder)
         db.session.commit()
@@ -172,6 +193,15 @@ class RecorderModelList(Resource):
     @api_recorder.expect(recorder_model_model)
     @api_recorder.marshal_with(recorder_model_model, code=201)
     def post(self):
+        if "recorders" in api_recorder.payload:
+            if api_recorder.payload["recorders"] is None or len(api_recorder.payload["recorders"]) < 1 :
+                api_recorder.payload["recorders"] = []
+            else:
+                rec_model = RecorderModel.query.get(api_recorder.payload["recorder_model_id"])
+                if rec_model is not None:
+                    api_recorder.payload["recorder_model"] = rec_model
+                else:
+                    return "specified recorder model (id: {}) does not exist!".format(api_recorder.payload["recorder_model_id"]), 404
         recorder = Recorder(**api_recorder.payload)
         db.session.add(recorder)
         db.session.commit()