Leopoldadmin/rentman-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(quality): apply ruff autofixes and formatting (29 fixes, 41 files reformatted)

Browse Source
This commit is contained in:
Agent Zero
2026-06-10 21:31:41 +00:00
parent 054d4041e6
commit 7c12a96cdc
43 changed files with 1096 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/models/account.py
+18 -6
View File
@@ -25,11 +25,23 @@ class Account(Base):
# Relationships
users: Mapped[list["User"]] = relationship("User", back_populates="account")
roles: Mapped[list["Role"]] = relationship("Role", back_populates="account")
contacts: Mapped[list["Contact"]] = relationship("Contact", back_populates="account")
contacts: Mapped[list["Contact"]] = relationship(
"Contact", back_populates="account"
)
tags: Mapped[list["Tag"]] = relationship("Tag", back_populates="account")
equipment: Mapped[list["Equipment"]] = relationship("Equipment", back_populates="account")
stock_locations: Mapped[list["StockLocation"]] = relationship("StockLocation", back_populates="account")
equipment_groups: Mapped[list["EquipmentGroup"]] = relationship("EquipmentGroup", back_populates="account")
equipment: Mapped[list["Equipment"]] = relationship(
"Equipment", back_populates="account"
)
stock_locations: Mapped[list["StockLocation"]] = relationship(
"StockLocation", back_populates="account"
)
equipment_groups: Mapped[list["EquipmentGroup"]] = relationship(
"EquipmentGroup", back_populates="account"
)
crew_members: Mapped[list["Crew"]] = relationship("Crew", back_populates="account")
vehicles: Mapped[list["Vehicle"]] = relationship("Vehicle", back_populates="account")
projects: Mapped[list["Project"]] = relationship("Project", back_populates="account")
vehicles: Mapped[list["Vehicle"]] = relationship(
"Vehicle", back_populates="account"
)
projects: Mapped[list["Project"]] = relationship(
"Project", back_populates="account"
)
backend/app/models/crew.py
+1 -3
View File
@@ -63,9 +63,7 @@ class CrewAvailability(Base):
start_date: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
end_date: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
end_date: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
status: Mapped[str] = mapped_column(
String(20), nullable=False, default="available"
) # available, booked, unavailable
backend/app/models/equipment.py
+4 -2
View File
@@ -3,7 +3,7 @@
import uuid
from datetime import datetime
from sqlalchemy import String, DateTime, ForeignKey, func, Float, Integer, Text
from sqlalchemy import String, DateTime, ForeignKey, func, Float, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
from app.db.base import Base
@@ -23,7 +23,9 @@ class Equipment(Base):
name: Mapped[str] = mapped_column(String(255), nullable=False)
category: Mapped[str | None] = mapped_column(String(100), nullable=True)
brand: Mapped[str | None] = mapped_column(String(255), nullable=True)
serial_number: Mapped[str | None] = mapped_column(String(100), nullable=True, unique=True)
serial_number: Mapped[str | None] = mapped_column(
String(100), nullable=True, unique=True
)
barcode: Mapped[str | None] = mapped_column(String(100), nullable=True, unique=True)
qr_code: Mapped[str | None] = mapped_column(String(500), nullable=True)
status: Mapped[str] = mapped_column(
backend/app/models/equipment_group.py
+3 -1
View File
@@ -62,7 +62,9 @@ class EquipmentGroup(Base):
)
# Relationships
account: Mapped["Account"] = relationship("Account", back_populates="equipment_groups")
account: Mapped["Account"] = relationship(
"Account", back_populates="equipment_groups"
)
default_location: Mapped["StockLocation"] = relationship(
"StockLocation", back_populates="equipment_groups"
)
backend/app/models/project.py
+24 -8
View File
@@ -111,8 +111,12 @@ class ProjectFunctionGroup(Base):
String(36), ForeignKey("projects.id", ondelete="CASCADE"), nullable=False
)
sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
start_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
end_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
start_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
end_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
# Relationships
project: Mapped["Project"] = relationship(
@@ -140,7 +144,9 @@ class ProjectFunction(Base):
ForeignKey("project_function_groups.id", ondelete="CASCADE"),
nullable=False,
)
function_type: Mapped[str] = mapped_column(String(50), nullable=False, default='crew')
function_type: Mapped[str] = mapped_column(
String(50), nullable=False, default="crew"
)
quantity: Mapped[float] = mapped_column(Float, nullable=False, default=1.0)
daily_costs: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
total_costs: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
@@ -171,11 +177,17 @@ class ProjectEquipmentGroup(Base):
String(36), ForeignKey("projects.id", ondelete="CASCADE"), nullable=False
)
sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
start_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
end_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
start_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
end_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
# Relationships
project: Mapped["Project"] = relationship("Project", back_populates="equipment_groups")
project: Mapped["Project"] = relationship(
"Project", back_populates="equipment_groups"
)
items: Mapped[list["ProjectEquipment"]] = relationship(
"ProjectEquipment", back_populates="group", cascade="all, delete-orphan"
)
@@ -234,8 +246,12 @@ class ProjectCrew(Base):
crew_id: Mapped[str] = mapped_column(
String(36), ForeignKey("crew.id", ondelete="CASCADE"), nullable=False
)
start_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
end_date: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
start_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
end_date: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
notes: Mapped[str | None] = mapped_column(Text, nullable=True)
# Relationships
backend/app/models/stock_location.py
+3 -1
View File
@@ -35,7 +35,9 @@ class StockLocation(Base):
)
# Relationships
account: Mapped["Account"] = relationship("Account", back_populates="stock_locations")
account: Mapped["Account"] = relationship(
"Account", back_populates="stock_locations"
)
equipment_items: Mapped[list["Equipment"]] = relationship(
"Equipment", back_populates="location"
)
backend/app/models/user.py
+4 -1
View File
@@ -31,7 +31,10 @@ class User(Base):
DateTime(timezone=True), server_default=func.now(), nullable=False
)
updated_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), server_default=func.now(), onupdate=func.now(), nullable=False
DateTime(timezone=True),
server_default=func.now(),
onupdate=func.now(),
nullable=False,
)
# Relationships
backend/app/models/vehicle.py
+8 -8
View File
@@ -21,7 +21,9 @@ class Vehicle(Base):
String(36), ForeignKey("accounts.id", ondelete="CASCADE"), nullable=False
)
name: Mapped[str] = mapped_column(String(255), nullable=False)
license_plate: Mapped[str | None] = mapped_column(String(50), nullable=True, unique=True)
license_plate: Mapped[str | None] = mapped_column(
String(50), nullable=True, unique=True
)
brand: Mapped[str | None] = mapped_column(String(100), nullable=True)
model: Mapped[str | None] = mapped_column(String(100), nullable=True)
year: Mapped[int | None] = mapped_column(nullable=True)
@@ -64,15 +66,11 @@ class VehicleAssignment(Base):
vehicle_id: Mapped[str] = mapped_column(
String(36), ForeignKey("vehicles.id", ondelete="CASCADE"), nullable=False
)
project_id: Mapped[str | None] = mapped_column(
String(36), nullable=True
)
project_id: Mapped[str | None] = mapped_column(String(36), nullable=True)
start_date: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
end_date: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
end_date: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
status: Mapped[str] = mapped_column(
String(20), nullable=False, default="assigned"
) # assigned, in_use, returned
@@ -92,4 +90,6 @@ class VehicleAssignment(Base):
vehicle: Mapped["Vehicle"] = relationship("Vehicle", back_populates="assignments")
def __repr__(self) -> str:
return f"<VehicleAssignment {self.vehicle_id}: {self.start_date}-{self.end_date}>"
return (
f"<VehicleAssignment {self.vehicle_id}: {self.start_date}-{self.end_date}>"
)