diff --git a/inventory/models/room_functions.py b/inventory/models/room_functions.py index b8a4caa..f8bbc31 100644 --- a/inventory/models/room_functions.py +++ b/inventory/models/room_functions.py @@ -13,8 +13,8 @@ class RoomFunction(ValidatableMixin, db.Model): __tablename__ = 'Room Functions' VALIDATION_LABEL = "Function" - id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) - description: Mapped[Optional[str]] = mapped_column("Function", Unicode(255), nullable=True) + id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True) + description: Mapped[Optional[str]] = mapped_column(Unicode(255), nullable=True) rooms: Mapped[List['Room']] = relationship('Room', back_populates='room_function') diff --git a/inventory/models/rooms.py b/inventory/models/rooms.py index 12488e1..6e8b278 100644 --- a/inventory/models/rooms.py +++ b/inventory/models/rooms.py @@ -19,7 +19,7 @@ class Room(ValidatableMixin, db.Model): id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) name: Mapped[Optional[str]] = mapped_column("Room", Unicode(255), nullable=True) area_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Areas.id")) - function_id: Mapped[Optional[int]] = mapped_column("Function", Integer, ForeignKey("Room Functions.ID")) + function_id: Mapped[Optional[int]] = mapped_column("Function", Integer, ForeignKey("Room Functions.id")) area: Mapped[Optional['Area']] = relationship('Area', back_populates='rooms') room_function: Mapped[Optional['RoomFunction']] = relationship('RoomFunction', back_populates='rooms')