From 7aa5b09d3365a274410ee6fff34be16e58dcc770 Mon Sep 17 00:00:00 2001 From: acazares Date: Mon, 12 Jan 2026 12:49:58 -0600 Subject: [PATCH 1/2] fix(models): simplify unique constraints by removing tenant_id and company_id --- .../units_of_measure/models.py | 34 +++++++------------ 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py index a79cff4b..54d2956e 100644 --- a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py +++ b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py @@ -18,7 +18,7 @@ from core.database import Base class UnitOfMeasureACE(Base, TimestampMixin): __tablename__ = "unit_of_measure_ace" __table_args__ = ( - UniqueConstraint("code", "tenant_id", "company_id", name="uq_uom_ace_code"), + UniqueConstraint("code", name="uq_uom_ace_code"), {"schema": "a76", "extend_existing": True}, ) @@ -33,7 +33,7 @@ class UnitOfMeasureACE(Base, TimestampMixin): class UnitOfMeasureOMA(Base, TimestampMixin): __tablename__ = "unit_of_measure_oma" __table_args__ = ( - UniqueConstraint("code", "tenant_id", "company_id", name="uq_uom_oma_code"), + UniqueConstraint("code", name="uq_uom_oma_code"), {"schema": "a76", "extend_existing": True}, ) @@ -48,9 +48,7 @@ class UnitOfMeasureOMA(Base, TimestampMixin): class UnitOfMeasureAmerican(Base, TimestampMixin): __tablename__ = "unit_of_measure_american" __table_args__ = ( - UniqueConstraint( - "code", "tenant_id", "company_id", name="uq_uom_american_code" - ), + UniqueConstraint("code", name="uq_uom_american_code"), {"schema": "a76", "extend_existing": True}, ) @@ -65,7 +63,7 @@ class UnitOfMeasureAmerican(Base, TimestampMixin): class UnitOfMeasureCustoms(Base, TimestampMixin): __tablename__ = "unit_of_measure_customs" __table_args__ = ( - UniqueConstraint("code", "tenant_id", "company_id", name="uq_uom_customs_code"), + UniqueConstraint("code", name="uq_uom_customs_code"), {"schema": "a76", "extend_existing": True}, ) @@ -85,41 +83,33 @@ class UnitOfMeasure(Base, TenantScopedMixin, TimestampMixin): __table_args__ = ( UniqueConstraint("code", "tenant_id", "company_id", name="uq_uom_code"), ForeignKeyConstraint( - ["customs_code", "tenant_id", "company_id"], + ["customs_code"], [ - "a76.unit_of_measure_customs.code", - "a76.unit_of_measure_customs.tenant_id", - "a76.unit_of_measure_customs.company_id", + "a76.unit_of_measure_customs.code" ], use_alter=True, name="fk_uom_customs", ), ForeignKeyConstraint( - ["american_code", "tenant_id", "company_id"], + ["american_code"], [ - "a76.unit_of_measure_american.code", - "a76.unit_of_measure_american.tenant_id", - "a76.unit_of_measure_american.company_id", + "a76.unit_of_measure_american.code" ], use_alter=True, name="fk_uom_american", ), ForeignKeyConstraint( - ["ace_code", "tenant_id", "company_id"], + ["ace_code"], [ - "a76.unit_of_measure_ace.code", - "a76.unit_of_measure_ace.tenant_id", - "a76.unit_of_measure_ace.company_id", + "a76.unit_of_measure_ace.code" ], use_alter=True, name="fk_uom_ace", ), ForeignKeyConstraint( - ["oma_code", "tenant_id", "company_id"], + ["oma_code"], [ - "a76.unit_of_measure_oma.code", - "a76.unit_of_measure_oma.tenant_id", - "a76.unit_of_measure_oma.company_id", + "a76.unit_of_measure_oma.code" ], use_alter=True, name="fk_uom_oma", From 659a9ea6cfd915fc83fffa6ee178bf9b06468cb1 Mon Sep 17 00:00:00 2001 From: Galindo97 Date: Mon, 12 Jan 2026 13:30:38 -0600 Subject: [PATCH 2/2] fix(models): simplify foreign key constraints in UnitOfMeasureGeneral by removing tenant_id and company_id --- .../general_catalogs/units_of_measure/models.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py index 54d2956e..d33b82b6 100644 --- a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py +++ b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py @@ -156,22 +156,14 @@ class UnitOfMeasureGeneral(Base, TenantScopedMixin, TimestampMixin): __table_args__ = ( UniqueConstraint("code", "tenant_id", "company_id", name="uq_uom_general_code"), ForeignKeyConstraint( - ["customs_code", "tenant_id", "company_id"], - [ - "a76.unit_of_measure_customs.code", - "a76.unit_of_measure_customs.tenant_id", - "a76.unit_of_measure_customs.company_id", - ], + ["customs_code"], + ["a76.unit_of_measure_customs.code"], use_alter=True, name="fk_uom_general_customs", ), ForeignKeyConstraint( - ["ace_code", "tenant_id", "company_id"], - [ - "a76.unit_of_measure_ace.code", - "a76.unit_of_measure_ace.tenant_id", - "a76.unit_of_measure_ace.company_id", - ], + ["ace_code"], + ["a76.unit_of_measure_ace.code"], use_alter=True, name="fk_uom_general_ace", ),