Merge pull request #4315 from django-oscar/fix-line-allocations

[Fix] Set num_allocated to quantity if None

sandbox/fixtures/orders.json

@@ -59,6 +59,7 @@
         "unit_price_incl_tax": "7.99",
         "partner": 3,
         "order": 1,
+        "num_allocated": 1,
         "quantity": 1
     },
     "model": "order.line",

src/oscar/apps/order/abstract_models.py

@@ -623,9 +623,7 @@ class AbstractLine(models.Model):
     # own business processes.
     status = models.CharField(_("Status"), max_length=255, blank=True)
 
-    num_allocated = models.PositiveIntegerField(
-        _("Number allocated"), blank=True, null=True
-    )
+    num_allocated = models.PositiveIntegerField(_("Number allocated"))
 
     # Checks whether line allocation was cancelled or not
     allocation_cancelled = models.BooleanField(default=False)
@@ -888,7 +886,7 @@ class AbstractLine(models.Model):
         if self.allocation_cancelled:
             return False
 
-        return quantity <= (self.num_allocated or 0)
+        return quantity <= self.num_allocated
 
     def consume_allocation(self, quantity):
         if not self.can_track_allocations:

src/oscar/apps/order/migrations/0017_set_num_allocated_to_quantity.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.9 on 2024-06-03 8:06
+from django.db import migrations
+
+
+def update_line_num_allocated(apps, schema_editor):
+    Line = apps.get_model("order", "Line")
+    for line in Line.objects.all():
+        if line.num_allocated is None:
+            line.num_allocated = line.quantity
+            line.save(update_fields=["num_allocated"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('order', '0016_line_allocation_cancelled_line_num_allocated'),
+    ]
+
+    operations = [
+        migrations.RunPython(update_line_num_allocated, migrations.RunPython.noop),
+    ]

src/oscar/apps/order/migrations/0018_alter_line_num_allocated.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-06-14 15:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("order", "0017_set_num_allocated_to_quantity"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="line",
+            name="num_allocated",
+            field=models.PositiveIntegerField(verbose_name="Number allocated"),
+        ),
+    ]

src/oscar/test/factories/order.py

@@ -106,6 +106,7 @@ class OrderLineFactory(factory.django.DjangoModelFactory):
     partner_sku = factory.LazyAttribute(lambda x: x.product.upc)
     stockrecord = factory.LazyAttribute(lambda s: s.product.stockrecords.first())
     quantity = 1
+    num_allocated = 1
 
     line_price_incl_tax = factory.LazyAttribute(
         lambda obj: tax_add(obj.stockrecord.price) * obj.quantity

tests/integration/order/test_models.py

@@ -193,13 +193,6 @@ class LineTests(TestCase):
 
         self.assertTrue(actual)
 
-    def test_is_allocation_consumption_possible_when_num_allocated_is_null(self):
-        self.line.num_allocated = None
-
-        actual = self.line.is_allocation_consumption_possible(1)
-
-        self.assertFalse(actual)
-
     def event(self, event_type, quantity=None):
         """
         Creates a shipping event for the test line
@@ -447,8 +440,12 @@ class OrderTests(TestCase):
     def test_shipping_status(self):
         order = OrderFactory()
 
-        line_1 = OrderLineFactory(order=order, partner_sku="SKU1234", quantity=2)
-        line_2 = OrderLineFactory(order=order, partner_sku="SKU5678", quantity=1)
+        line_1 = OrderLineFactory(
+            order=order, partner_sku="SKU1234", quantity=2, num_allocated=2
+        )
+        line_2 = OrderLineFactory(
+            order=order, partner_sku="SKU5678", quantity=1, num_allocated=1
+        )
         self.assertEqual(order.shipping_status, "")
 
         event_1 = ShippingEventFactory(order=order, event_type__name="Shipped")