added room and recorder api and added length check (for sqlite)

models/recorder_model.py

@@ -16,9 +16,9 @@ metadata = MetaData()
 
 # This is the association table for the many-to-many relationship between
 # groups and permissions.
-recorder_recorder_command_table = db.Table('recorder_recorder_command',
-                           db.Column('recorder_id', db.Integer,
-                                  db.ForeignKey('recorder.id',
+recorder_model_recorder_command_table = db.Table('recorder_model_recorder_command',
+                           db.Column('recorder_model_id', db.Integer,
+                                  db.ForeignKey('recorder_model.id',
                                              onupdate="CASCADE",
                                              ondelete="CASCADE"),
                                   primary_key=True),
@@ -29,13 +29,26 @@ recorder_recorder_command_table = db.Table('recorder_recorder_command',
                                   primary_key=True))
 
 
+class RecorderModel(db.Model):
+    id = db.Column(db.Integer, autoincrement=True, primary_key=True)
+    model_name = db.Column(db.Unicode(63), unique=True, nullable=False)
+    notes = db.Column(db.Unicode(255), unique=False, nullable=True, default=None)
+    recorder_commands = db.relationship('RecorderCommand', secondary=recorder_model_recorder_command_table,
+                                        back_populates='recorder_models')
+    recorders = db.relationship('Recorder', back_populates='recorder_model')
+
+
 class Recorder(db.Model):
     id = db.Column(db.Integer, autoincrement=True, primary_key=True)
     created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
     name = db.Column(db.Unicode(63), unique=True, nullable=False)
     description = db.Column(db.Unicode(255), unique=False, nullable=True, default="")
+    room_id = db.Column(db.Integer, db.ForeignKey('room.id'))
     room = db.relationship('Room', uselist=False, back_populates='recorder')  # one-to-one relation (uselist=False)
-    recorder_commands = db.relationship('RecorderCommand', secondary=recorder_recorder_command_table, back_populates='recorders')
+    ip = db.Column(db.String(15), unique=True, nullable=True, default=None)
+    network_name = db.Column(db.String(127), unique=True, nullable=True, default=None)
+    recorder_model_id = db.Column(db.Integer, db.ForeignKey('recorder_model.id'))
+    recorder_model = db.relationship('RecorderModel', back_populates='recorders')
 
     def __init__(self, **kwargs):
         super(Recorder, self).__init__(**kwargs)
@@ -56,7 +69,7 @@ class Recorder(db.Model):
         Return all groups
         :return:
         """
-        return Group.query.all()
+        return Recorder.query.all()
 
     def __str__(self):
         return self.name
@@ -73,6 +86,7 @@ class RecorderCommand(db.Model):
     """Table containing permissions associated with groups."""
     id = db.Column(db.Integer, autoincrement=True, primary_key=True)
     name = db.Column(db.Unicode(63), unique=True, nullable=False)
-    description = db.Column(db.Unicode(511))
-    recorders = db.relationship(Recorder, secondary=recorder_recorder_command_table,
+    description = db.Column(db.Unicode(511), nullable=True, default=None)
+    command = db.Column(db.String(2047), nullable=False)
+    recorder_models = db.relationship('RecorderModel', secondary=recorder_model_recorder_command_table,
                   back_populates='recorder_commands')

models/room_model.py

@@ -4,12 +4,13 @@ Models for lecture recorder
 """
 import json
 
-from sqlalchemy import MetaData
+from sqlalchemy import MetaData, CheckConstraint
 
 from backend import db, app, login_manager
 import re
 from sqlalchemy import or_
 from datetime import datetime, timedelta
+from backend.models.recorder_model import Recorder
 
 
 metadata = MetaData()
@@ -19,13 +20,21 @@ class Room(db.Model):
     id = db.Column(db.Integer, autoincrement=True, primary_key=True)
     created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
     name = db.Column(db.Unicode(127), unique=True, nullable=False)
+    alternate_name = db.Column(db.Unicode(127), unique=True, nullable=True, default=None)
+    comment = db.Column(db.Unicode(2047), unique=False, nullable=True, default="")
     number = db.Column(db.Unicode(63), unique=True, nullable=True)
-    description = db.Column(db.Unicode(255), unique=False, nullable=True, default="")
+
     recorder = db.relationship('Recorder', uselist=False, back_populates='room')  # one-to-one relation (uselist=False)
 
+    __table_args__ = (
+        CheckConstraint('length(name) > 2',
+                        name='name_min_length'),
+    )
+
     def __init__(self, **kwargs):
         super(Room, self).__init__(**kwargs)
 
+
     @staticmethod
     def get_by_name(name):
         """
@@ -52,12 +61,3 @@ class Room(db.Model):
     def toJSON(self):
         return json.dumps(self.to_dict(), default=lambda o: o.__dict__,
                           sort_keys=True, indent=4)
-
-
-class Permission(db.Model):
-    """Table containing permissions associated with groups."""
-    id = db.Column(db.Integer, autoincrement=True, primary_key=True)
-    name = db.Column(db.Unicode(63), unique=True, nullable=False)
-    description = db.Column(db.Unicode(511))
-    groups = db.relationship(Room, secondary=room_permission_table,
-                  back_populates='permissions')