acazares
962f43fe62
- Updated SealService to support tenant and company filtering with pagination and enhanced CRUD methods. - Refactored TrailerService to include tenant and company support, added filtering capabilities, and improved CRUD methods. - Introduced TenantCRUDRoutes for Trailer and Transporter routes to streamline API endpoint creation and management. - Enhanced TransporterService with tenant and company filtering, pagination, and improved CRUD operations. - Added Customs Broker module with DTOs, models, services, and routes for managing customs broker data. - Implemented CRUD operations for Customs Broker, including personnel and VU management. - Improved data validation and descriptions in DTOs for better API documentation.
109 lines
3.2 KiB
Python
109 lines
3.2 KiB
Python
from typing import Optional, Tuple, List, Dict, Any
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from . import dto, models
|
|
|
|
|
|
class TrailerService:
|
|
"""Service for Trailer CRUD operations with tenant support"""
|
|
|
|
@staticmethod
|
|
def get_all(
|
|
db: Session,
|
|
tenant_id: int,
|
|
company_id: int,
|
|
skip: int = 0,
|
|
limit: int = 50,
|
|
filters: Optional[Dict[str, Any]] = None,
|
|
) -> Tuple[List[models.Trailer], int]:
|
|
"""Get all trailers for a tenant/company with pagination"""
|
|
query = db.query(models.Trailer).filter(
|
|
models.Trailer.tenant_id == tenant_id,
|
|
models.Trailer.company_id == company_id,
|
|
)
|
|
|
|
# Apply filters if provided
|
|
if filters:
|
|
if filters.get("plate_number"):
|
|
query = query.filter(
|
|
models.Trailer.plate_number.ilike(f"%{filters['plate_number']}%")
|
|
)
|
|
if filters.get("trailer_type_key"):
|
|
query = query.filter(
|
|
models.Trailer.trailer_type_key == filters["trailer_type_key"]
|
|
)
|
|
|
|
total = query.count()
|
|
trailers = query.offset(skip).limit(limit).all()
|
|
|
|
return trailers, total
|
|
|
|
@staticmethod
|
|
def get_by_id(
|
|
db: Session, trailer_number: str, tenant_id: int, company_id: int
|
|
) -> Optional[models.Trailer]:
|
|
"""Get trailer by trailer_number"""
|
|
return (
|
|
db.query(models.Trailer)
|
|
.filter(
|
|
models.Trailer.trailer_number == trailer_number,
|
|
models.Trailer.tenant_id == tenant_id,
|
|
models.Trailer.company_id == company_id,
|
|
)
|
|
.first()
|
|
)
|
|
|
|
@staticmethod
|
|
def create(
|
|
db: Session,
|
|
trailer_data: dto.TrailerCreateDTO,
|
|
tenant_id: int,
|
|
company_id: int,
|
|
) -> models.Trailer:
|
|
"""Create a new trailer"""
|
|
new_trailer = models.Trailer(
|
|
**trailer_data.model_dump(), tenant_id=tenant_id, company_id=company_id
|
|
)
|
|
db.add(new_trailer)
|
|
db.commit()
|
|
db.refresh(new_trailer)
|
|
return new_trailer
|
|
|
|
@staticmethod
|
|
def update(
|
|
db: Session,
|
|
trailer_number: str,
|
|
tenant_id: int,
|
|
company_id: int,
|
|
trailer_data: dto.TrailerUpdateDTO,
|
|
) -> Optional[models.Trailer]:
|
|
"""Update a trailer"""
|
|
trailer = TrailerService.get_by_id(db, trailer_number, tenant_id, company_id)
|
|
if not trailer:
|
|
return None
|
|
|
|
# Update fields (excluding trailer_number as it's the primary key)
|
|
update_data = trailer_data.model_dump(
|
|
exclude_unset=True, exclude={"trailer_number"}
|
|
)
|
|
for field, value in update_data.items():
|
|
setattr(trailer, field, value)
|
|
|
|
db.commit()
|
|
db.refresh(trailer)
|
|
return trailer
|
|
|
|
@staticmethod
|
|
def delete(
|
|
db: Session, trailer_number: str, tenant_id: int, company_id: int
|
|
) -> bool:
|
|
"""Delete a trailer"""
|
|
trailer = TrailerService.get_by_id(db, trailer_number, tenant_id, company_id)
|
|
if not trailer:
|
|
return False
|
|
|
|
db.delete(trailer)
|
|
db.commit()
|
|
return True
|