reformated some code
This commit is contained in:
@@ -14,7 +14,7 @@ from backend import db
|
||||
from backend.models.recorder_model import Recorder
|
||||
from backend.tools.scrape_rooms import scrape_rooms
|
||||
|
||||
logger = logging.getLogger("lrc."+__name__)
|
||||
logger = logging.getLogger("lrc." + __name__)
|
||||
|
||||
metadata = MetaData()
|
||||
|
||||
@@ -23,18 +23,19 @@ 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=False, nullable=False)
|
||||
alternate_name = db.Column(db.Unicode(127), unique=False, nullable=True, default=None)
|
||||
alternate_name = db.Column(
|
||||
db.Unicode(127), unique=False, nullable=True, default=None
|
||||
)
|
||||
comment = db.Column(db.Unicode(2047), unique=False, nullable=True, default="")
|
||||
number = db.Column(db.Unicode(63), unique=False, nullable=True)
|
||||
building_name = db.Column(db.Unicode(63), unique=False, nullable=True)
|
||||
building_number = db.Column(db.Unicode(63), unique=False, nullable=True)
|
||||
|
||||
recorder = db.relationship(Recorder, uselist=False, back_populates='room') # one-to-one relation (uselist=False)
|
||||
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'),
|
||||
)
|
||||
__table_args__ = (CheckConstraint("length(name) > 2", name="name_min_length"),)
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
db.Model.__init__(self, **kwargs)
|
||||
@@ -72,17 +73,24 @@ class Room(db.Model):
|
||||
return dict(id=self.id, name=self.name)
|
||||
|
||||
def toJSON(self):
|
||||
return json.dumps(self.to_dict(), default=lambda o: o.__dict__,
|
||||
sort_keys=True, indent=4)
|
||||
return json.dumps(
|
||||
self.to_dict(), default=lambda o: o.__dict__, sort_keys=True, indent=4
|
||||
)
|
||||
|
||||
|
||||
def pre_fill_table():
|
||||
rooms = scrape_rooms()
|
||||
logger.debug("tada")
|
||||
logger.debug("got {} rooms".format(len(rooms)))
|
||||
db_rooms = [Room(name=room['name'], number=room['room_number'],
|
||||
building_name=room['building_name'], building_number=room['building_number']) for room in
|
||||
rooms]
|
||||
db_rooms = [
|
||||
Room(
|
||||
name=room["name"],
|
||||
number=room["room_number"],
|
||||
building_name=room["building_name"],
|
||||
building_number=room["building_number"],
|
||||
)
|
||||
for room in rooms
|
||||
]
|
||||
|
||||
try:
|
||||
db.session.bulk_save_objects(db_rooms)
|
||||
|
||||
Reference in New Issue
Block a user