karrio-server-manager 2026.1.1__py3-none-any.whl → 2026.1.4__py3-none-any.whl

karrio/server/manager/migrations/0070_add_meta_and_product_fields.py

@@ -0,0 +1,98 @@
+# Generated by Django 5.2.10 on 2026-01-16 00:43
+
+import functools
+import karrio.server.core.utils
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0069_alter_tracking_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="address",
+            name="meta",
+            field=models.JSONField(
+                blank=True,
+                default=functools.partial(
+                    karrio.server.core.utils.identity, *(), **{"value": {}}
+                ),
+                help_text="Template metadata: label, is_default, usage[]",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="parcel",
+            name="meta",
+            field=models.JSONField(
+                blank=True,
+                default=functools.partial(
+                    karrio.server.core.utils.identity, *(), **{"value": {}}
+                ),
+                help_text="Template metadata: label, is_default",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="commodity",
+            name="meta",
+            field=models.JSONField(
+                blank=True,
+                default=functools.partial(
+                    karrio.server.core.utils.identity, *(), **{"value": {}}
+                ),
+                help_text="Template metadata: label, is_default",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="billing_address_data",
+            field=models.JSONField(
+                blank=True, help_text="Billing address snapshot (JSON)", null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="customs_data",
+            field=models.JSONField(
+                blank=True, help_text="Customs information snapshot (JSON)", null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="parcels_data",
+            field=models.JSONField(
+                blank=True,
+                default=functools.partial(
+                    karrio.server.core.utils.identity, *(), **{"value": []}
+                ),
+                help_text="Parcels array with items (JSON)",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="recipient_data",
+            field=models.JSONField(
+                blank=True, help_text="Recipient address snapshot (JSON)", null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="return_address_data",
+            field=models.JSONField(
+                blank=True, help_text="Return address snapshot (JSON)", null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="shipment",
+            name="shipper_data",
+            field=models.JSONField(
+                blank=True, help_text="Shipper address snapshot (JSON)", null=True
+            ),
+        ),
+    ]

karrio/server/manager/migrations/0071_product_proxy.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.10 on 2026-01-16 00:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0070_add_meta_and_product_fields"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Product",
+            fields=[],
+            options={
+                "verbose_name": "Product",
+                "verbose_name_plural": "Products",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("manager.commodity",),
+        ),
+    ]

karrio/server/manager/migrations/0072_populate_json_fields.py

@@ -0,0 +1,267 @@
+# Data migration: Populate JSON fields from FK/M2M relations
+# Phase 2 of the Address/Parcel/Product refactoring
+
+from django.db import migrations
+
+
+def address_to_dict(address):
+    """Convert Address model instance to JSON dict."""
+    if address is None:
+        return None
+
+    return {
+        "id": address.id,
+        "postal_code": address.postal_code,
+        "city": address.city,
+        "country_code": address.country_code,
+        "federal_tax_id": address.federal_tax_id,
+        "state_tax_id": address.state_tax_id,
+        "person_name": address.person_name,
+        "company_name": address.company_name,
+        "email": address.email,
+        "phone_number": address.phone_number,
+        "state_code": address.state_code,
+        "suburb": address.suburb,
+        "residential": address.residential,
+        "street_number": address.street_number,
+        "address_line1": address.address_line1,
+        "address_line2": address.address_line2,
+        "validate_location": address.validate_location,
+        "validation": address.validation,
+    }
+
+
+def commodity_to_dict(commodity, id_prefix="cmd"):
+    """Convert Commodity model instance to JSON dict."""
+    if commodity is None:
+        return None
+
+    return {
+        "id": f"{id_prefix}_{commodity.id[-12:]}",  # Generate new JSON ID
+        "template_id": commodity.id,  # Keep reference to original
+        "weight": commodity.weight,
+        "weight_unit": commodity.weight_unit,
+        "quantity": commodity.quantity,
+        "sku": commodity.sku,
+        "title": commodity.title,
+        "description": commodity.description,
+        "value_amount": float(commodity.value_amount) if commodity.value_amount else None,
+        "value_currency": commodity.value_currency,
+        "origin_country": commodity.origin_country,
+        "hs_code": commodity.hs_code,
+        "product_url": commodity.product_url,
+        "image_url": commodity.image_url,
+        "metadata": commodity.metadata,
+        "parent_id": commodity.parent_id,  # Preserve parent reference
+    }
+
+
+def parcel_to_dict(parcel):
+    """Convert Parcel model instance to JSON dict with items."""
+    if parcel is None:
+        return None
+
+    items = [
+        commodity_to_dict(item, id_prefix="itm")
+        for item in parcel.items.all()
+    ]
+
+    return {
+        "id": f"pcl_{parcel.id[-12:]}",  # Generate new JSON ID
+        "template_id": parcel.id,  # Keep reference to original
+        "weight": parcel.weight,
+        "weight_unit": parcel.weight_unit,
+        "width": parcel.width,
+        "height": parcel.height,
+        "length": parcel.length,
+        "dimension_unit": parcel.dimension_unit,
+        "packaging_type": parcel.packaging_type,
+        "package_preset": parcel.package_preset,
+        "is_document": parcel.is_document,
+        "description": parcel.description,
+        "content": parcel.content,
+        "reference_number": parcel.reference_number,
+        "freight_class": parcel.freight_class,
+        "options": parcel.options,
+        "items": items,
+    }
+
+
+def customs_to_dict(customs):
+    """Convert Customs model instance to JSON dict with commodities."""
+    if customs is None:
+        return None
+
+    commodities = [
+        commodity_to_dict(c, id_prefix="cmd")
+        for c in customs.commodities.all()
+    ]
+
+    return {
+        "id": customs.id,
+        "content_type": customs.content_type,
+        "content_description": customs.content_description,
+        "incoterm": customs.incoterm,
+        "invoice": customs.invoice,
+        "invoice_date": str(customs.invoice_date) if customs.invoice_date else None,
+        "commercial_invoice": customs.commercial_invoice,
+        "certify": customs.certify,
+        "signer": customs.signer,
+        "duty": customs.duty,
+        "options": customs.options,
+        "duty_billing_address": address_to_dict(customs.duty_billing_address),
+        "commodities": commodities,
+    }
+
+
+def populate_shipment_json_fields(apps, schema_editor):
+    """Populate Shipment JSON fields from FK/M2M relations."""
+    Shipment = apps.get_model("manager", "Shipment")
+
+    # Process in batches to avoid memory issues
+    batch_size = 500
+    total = Shipment.objects.count()
+
+    for offset in range(0, total, batch_size):
+        shipments = Shipment.objects.select_related(
+            "shipper",
+            "recipient",
+            "return_address",
+            "billing_address",
+            "customs",
+            "customs__duty_billing_address",
+        ).prefetch_related(
+            "parcels",
+            "parcels__items",
+            "customs__commodities",
+        )[offset:offset + batch_size]
+
+        for shipment in shipments:
+            changes = []
+
+            # Populate shipper_data
+            if shipment.shipper and not shipment.shipper_data:
+                shipment.shipper_data = address_to_dict(shipment.shipper)
+                changes.append("shipper_data")
+
+            # Populate recipient_data
+            if shipment.recipient and not shipment.recipient_data:
+                shipment.recipient_data = address_to_dict(shipment.recipient)
+                changes.append("recipient_data")
+
+            # Populate return_address_data
+            if shipment.return_address and not shipment.return_address_data:
+                shipment.return_address_data = address_to_dict(shipment.return_address)
+                changes.append("return_address_data")
+
+            # Populate billing_address_data
+            if shipment.billing_address and not shipment.billing_address_data:
+                shipment.billing_address_data = address_to_dict(shipment.billing_address)
+                changes.append("billing_address_data")
+
+            # Populate parcels_data
+            if shipment.parcels.exists() and not shipment.parcels_data:
+                shipment.parcels_data = [
+                    parcel_to_dict(p) for p in shipment.parcels.all()
+                ]
+                changes.append("parcels_data")
+
+            # Populate customs_data
+            if shipment.customs and not shipment.customs_data:
+                shipment.customs_data = customs_to_dict(shipment.customs)
+                changes.append("customs_data")
+
+            if changes:
+                shipment.save(update_fields=changes)
+
+
+def line_item_to_dict(line_item):
+    """Convert LineItem/Commodity to JSON dict for orders."""
+    return {
+        "id": f"oli_{line_item.id[-12:]}",  # Generate new JSON ID
+        "template_id": line_item.id,  # Keep reference to original
+        "weight": line_item.weight,
+        "weight_unit": line_item.weight_unit,
+        "quantity": line_item.quantity,
+        "unfulfilled_quantity": getattr(line_item, "unfulfilled_quantity", line_item.quantity),
+        "sku": line_item.sku,
+        "title": line_item.title,
+        "description": line_item.description,
+        "value_amount": float(line_item.value_amount) if line_item.value_amount else None,
+        "value_currency": line_item.value_currency,
+        "origin_country": line_item.origin_country,
+        "hs_code": line_item.hs_code,
+        "product_url": line_item.product_url,
+        "image_url": line_item.image_url,
+        "metadata": line_item.metadata,
+    }
+
+
+def populate_order_json_fields(apps, schema_editor):
+    """Populate Order JSON fields from FK/M2M relations."""
+    Order = apps.get_model("orders", "Order")
+
+    # Process in batches
+    batch_size = 500
+    total = Order.objects.count()
+
+    for offset in range(0, total, batch_size):
+        orders = Order.objects.select_related(
+            "shipping_to",
+            "shipping_from",
+            "billing_address",
+        ).prefetch_related(
+            "line_items",
+        )[offset:offset + batch_size]
+
+        for order in orders:
+            changes = []
+
+            # Populate shipping_to_data
+            if order.shipping_to and not order.shipping_to_data:
+                order.shipping_to_data = address_to_dict(order.shipping_to)
+                changes.append("shipping_to_data")
+
+            # Populate shipping_from_data
+            if order.shipping_from and not order.shipping_from_data:
+                order.shipping_from_data = address_to_dict(order.shipping_from)
+                changes.append("shipping_from_data")
+
+            # Populate billing_address_data
+            if order.billing_address and not order.billing_address_data:
+                order.billing_address_data = address_to_dict(order.billing_address)
+                changes.append("billing_address_data")
+
+            # Populate line_items_data
+            if order.line_items.exists() and not order.line_items_data:
+                order.line_items_data = [
+                    line_item_to_dict(item) for item in order.line_items.all()
+                ]
+                changes.append("line_items_data")
+
+            if changes:
+                order.save(update_fields=changes)
+
+
+def reverse_noop(apps, schema_editor):
+    """Reverse migration is a no-op - data remains in both fields."""
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0071_product_proxy"),
+        ("orders", "0021_add_json_fields"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            populate_shipment_json_fields,
+            reverse_noop,
+        ),
+        migrations.RunPython(
+            populate_order_json_fields,
+            reverse_noop,
+        ),
+    ]

karrio/server/manager/migrations/0073_make_shipment_fk_nullable.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.10 on 2026-01-16 11:40
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0072_populate_json_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="shipment",
+            name="recipient",
+            field=models.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="recipient_shipment",
+                to="manager.address",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="shipment",
+            name="shipper",
+            field=models.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="shipper_shipment",
+                to="manager.address",
+            ),
+        ),
+    ]

karrio/server/manager/migrations/0074_clean_model_refactoring.py

@@ -0,0 +1,207 @@
+# Clean model refactoring migration
+# This migration completes the JSON field migration by:
+# 1. Adding JSON address field to Pickup and Manifest
+# 2. Populating Pickup and Manifest address data from FK
+# 3. Dropping legacy FK/M2M fields from Shipment
+# 4. Renaming *_data fields to direct names (removing suffix)
+# 5. Renaming tables to plural form
+
+import functools
+from django.db import migrations, models
+import karrio.server.core.utils
+
+
+def address_to_dict(address):
+    """Convert Address model instance to JSON dict."""
+    if address is None:
+        return None
+
+    return {
+        "id": address.id,
+        "object_type": "address",
+        "postal_code": address.postal_code,
+        "city": address.city,
+        "country_code": address.country_code,
+        "federal_tax_id": address.federal_tax_id,
+        "state_tax_id": address.state_tax_id,
+        "person_name": address.person_name,
+        "company_name": address.company_name,
+        "email": address.email,
+        "phone_number": address.phone_number,
+        "state_code": address.state_code,
+        "suburb": address.suburb,
+        "residential": address.residential,
+        "street_number": address.street_number,
+        "address_line1": address.address_line1,
+        "address_line2": address.address_line2,
+        "validate_location": address.validate_location,
+        "validation": address.validation,
+    }
+
+
+def populate_pickup_manifest_json(apps, schema_editor):
+    """Populate JSON address fields for Pickup and Manifest from FK."""
+    Pickup = apps.get_model("manager", "Pickup")
+    Manifest = apps.get_model("manager", "Manifest")
+
+    # Populate Pickup address_data
+    for pickup in Pickup.objects.select_related("address").all():
+        if pickup.address and not pickup.address_data:
+            pickup.address_data = address_to_dict(pickup.address)
+            pickup.save(update_fields=["address_data"])
+
+    # Populate Manifest address_data
+    for manifest in Manifest.objects.select_related("address").all():
+        if manifest.address and not manifest.address_data:
+            manifest.address_data = address_to_dict(manifest.address)
+            manifest.save(update_fields=["address_data"])
+
+
+def reverse_noop(apps, schema_editor):
+    """Reverse migration is a no-op."""
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("manager", "0073_make_shipment_fk_nullable"),
+    ]
+
+    operations = [
+        # =========================================================
+        # STEP 1: Add JSON fields to Pickup and Manifest
+        # =========================================================
+        migrations.AddField(
+            model_name="pickup",
+            name="address_data",
+            field=models.JSONField(
+                blank=True,
+                null=True,
+                help_text="Pickup address (embedded JSON)",
+            ),
+        ),
+        migrations.AddField(
+            model_name="manifest",
+            name="address_data",
+            field=models.JSONField(
+                blank=True,
+                null=True,
+                help_text="Manifest address (embedded JSON)",
+            ),
+        ),
+
+        # =========================================================
+        # STEP 2: Populate JSON fields from FK
+        # =========================================================
+        migrations.RunPython(
+            populate_pickup_manifest_json,
+            reverse_noop,
+        ),
+
+        # =========================================================
+        # STEP 3: Drop Shipment legacy FK/M2M fields
+        # =========================================================
+        # Drop FK fields (addresses)
+        migrations.RemoveField(
+            model_name="shipment",
+            name="shipper",
+        ),
+        migrations.RemoveField(
+            model_name="shipment",
+            name="recipient",
+        ),
+        migrations.RemoveField(
+            model_name="shipment",
+            name="return_address",
+        ),
+        migrations.RemoveField(
+            model_name="shipment",
+            name="billing_address",
+        ),
+        migrations.RemoveField(
+            model_name="shipment",
+            name="customs",
+        ),
+        # Drop M2M field (parcels)
+        migrations.RemoveField(
+            model_name="shipment",
+            name="parcels",
+        ),
+
+        # =========================================================
+        # STEP 4: Drop Pickup and Manifest legacy FK fields
+        # =========================================================
+        migrations.RemoveField(
+            model_name="pickup",
+            name="address",
+        ),
+        migrations.RemoveField(
+            model_name="manifest",
+            name="address",
+        ),
+
+        # =========================================================
+        # STEP 5: Rename Shipment *_data fields to direct names
+        # =========================================================
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="shipper_data",
+            new_name="shipper",
+        ),
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="recipient_data",
+            new_name="recipient",
+        ),
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="return_address_data",
+            new_name="return_address",
+        ),
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="billing_address_data",
+            new_name="billing_address",
+        ),
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="parcels_data",
+            new_name="parcels",
+        ),
+        migrations.RenameField(
+            model_name="shipment",
+            old_name="customs_data",
+            new_name="customs",
+        ),
+
+        # =========================================================
+        # STEP 6: Rename Pickup and Manifest address_data fields
+        # =========================================================
+        migrations.RenameField(
+            model_name="pickup",
+            old_name="address_data",
+            new_name="address",
+        ),
+        migrations.RenameField(
+            model_name="manifest",
+            old_name="address_data",
+            new_name="address",
+        ),
+
+        # =========================================================
+        # STEP 7: Rename tables to plural form
+        # =========================================================
+        migrations.AlterModelTable(
+            name="shipment",
+            table="shipments",
+        ),
+        migrations.AlterModelTable(
+            name="pickup",
+            table="pickups",
+        ),
+        migrations.AlterModelTable(
+            name="manifest",
+            table="manifests",
+        ),
+    ]