Refactor models and services in A76 module
- Updated GBultoService to use models.Package instead of models.GBulto. - Refactored Part model to use SQLAlchemy 2.0 style with Mapped and mapped_column. - Added timestamps (created_at, updated_at, deleted_at) to various pedimento models. - Improved relationships and foreign key constraints in pedimento models. - Updated PermissionRuleOct and Seal models to use Mapped and mapped_column. - Changed DTO configuration from orm_mode to from_attributes for better compatibility. - Removed obsolete models (models.py and models_ped.py) from the repository.
This commit is contained in:
@@ -1,22 +1,35 @@
|
||||
from sqlalchemy import Column, String, DECIMAL, DateTime, ForeignKey
|
||||
from sqlalchemy.orm import declarative_base
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
from sqlalchemy import DateTime, Integer, String, DECIMAL, ForeignKey, PrimaryKeyConstraint, ForeignKeyConstraint, UniqueConstraint
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
from core.database import Base
|
||||
|
||||
class GBulto(Base):
|
||||
__tablename__ = "gbultos"
|
||||
__table_args__ = {"schema": "a76"}
|
||||
|
||||
CLAVE = Column(String(5), primary_key=True, nullable=False)
|
||||
DESCRIPTION = Column(String(40), nullable=True)
|
||||
DESCRIPTIONI = Column(String(40), nullable=True)
|
||||
WEIGHT_UNIT = Column(DECIMAL(19, 8), nullable=True)
|
||||
PLURALS = Column(String(4), nullable=True)
|
||||
PLURAL_IN = Column(String(4), nullable=True)
|
||||
CODE_ACE = Column(String(4), nullable=True)
|
||||
CODE_AAMEX = Column(String(9), nullable=True)
|
||||
CREATED_AT = Column(DateTime, server_default=func.now(), nullable=False)
|
||||
UPDATED_AT = Column(DateTime, server_default=func.now(), onupdate=func.now(), nullable=False)
|
||||
tenant_id = Column(String, ForeignKey("a76.tenants.id"), nullable=False)
|
||||
class Package(Base):
|
||||
__tablename__ = "packages" # GBultos
|
||||
__table_args__ = (
|
||||
PrimaryKeyConstraint('id', name='packages_pkey'),
|
||||
UniqueConstraint('key', name='packages_key_ukey'),
|
||||
ForeignKeyConstraint(['tenant_id'], ['a76.tenants.id'], name='fk_packages_tenant'),
|
||||
{"schema": "a76"}
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(Integer, primary_key=True)
|
||||
tenant_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
||||
key: Mapped[str] = mapped_column(String(5))
|
||||
description_es: Mapped[Optional[str]] = mapped_column(String(40))
|
||||
description_en: Mapped[Optional[str]] = mapped_column(String(40))
|
||||
weight_unit: Mapped[Optional[Decimal]] = mapped_column(DECIMAL(19, 8))
|
||||
plurals: Mapped[Optional[str]] = mapped_column(String(4))
|
||||
plural_in: Mapped[Optional[str]] = mapped_column(String(4))
|
||||
code_ace: Mapped[Optional[str]] = mapped_column(String(4))
|
||||
code_aamex: Mapped[Optional[str]] = mapped_column(String(9))
|
||||
|
||||
# Timestamps
|
||||
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=func.now())
|
||||
updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=func.now(), onupdate=func.now())
|
||||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user