yaro/inventory
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardize column names in RoomFunction and Room models for consistency

Browse source
This commit is contained in:
Yaro Kasear 2025-07-09 11:49:18 -05:00
parent f7fae7dc9b
commit b6b4979034
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/models/room_functions.py
View file

@ -13,8 +13,8 @@ class RoomFunction(ValidatableMixin, db.Model):
__tablename__ = 'Room Functions' __tablename__ = 'Room Functions'
VALIDATION_LABEL = "Function" VALIDATION_LABEL = "Function"
id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True)
description: Mapped[Optional[str]] = mapped_column("Function", Unicode(255), nullable=True) description: Mapped[Optional[str]] = mapped_column(Unicode(255), nullable=True)
rooms: Mapped[List['Room']] = relationship('Room', back_populates='room_function') rooms: Mapped[List['Room']] = relationship('Room', back_populates='room_function')

2
inventory/models/rooms.py
View file

@ -19,7 +19,7 @@ class Room(ValidatableMixin, db.Model):
id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) 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) name: Mapped[Optional[str]] = mapped_column("Room", Unicode(255), nullable=True)
area_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Areas.id")) 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') area: Mapped[Optional['Area']] = relationship('Area', back_populates='rooms')
room_function: Mapped[Optional['RoomFunction']] = relationship('RoomFunction', back_populates='rooms') room_function: Mapped[Optional['RoomFunction']] = relationship('RoomFunction', back_populates='rooms')