Feature/assign shipment

assignment/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2 on 2025-04-23 12:51
+# Generated by Django 5.2 on 2025-05-08 10:38
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -9,7 +9,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('fleet', '0001_initial'),
+        ('fleet', '0003_remove_fuelrecord_vehicle_and_more'),
+        ('shipments', '0002_remove_shipment_destination_warehouse_id_and_more'),
     ]
 
     operations = [
@@ -18,9 +19,26 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('delivery_locations', models.JSONField()),
+                ('started_at', models.DateTimeField(blank=True, null=True)),
+                ('completed_at', models.DateTimeField(blank=True, null=True)),
+                ('status', models.CharField(choices=[('created', 'Created'), ('dispatched', 'Dispatched'), ('partially_completed', 'Partially Completed'), ('completed', 'Completed'), ('failed', 'Failed'), ('reassigned', 'Reassigned')], default='created', max_length=32)),
                 ('total_load', models.PositiveIntegerField()),
                 ('vehicle', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='fleet.vehicle')),
             ],
         ),
+        migrations.CreateModel(
+            name='AssignmentItem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('delivery_sequence', models.PositiveIntegerField()),
+                ('delivery_location', models.JSONField()),
+                ('is_delivered', models.BooleanField(default=False)),
+                ('delivered_at', models.DateTimeField(blank=True, null=True)),
+                ('assignment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='assignment.assignment')),
+                ('shipment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='shipments.shipment')),
+            ],
+            options={
+                'ordering': ['delivery_sequence'],
+            },
+        ),
     ]

assignment/models/assignment.py

@@ -0,0 +1,26 @@
+from django.db import models
+from fleet.models import Vehicle
+
+class Assignment(models.Model):
+    vehicle = models.ForeignKey(Vehicle, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+    started_at = models.DateTimeField(null=True, blank=True)
+    completed_at = models.DateTimeField(null=True, blank=True)
+
+    status = models.CharField(
+        max_length=32,
+        choices=[
+            ('created', 'Created'),
+            ('dispatched', 'Dispatched'),
+            ('partially_completed', 'Partially Completed'),
+            ('completed', 'Completed'),
+            ('failed', 'Failed'),
+            ('reassigned', 'Reassigned'),
+        ],
+        default='created'
+    )
+
+    total_load = models.PositiveIntegerField()
+
+    def __str__(self):
+        return f"Assignment #{self.id} to Vehicle {self.vehicle.vehicle_id}"

assignment/models/assignment_item.py

@@ -0,0 +1,20 @@
+from django.db import models
+
+from assignment.models.assignment import Assignment
+from shipments.models import Shipment
+
+
+class AssignmentItem(models.Model):
+    assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE, related_name='items')
+    shipment = models.ForeignKey(Shipment, on_delete=models.CASCADE)
+    delivery_sequence = models.PositiveIntegerField()  # 1st, 2nd, 3rd drop, etc.
+    delivery_location = models.JSONField()  # { "lat": ..., "lng": ... }
+
+    is_delivered = models.BooleanField(default=False)
+    delivered_at = models.DateTimeField(null=True, blank=True)
+
+    class Meta:
+        ordering = ['delivery_sequence']
+
+    def __str__(self):
+        return f"Shipment {self.shipment.id} in Assignment {self.assignment.id}"

assignment/serializers.py

@@ -1,5 +1,7 @@
 from rest_framework import serializers
-from .models import Assignment
+
+from assignment.models.assignment import Assignment
+
 
 class AssignmentSerializer(serializers.ModelSerializer):
     class Meta:

assignment/services/assignment_planner.py

@@ -0,0 +1,91 @@
+import logging
+from typing import List
+from datetime import datetime
+
+from assignment.models.assignment import Assignment
+from assignment.models.assignment_item import AssignmentItem
+from assignment.services.mappers import map_vehicle_model
+from fleet.models import Vehicle
+from route_optimizer.services.vrp_solver import solve_cvrp
+from shipments.models import Shipment
+from route_optimizer.models.vrp_input import VRPInputBuilder, VRPCompiler, Location, DeliveryTask
+
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+class AssignmentPlanner:
+    def __init__(self, vehicles: List[Vehicle], shipments: List[Shipment]):
+        self.vehicles = vehicles
+        self.shipments = shipments
+
+    def plan_assignments(self) -> List[Assignment]:
+        logger.info("Planning assignments started.")
+        builder = VRPInputBuilder()
+
+        vehicle_map = {}
+        for v in self.vehicles:
+            logger.debug(f"Mapping vehicle: {v.vehicle_id}")
+            mapped_vehicle = map_vehicle_model(v)
+            builder.add_vehicle(mapped_vehicle)
+            vehicle_map[mapped_vehicle.id] = v
+        logger.info(f"{len(vehicle_map)} vehicles added to VRP input.")
+
+        shipment_map = {}
+        for s in self.shipments:
+            logger.debug(f"Adding shipment: {s.shipment_id} (demand={s.demand})")
+            builder.add_delivery_task(
+                DeliveryTask(
+                    id=str(s.id),
+                    pickup=Location(lat=s.origin["lat"], lon=s.origin["lng"]),
+                    delivery=Location(lat=s.destination["lat"], lon=s.destination["lng"]),
+                    demand=s.demand,
+                )
+            )
+            shipment_map[str(s.id)] = s
+        logger.info(f"{len(shipment_map)} shipments added to VRP input.")
+
+        vrp_input = VRPCompiler.compile(builder)
+        logger.debug(f"Compiled VRP input with {len(vrp_input.location_ids)} locations.")
+
+        result = solve_cvrp(vrp_input)
+        logger.info("Optimizer finished solving.")
+
+        if result["status"] != "success":
+            logger.error("Optimizer failed to find a solution.")
+            raise Exception("Optimization failed")
+
+        assignments = []
+        for i, route in enumerate(result["routes"]):
+            vehicle = self.vehicles[i]
+            logger.debug(f"Creating assignment for vehicle {vehicle.vehicle_id}, route: {route}")
+            assignment = Assignment.objects.create(
+                vehicle=vehicle,
+                total_load=sum(
+                    vrp_input.demands[node] for node in route if vrp_input.demands[node] > 0
+                ),
+                status='created'
+            )
+
+            seq = 1
+            for node in route:
+                if node in vrp_input.task_index_map:
+                    task_id, role = vrp_input.task_index_map[node]
+                    shipment = shipment_map[task_id]
+                    loc = shipment.destination if role == "delivery" else shipment.origin
+
+                    logger.debug(f"Adding {role} for shipment {shipment.shipment_id} at sequence {seq}")
+                    AssignmentItem.objects.create(
+                        assignment=assignment,
+                        shipment=shipment,
+                        delivery_sequence=seq,
+                        delivery_location={
+                            "lat": loc["lat"],
+                            "lng": loc["lng"],
+                        }
+                    )
+                    seq += 1
+
+            assignments.append(assignment)
+
+        logger.info(f"{len(assignments)} assignments successfully created.")
+        return assignments

assignment/services/mappers.py

@@ -0,0 +1,14 @@
+from route_optimizer.models.vrp_input import Vehicle as VRPVehicle, Location
+
+def map_vehicle_model(vehicle_model):
+    if vehicle_model.depot_latitude is None or vehicle_model.depot_longitude is None:
+        raise ValueError(f"Vehicle {vehicle_model.vehicle_id} missing depot coordinates")
+
+    return VRPVehicle(
+        id=vehicle_model.vehicle_id,
+        capacity=vehicle_model.capacity,
+        depot=Location(
+            lat=float(vehicle_model.depot_latitude),
+            lon=float(vehicle_model.depot_longitude)
+        )
+    )