From ac05373f9546f3f743cf87670c4a5700236d90b5 Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Wed, 9 Jul 2025 09:30:17 -0500 Subject: [PATCH] Refactor mapped_column parameters for consistency in models --- inventory/models/areas.py | 4 ++-- inventory/models/brands.py | 4 ++-- inventory/models/inventory.py | 6 +++--- inventory/models/rooms.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inventory/models/areas.py b/inventory/models/areas.py index 41be69f..1ce7cd0 100644 --- a/inventory/models/areas.py +++ b/inventory/models/areas.py @@ -13,8 +13,8 @@ class Area(ValidatableMixin, db.Model): __tablename__ = 'Areas' VALIDATION_LABEL = "Area" - id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) - name: Mapped[Optional[str]] = mapped_column("Area", 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) rooms: Mapped[List['Room']] = relationship('Room', back_populates='area') diff --git a/inventory/models/brands.py b/inventory/models/brands.py index 3d8d2f3..a51030c 100644 --- a/inventory/models/brands.py +++ b/inventory/models/brands.py @@ -13,8 +13,8 @@ class Brand(ValidatableMixin, db.Model): __tablename__ = 'Brands' VALIDATION_LABEL = 'Brand' - id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) - name: Mapped[str] = mapped_column("Brand", Unicode(255), nullable=False) + id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True) + name: Mapped[str] = mapped_column(Unicode(255), nullable=False) inventory: Mapped[List['Inventory']] = relationship('Inventory', back_populates='brand') diff --git a/inventory/models/inventory.py b/inventory/models/inventory.py index 38eed4a..2107a47 100644 --- a/inventory/models/inventory.py +++ b/inventory/models/inventory.py @@ -16,7 +16,7 @@ class Inventory(db.Model): __table_args__ = ( Index('Inventory$Bar Code', 'Bar Code'), ) - + id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) timestamp: Mapped[datetime.datetime] = mapped_column('Date Entered', DateTime) condition: Mapped[str] = mapped_column('Working Condition', Unicode(255)) @@ -27,11 +27,11 @@ class Inventory(db.Model): model: Mapped[Optional[str]] = mapped_column('Model #', Unicode(255)) notes: Mapped[Optional[str]] = mapped_column('Notes', Unicode(255)) owner_id = mapped_column('Owner', Integer, ForeignKey('Users.ID')) - brand_id: Mapped[Optional[int]] = mapped_column("Brand", 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. location_id: Mapped[Optional[str]] = mapped_column(ForeignKey("Rooms.ID")) barcode: Mapped[Optional[str]] = mapped_column('Bar Code', Unicode(255)) - shared: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) + shared: Mapped[Optional[bool]] = mapped_column("Shared", Boolean, server_default=text('((0))')) location: Mapped[Optional['Room']] = relationship('Room', back_populates='inventory') owner = relationship('User', back_populates='inventory') diff --git a/inventory/models/rooms.py b/inventory/models/rooms.py index 3038e59..12488e1 100644 --- a/inventory/models/rooms.py +++ b/inventory/models/rooms.py @@ -18,7 +18,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("Area", 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")) area: Mapped[Optional['Area']] = relationship('Area', back_populates='rooms')