From e1f494fd1850943dbff310fe565ee44d1e66c344 Mon Sep 17 00:00:00 2001 From: AlexeerCT Date: Tue, 3 Mar 2026 16:13:05 -0600 Subject: [PATCH] refactor estructure --- .../imports/{temporary => }/validators/common.py | 6 +++--- .../imports/{temporary => }/validators/create.py | 9 +++------ .../imports/{temporary => }/validators/update.py | 4 ++-- backend/api/v1/modules/a76/invoices/services.py | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) rename backend/api/v1/modules/a76/invoices/imports/{temporary => }/validators/common.py (99%) rename backend/api/v1/modules/a76/invoices/imports/{temporary => }/validators/create.py (94%) rename backend/api/v1/modules/a76/invoices/imports/{temporary => }/validators/update.py (99%) diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py b/backend/api/v1/modules/a76/invoices/imports/validators/common.py similarity index 99% rename from backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py rename to backend/api/v1/modules/a76/invoices/imports/validators/common.py index a690343d..72bdb7aa 100644 --- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py +++ b/backend/api/v1/modules/a76/invoices/imports/validators/common.py @@ -1,16 +1,16 @@ from sqlalchemy import func from sqlalchemy.orm import Session -from .... import schemas +from ... import schemas from api.v1.modules.a76.pedmientos.models.pedimentos import Pedimentos from api.v1.modules.a76.general_catalogs.exchange_rate.models import ExchangeRate from api.v1.modules.a76.clients_and_providers.models import ClientProvider from api.v1.modules.a76.customs_brokers.models import CustomsBroker from api.v1.modules.public.reference_data.incoterms.models import Incoterm -from ....models import InvoiceComplianceMx +from ...models import InvoiceComplianceMx from api.v1.modules.a76.items.models import LineItem from api.v1.modules.public.reference_data.currency_types.models import CurrencyType from api.v1.modules.public.reference_data.customs_sections.models import CustomsSection -from ....models import TransportType, Currency, WeightUnit +from ...models import TransportType, Currency, WeightUnit from core.exceptions import ErrorCollector from typing import Dict, Any diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py b/backend/api/v1/modules/a76/invoices/imports/validators/create.py similarity index 94% rename from backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py rename to backend/api/v1/modules/a76/invoices/imports/validators/create.py index 79a6f0cb..8f0deba2 100644 --- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py +++ b/backend/api/v1/modules/a76/invoices/imports/validators/create.py @@ -2,7 +2,7 @@ from sqlalchemy.orm import Session from api.v1.modules.a76.general_catalogs.exchange_rate.models import ExchangeRate from core.exceptions import ErrorCollector -from ....schemas import InvoiceHeaderCreate +from ...schemas import InvoiceHeaderCreate from .common import validate_common, validate_required_fields_by_operation def validate_create(db: Session, invoice: InvoiceHeaderCreate, tenant_id: int, company_id: int, errors: ErrorCollector) -> None: @@ -23,16 +23,13 @@ def validate_create(db: Session, invoice: InvoiceHeaderCreate, tenant_id: int, c if not invoice.invoice_date: errors.add_required_error("invoice_date") - if errors.has_errors(): - """Se retorna porque hay campos obligatorios básicos que deben ser llenados""" - return - # Validar campos obligatorios según tipo de operación invoice_data = { 'provider_header': invoice.compliance_mx.provider_header if invoice.compliance_mx else None, 'provider_id': invoice.compliance_mx.provider_id if invoice.compliance_mx else None, - 'sold_to_id': invoice.compliance_mx.sold_to_id if invoice.compliance_mx else None, 'sold_to_header': invoice.compliance_mx.sold_to_header if invoice.compliance_mx else None, + 'sold_to_id': invoice.compliance_mx.sold_to_id if invoice.compliance_mx else None, + 'shipped_to_header': invoice.compliance_mx.shipped_to_header if invoice.compliance_mx else None, 'shipped_to_id': invoice.compliance_mx.shipped_to_id if invoice.compliance_mx else None, 'customs_broker_id': invoice.compliance_mx.customs_broker_id if invoice.compliance_mx else None, 'pedimento_id': invoice.compliance_mx.pedimento_id if invoice.compliance_mx else None, diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py b/backend/api/v1/modules/a76/invoices/imports/validators/update.py similarity index 99% rename from backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py rename to backend/api/v1/modules/a76/invoices/imports/validators/update.py index ac85ff24..c0e8e3e0 100644 --- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py +++ b/backend/api/v1/modules/a76/invoices/imports/validators/update.py @@ -3,8 +3,8 @@ from datetime import date from decimal import Decimal from core.exceptions import ErrorCollector -from ....schemas import InvoiceHeaderUpdate -from ....models import InvoiceHeader +from ...schemas import InvoiceHeaderUpdate +from ...models import InvoiceHeader from .common import validate_required_fields_by_operation diff --git a/backend/api/v1/modules/a76/invoices/services.py b/backend/api/v1/modules/a76/invoices/services.py index 90e6a84a..e28434d8 100644 --- a/backend/api/v1/modules/a76/invoices/services.py +++ b/backend/api/v1/modules/a76/invoices/services.py @@ -5,8 +5,8 @@ from sqlalchemy import func from core.exceptions import ErrorCollector, DuplicateResourceException from core.context import get_user_context from .common.mappers import clean_dict -from .imports.temporary.validators.create import validate_create -from .imports.temporary.validators.update import validate_update +from .imports.validators.create import validate_create +from .imports.validators.update import validate_update from .common.common_validators import invoice_exists from . import models, schemas