From b0927680b9a76ff32cfbcbc8a594dcfac5682737 Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Wed, 9 Jul 2025 12:05:23 -0500 Subject: [PATCH] Standardize foreign key references for case consistency in inventory and user models --- inventory/models/inventory.py | 2 +- inventory/models/rooms.py | 6 +++--- inventory/models/users.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/models/inventory.py b/inventory/models/inventory.py index b8d296b..d25e8bd 100644 --- a/inventory/models/inventory.py +++ b/inventory/models/inventory.py @@ -28,7 +28,7 @@ class Inventory(db.Model): owner_id = mapped_column(Integer, ForeignKey('Users.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. - 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)) shared: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) diff --git a/inventory/models/rooms.py b/inventory/models/rooms.py index 6e8b278..a3e8fe4 100644 --- a/inventory/models/rooms.py +++ b/inventory/models/rooms.py @@ -16,10 +16,10 @@ class Room(ValidatableMixin, db.Model): __tablename__ = 'Rooms' VALIDATION_LABEL = "Room" - 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) + id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True) + name: Mapped[Optional[str]] = mapped_column(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(Integer, ForeignKey("Room Functions.id")) area: Mapped[Optional['Area']] = relationship('Area', back_populates='rooms') room_function: Mapped[Optional['RoomFunction']] = relationship('RoomFunction', back_populates='rooms') diff --git a/inventory/models/users.py b/inventory/models/users.py index d1424f5..4631873 100644 --- a/inventory/models/users.py +++ b/inventory/models/users.py @@ -17,7 +17,7 @@ class User(db.Model): active: Mapped[Optional[bool]] = mapped_column("Active", Boolean, server_default=text('((0))')) last_name: Mapped[Optional[str]] = mapped_column("Last", 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: Mapped[Optional['User']] = relationship('User', remote_side='User.id', back_populates='subordinates')