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

Standardize foreign key references for case consistency in inventory and user models

Browse source
This commit is contained in:
Yaro Kasear 2025-07-09 12:05:23 -05:00
parent b6b4979034
commit b0927680b9
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/models/inventory.py
View file

@ -28,7 +28,7 @@ class Inventory(db.Model):
owner_id = mapped_column(Integer, ForeignKey('Users.ID')) owner_id = mapped_column(Integer, ForeignKey('Users.ID'))
brand_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Brands.id")) brand_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Brands.id"))
# Photo: Mapped[Optional[str]] = mapped_column(String(8000)) Will be replacing with something that actually works. # Photo: Mapped[Optional[str]] = mapped_column(String(8000)) Will be replacing with something that actually works.
location_id: Mapped[Optional[str]] = mapped_column(ForeignKey("Rooms.ID")) location_id: Mapped[Optional[str]] = mapped_column(ForeignKey("Rooms.id"))
barcode: Mapped[Optional[str]] = mapped_column(Unicode(255)) barcode: Mapped[Optional[str]] = mapped_column(Unicode(255))
shared: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) shared: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))'))

6
inventory/models/rooms.py
View file

@ -16,10 +16,10 @@ class Room(ValidatableMixin, db.Model):
__tablename__ = 'Rooms' __tablename__ = 'Rooms'
VALIDATION_LABEL = "Room" VALIDATION_LABEL = "Room"
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)
name: Mapped[Optional[str]] = mapped_column("Room", Unicode(255), nullable=True) name: Mapped[Optional[str]] = mapped_column(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(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')

2
inventory/models/users.py
View file

@ -17,7 +17,7 @@ class User(db.Model):
active: Mapped[Optional[bool]] = mapped_column("Active", Boolean, server_default=text('((0))')) active: Mapped[Optional[bool]] = mapped_column("Active", Boolean, server_default=text('((0))'))
last_name: Mapped[Optional[str]] = mapped_column("Last", Unicode(255), nullable=True) last_name: Mapped[Optional[str]] = mapped_column("Last", Unicode(255), nullable=True)
first_name: Mapped[Optional[str]] = mapped_column("First", Unicode(255), nullable=True) first_name: Mapped[Optional[str]] = mapped_column("First", Unicode(255), nullable=True)
location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("Rooms.ID"), nullable=True) location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("Rooms.id"), nullable=True)
supervisor_id: Mapped[Optional[int]] = mapped_column("Supervisor", Integer, ForeignKey("Users.ID")) supervisor_id: Mapped[Optional[int]] = mapped_column("Supervisor", Integer, ForeignKey("Users.ID"))
supervisor: Mapped[Optional['User']] = relationship('User', remote_side='User.id', back_populates='subordinates') supervisor: Mapped[Optional['User']] = relationship('User', remote_side='User.id', back_populates='subordinates')