Improve the frontend 3
This commit is contained in:
Urtzi Alfaro
@@ -11,14 +11,18 @@ import uuid
|
||||
from datetime import datetime, timezone, timedelta, date
|
||||
from typing import Optional
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
# Add shared path
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent.parent))
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.models.suppliers import (
|
||||
Supplier, SupplierPriceList, PurchaseOrder, PurchaseOrderItem,
|
||||
Delivery, DeliveryItem, SupplierQualityReview, SupplierInvoice,
|
||||
SupplierStatus, PurchaseOrderStatus, DeliveryStatus, InvoiceStatus,
|
||||
QualityRating, DeliveryRating
|
||||
Supplier, SupplierPriceList, SupplierQualityReview,
|
||||
SupplierStatus, QualityRating
|
||||
)
|
||||
from shared.utils.demo_dates import adjust_date_for_demo, BASE_REFERENCE_DATE
|
||||
|
||||
logger = structlog.get_logger()
|
||||
router = APIRouter(prefix="/internal/demo", tags=["internal"])
|
||||
@@ -45,6 +49,7 @@ async def clone_demo_data(
|
||||
virtual_tenant_id: str,
|
||||
demo_account_type: str,
|
||||
session_id: Optional[str] = None,
|
||||
session_created_at: Optional[str] = None,
|
||||
db: AsyncSession = Depends(get_db),
|
||||
_: bool = Depends(verify_internal_api_key)
|
||||
):
|
||||
@@ -54,10 +59,7 @@ async def clone_demo_data(
|
||||
Clones:
|
||||
- Suppliers (vendor master data)
|
||||
- Supplier price lists (product pricing)
|
||||
- Purchase orders with items
|
||||
- Deliveries with items
|
||||
- Quality reviews
|
||||
- Supplier invoices
|
||||
|
||||
Args:
|
||||
base_tenant_id: Template tenant UUID to clone from
|
||||
@@ -70,12 +72,22 @@ async def clone_demo_data(
|
||||
"""
|
||||
start_time = datetime.now(timezone.utc)
|
||||
|
||||
# Parse session creation time for date adjustment
|
||||
if session_created_at:
|
||||
try:
|
||||
session_time = datetime.fromisoformat(session_created_at.replace('Z', '+00:00'))
|
||||
except (ValueError, AttributeError):
|
||||
session_time = start_time
|
||||
else:
|
||||
session_time = start_time
|
||||
|
||||
logger.info(
|
||||
"Starting suppliers data cloning",
|
||||
base_tenant_id=base_tenant_id,
|
||||
virtual_tenant_id=virtual_tenant_id,
|
||||
demo_account_type=demo_account_type,
|
||||
session_id=session_id
|
||||
session_id=session_id,
|
||||
session_created_at=session_created_at
|
||||
)
|
||||
|
||||
try:
|
||||
@@ -87,20 +99,12 @@ async def clone_demo_data(
|
||||
stats = {
|
||||
"suppliers": 0,
|
||||
"price_lists": 0,
|
||||
"purchase_orders": 0,
|
||||
"purchase_order_items": 0,
|
||||
"deliveries": 0,
|
||||
"delivery_items": 0,
|
||||
"quality_reviews": 0,
|
||||
"invoices": 0
|
||||
"quality_reviews": 0
|
||||
}
|
||||
|
||||
# ID mappings
|
||||
supplier_id_map = {}
|
||||
price_list_map = {}
|
||||
po_id_map = {}
|
||||
po_item_map = {}
|
||||
delivery_id_map = {}
|
||||
|
||||
# Clone Suppliers
|
||||
result = await db.execute(
|
||||
@@ -231,212 +235,6 @@ async def clone_demo_data(
|
||||
# Flush to get price list IDs
|
||||
await db.flush()
|
||||
|
||||
# Clone Purchase Orders
|
||||
result = await db.execute(
|
||||
select(PurchaseOrder).where(PurchaseOrder.tenant_id == base_uuid)
|
||||
)
|
||||
base_pos = result.scalars().all()
|
||||
|
||||
logger.info(
|
||||
"Found purchase orders to clone",
|
||||
count=len(base_pos),
|
||||
base_tenant=str(base_uuid)
|
||||
)
|
||||
|
||||
# Calculate date offset
|
||||
if base_pos:
|
||||
max_date = max(po.order_date for po in base_pos)
|
||||
today = datetime.now(timezone.utc)
|
||||
date_offset = today - max_date
|
||||
else:
|
||||
date_offset = timedelta(days=0)
|
||||
|
||||
for po in base_pos:
|
||||
new_po_id = uuid.uuid4()
|
||||
po_id_map[po.id] = new_po_id
|
||||
|
||||
new_supplier_id = supplier_id_map.get(po.supplier_id, po.supplier_id)
|
||||
|
||||
new_po = PurchaseOrder(
|
||||
id=new_po_id,
|
||||
tenant_id=virtual_uuid,
|
||||
supplier_id=new_supplier_id,
|
||||
po_number=f"PO-{uuid.uuid4().hex[:8].upper()}", # New PO number
|
||||
reference_number=po.reference_number,
|
||||
status=po.status,
|
||||
priority=po.priority,
|
||||
order_date=po.order_date + date_offset,
|
||||
required_delivery_date=po.required_delivery_date + date_offset if po.required_delivery_date else None,
|
||||
estimated_delivery_date=po.estimated_delivery_date + date_offset if po.estimated_delivery_date else None,
|
||||
subtotal=po.subtotal,
|
||||
tax_amount=po.tax_amount,
|
||||
shipping_cost=po.shipping_cost,
|
||||
discount_amount=po.discount_amount,
|
||||
total_amount=po.total_amount,
|
||||
currency=po.currency,
|
||||
delivery_address=po.delivery_address,
|
||||
delivery_instructions=po.delivery_instructions,
|
||||
delivery_contact=po.delivery_contact,
|
||||
delivery_phone=po.delivery_phone,
|
||||
requires_approval=po.requires_approval,
|
||||
approved_by=po.approved_by,
|
||||
approved_at=po.approved_at + date_offset if po.approved_at else None,
|
||||
rejection_reason=po.rejection_reason,
|
||||
sent_to_supplier_at=po.sent_to_supplier_at + date_offset if po.sent_to_supplier_at else None,
|
||||
supplier_confirmation_date=po.supplier_confirmation_date + date_offset if po.supplier_confirmation_date else None,
|
||||
supplier_reference=po.supplier_reference,
|
||||
notes=po.notes,
|
||||
internal_notes=po.internal_notes,
|
||||
terms_and_conditions=po.terms_and_conditions,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
updated_at=datetime.now(timezone.utc),
|
||||
created_by=po.created_by,
|
||||
updated_by=po.updated_by
|
||||
)
|
||||
db.add(new_po)
|
||||
stats["purchase_orders"] += 1
|
||||
|
||||
# Flush to get PO IDs
|
||||
await db.flush()
|
||||
|
||||
# Clone Purchase Order Items
|
||||
for old_po_id, new_po_id in po_id_map.items():
|
||||
result = await db.execute(
|
||||
select(PurchaseOrderItem).where(PurchaseOrderItem.purchase_order_id == old_po_id)
|
||||
)
|
||||
po_items = result.scalars().all()
|
||||
|
||||
for item in po_items:
|
||||
new_item_id = uuid.uuid4()
|
||||
po_item_map[item.id] = new_item_id
|
||||
|
||||
new_price_list_id = price_list_map.get(item.price_list_item_id, item.price_list_item_id) if item.price_list_item_id else None
|
||||
|
||||
# Transform inventory_product_id to match virtual tenant's ingredient IDs
|
||||
if item.inventory_product_id:
|
||||
base_product_int = int(item.inventory_product_id.hex, 16)
|
||||
base_ingredient_int = base_tenant_int ^ base_product_int
|
||||
new_inventory_product_id = uuid.UUID(int=virtual_tenant_int ^ base_ingredient_int)
|
||||
else:
|
||||
new_inventory_product_id = None
|
||||
|
||||
new_item = PurchaseOrderItem(
|
||||
id=new_item_id,
|
||||
tenant_id=virtual_uuid,
|
||||
purchase_order_id=new_po_id,
|
||||
price_list_item_id=new_price_list_id,
|
||||
inventory_product_id=new_inventory_product_id, # Transformed product reference
|
||||
product_code=item.product_code,
|
||||
ordered_quantity=item.ordered_quantity,
|
||||
unit_of_measure=item.unit_of_measure,
|
||||
unit_price=item.unit_price,
|
||||
line_total=item.line_total,
|
||||
received_quantity=item.received_quantity,
|
||||
remaining_quantity=item.remaining_quantity,
|
||||
quality_requirements=item.quality_requirements,
|
||||
item_notes=item.item_notes,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
updated_at=datetime.now(timezone.utc)
|
||||
)
|
||||
db.add(new_item)
|
||||
stats["purchase_order_items"] += 1
|
||||
|
||||
# Flush to get PO item IDs
|
||||
await db.flush()
|
||||
|
||||
# Clone Deliveries
|
||||
result = await db.execute(
|
||||
select(Delivery).where(Delivery.tenant_id == base_uuid)
|
||||
)
|
||||
base_deliveries = result.scalars().all()
|
||||
|
||||
logger.info(
|
||||
"Found deliveries to clone",
|
||||
count=len(base_deliveries),
|
||||
base_tenant=str(base_uuid)
|
||||
)
|
||||
|
||||
for delivery in base_deliveries:
|
||||
new_delivery_id = uuid.uuid4()
|
||||
delivery_id_map[delivery.id] = new_delivery_id
|
||||
|
||||
new_po_id = po_id_map.get(delivery.purchase_order_id, delivery.purchase_order_id)
|
||||
new_supplier_id = supplier_id_map.get(delivery.supplier_id, delivery.supplier_id)
|
||||
|
||||
new_delivery = Delivery(
|
||||
id=new_delivery_id,
|
||||
tenant_id=virtual_uuid,
|
||||
purchase_order_id=new_po_id,
|
||||
supplier_id=new_supplier_id,
|
||||
delivery_number=f"DEL-{uuid.uuid4().hex[:8].upper()}", # New delivery number
|
||||
supplier_delivery_note=delivery.supplier_delivery_note,
|
||||
status=delivery.status,
|
||||
scheduled_date=delivery.scheduled_date + date_offset if delivery.scheduled_date else None,
|
||||
estimated_arrival=delivery.estimated_arrival + date_offset if delivery.estimated_arrival else None,
|
||||
actual_arrival=delivery.actual_arrival + date_offset if delivery.actual_arrival else None,
|
||||
completed_at=delivery.completed_at + date_offset if delivery.completed_at else None,
|
||||
delivery_address=delivery.delivery_address,
|
||||
delivery_contact=delivery.delivery_contact,
|
||||
delivery_phone=delivery.delivery_phone,
|
||||
carrier_name=delivery.carrier_name,
|
||||
tracking_number=delivery.tracking_number,
|
||||
inspection_passed=delivery.inspection_passed,
|
||||
inspection_notes=delivery.inspection_notes,
|
||||
quality_issues=delivery.quality_issues,
|
||||
received_by=delivery.received_by,
|
||||
received_at=delivery.received_at + date_offset if delivery.received_at else None,
|
||||
notes=delivery.notes,
|
||||
photos=delivery.photos,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
updated_at=datetime.now(timezone.utc),
|
||||
created_by=delivery.created_by
|
||||
)
|
||||
db.add(new_delivery)
|
||||
stats["deliveries"] += 1
|
||||
|
||||
# Flush to get delivery IDs
|
||||
await db.flush()
|
||||
|
||||
# Clone Delivery Items
|
||||
for old_delivery_id, new_delivery_id in delivery_id_map.items():
|
||||
result = await db.execute(
|
||||
select(DeliveryItem).where(DeliveryItem.delivery_id == old_delivery_id)
|
||||
)
|
||||
delivery_items = result.scalars().all()
|
||||
|
||||
for item in delivery_items:
|
||||
new_po_item_id = po_item_map.get(item.purchase_order_item_id, item.purchase_order_item_id)
|
||||
|
||||
# Transform inventory_product_id to match virtual tenant's ingredient IDs
|
||||
if item.inventory_product_id:
|
||||
base_product_int = int(item.inventory_product_id.hex, 16)
|
||||
base_ingredient_int = base_tenant_int ^ base_product_int
|
||||
new_inventory_product_id = uuid.UUID(int=virtual_tenant_int ^ base_ingredient_int)
|
||||
else:
|
||||
new_inventory_product_id = None
|
||||
|
||||
new_item = DeliveryItem(
|
||||
id=uuid.uuid4(),
|
||||
tenant_id=virtual_uuid,
|
||||
delivery_id=new_delivery_id,
|
||||
purchase_order_item_id=new_po_item_id,
|
||||
inventory_product_id=new_inventory_product_id, # Transformed product reference
|
||||
ordered_quantity=item.ordered_quantity,
|
||||
delivered_quantity=item.delivered_quantity,
|
||||
accepted_quantity=item.accepted_quantity,
|
||||
rejected_quantity=item.rejected_quantity,
|
||||
batch_lot_number=item.batch_lot_number,
|
||||
expiry_date=item.expiry_date + date_offset if item.expiry_date else None,
|
||||
quality_grade=item.quality_grade,
|
||||
quality_issues=item.quality_issues,
|
||||
rejection_reason=item.rejection_reason,
|
||||
item_notes=item.item_notes,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
updated_at=datetime.now(timezone.utc)
|
||||
)
|
||||
db.add(new_item)
|
||||
stats["delivery_items"] += 1
|
||||
|
||||
# Clone Quality Reviews
|
||||
result = await db.execute(
|
||||
select(SupplierQualityReview).where(SupplierQualityReview.tenant_id == base_uuid)
|
||||
@@ -445,16 +243,20 @@ async def clone_demo_data(
|
||||
|
||||
for review in base_reviews:
|
||||
new_supplier_id = supplier_id_map.get(review.supplier_id, review.supplier_id)
|
||||
new_po_id = po_id_map.get(review.purchase_order_id, review.purchase_order_id) if review.purchase_order_id else None
|
||||
new_delivery_id = delivery_id_map.get(review.delivery_id, review.delivery_id) if review.delivery_id else None
|
||||
|
||||
# Adjust dates relative to session creation time
|
||||
adjusted_review_date = adjust_date_for_demo(
|
||||
review.review_date, session_time, BASE_REFERENCE_DATE
|
||||
)
|
||||
adjusted_follow_up_date = adjust_date_for_demo(
|
||||
review.follow_up_date, session_time, BASE_REFERENCE_DATE
|
||||
)
|
||||
|
||||
new_review = SupplierQualityReview(
|
||||
id=uuid.uuid4(),
|
||||
tenant_id=virtual_uuid,
|
||||
supplier_id=new_supplier_id,
|
||||
purchase_order_id=new_po_id,
|
||||
delivery_id=new_delivery_id,
|
||||
review_date=review.review_date + date_offset,
|
||||
review_date=adjusted_review_date,
|
||||
review_type=review.review_type,
|
||||
quality_rating=review.quality_rating,
|
||||
delivery_rating=review.delivery_rating,
|
||||
@@ -467,57 +269,15 @@ async def clone_demo_data(
|
||||
quality_issues=review.quality_issues,
|
||||
corrective_actions=review.corrective_actions,
|
||||
follow_up_required=review.follow_up_required,
|
||||
follow_up_date=review.follow_up_date + date_offset if review.follow_up_date else None,
|
||||
follow_up_date=adjusted_follow_up_date,
|
||||
is_final=review.is_final,
|
||||
approved_by=review.approved_by,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
created_at=session_time,
|
||||
reviewed_by=review.reviewed_by
|
||||
)
|
||||
db.add(new_review)
|
||||
stats["quality_reviews"] += 1
|
||||
|
||||
# Clone Supplier Invoices
|
||||
result = await db.execute(
|
||||
select(SupplierInvoice).where(SupplierInvoice.tenant_id == base_uuid)
|
||||
)
|
||||
base_invoices = result.scalars().all()
|
||||
|
||||
for invoice in base_invoices:
|
||||
new_supplier_id = supplier_id_map.get(invoice.supplier_id, invoice.supplier_id)
|
||||
new_po_id = po_id_map.get(invoice.purchase_order_id, invoice.purchase_order_id) if invoice.purchase_order_id else None
|
||||
|
||||
new_invoice = SupplierInvoice(
|
||||
id=uuid.uuid4(),
|
||||
tenant_id=virtual_uuid,
|
||||
supplier_id=new_supplier_id,
|
||||
purchase_order_id=new_po_id,
|
||||
invoice_number=f"INV-{uuid.uuid4().hex[:8].upper()}", # New invoice number
|
||||
supplier_invoice_number=invoice.supplier_invoice_number,
|
||||
status=invoice.status,
|
||||
invoice_date=invoice.invoice_date + date_offset,
|
||||
due_date=invoice.due_date + date_offset,
|
||||
received_date=invoice.received_date + date_offset,
|
||||
subtotal=invoice.subtotal,
|
||||
tax_amount=invoice.tax_amount,
|
||||
shipping_cost=invoice.shipping_cost,
|
||||
discount_amount=invoice.discount_amount,
|
||||
total_amount=invoice.total_amount,
|
||||
currency=invoice.currency,
|
||||
paid_amount=invoice.paid_amount,
|
||||
payment_date=invoice.payment_date + date_offset if invoice.payment_date else None,
|
||||
payment_reference=invoice.payment_reference,
|
||||
approved_by=invoice.approved_by,
|
||||
approved_at=invoice.approved_at + date_offset if invoice.approved_at else None,
|
||||
rejection_reason=invoice.rejection_reason,
|
||||
notes=invoice.notes,
|
||||
invoice_document_url=invoice.invoice_document_url,
|
||||
created_at=datetime.now(timezone.utc),
|
||||
updated_at=datetime.now(timezone.utc),
|
||||
created_by=invoice.created_by
|
||||
)
|
||||
db.add(new_invoice)
|
||||
stats["invoices"] += 1
|
||||
|
||||
# Commit all changes
|
||||
await db.commit()
|
||||
|
||||
@@ -592,15 +352,11 @@ async def delete_demo_data(
|
||||
|
||||
# Count records
|
||||
supplier_count = await db.scalar(select(func.count(Supplier.id)).where(Supplier.tenant_id == virtual_uuid))
|
||||
po_count = await db.scalar(select(func.count(PurchaseOrder.id)).where(PurchaseOrder.tenant_id == virtual_uuid))
|
||||
price_list_count = await db.scalar(select(func.count(SupplierPriceList.id)).where(SupplierPriceList.tenant_id == virtual_uuid))
|
||||
quality_review_count = await db.scalar(select(func.count(SupplierQualityReview.id)).where(SupplierQualityReview.tenant_id == virtual_uuid))
|
||||
|
||||
# Delete in order (child tables first)
|
||||
await db.execute(delete(SupplierInvoice).where(SupplierInvoice.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(SupplierQualityReview).where(SupplierQualityReview.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(DeliveryItem).where(DeliveryItem.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(Delivery).where(Delivery.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(PurchaseOrderItem).where(PurchaseOrderItem.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(PurchaseOrder).where(PurchaseOrder.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(SupplierPriceList).where(SupplierPriceList.tenant_id == virtual_uuid))
|
||||
await db.execute(delete(Supplier).where(Supplier.tenant_id == virtual_uuid))
|
||||
await db.commit()
|
||||
@@ -614,8 +370,9 @@ async def delete_demo_data(
|
||||
"virtual_tenant_id": virtual_tenant_id,
|
||||
"records_deleted": {
|
||||
"suppliers": supplier_count,
|
||||
"purchase_orders": po_count,
|
||||
"total": supplier_count + po_count
|
||||
"price_lists": price_list_count,
|
||||
"quality_reviews": quality_review_count,
|
||||
"total": supplier_count + price_list_count + quality_review_count
|
||||
},
|
||||
"duration_ms": duration_ms
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user