Django Oscar Upgrade to version 3.2

db_keyword_overrides.yml

@@ -13,5 +13,10 @@ MYSQL:
     - ShippingEvent.lines
     - PaymentEvent.lines
     - ProductAlert.key
+    - HistoricalOption.order
+    - Option.order
 SNOWFLAKE:
+    - HistoricalOption.order
+    - Option.order
+
 STITCH:

ecommerce/extensions/basket/migrations/0016_make_lineattribute_value_json_compatible.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from django.core.paginator import Paginator
+from django.db import migrations
+
+
+def make_lineattribute_value_json_compatible(apps, schema_editor):
+    """
+    Makes line attribute value json compatible.
+    """
+    LineAttribute = apps.get_model("basket", "LineAttribute")
+    attributes = LineAttribute.objects.order_by('id')
+    paginator = Paginator(attributes, 1000)
+
+    for page_number in paginator.page_range:
+        page = paginator.page(page_number)
+        updates = []
+
+        for obj in page.object_list:
+            obj.value = '"{}"'.format(obj.value)
+            updates.append(obj)
+
+        LineAttribute.objects.bulk_update(updates, ['value'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basket', '0015_add_paymentintentid'),
+    ]
+
+    operations = [
+        migrations.RunPython(make_lineattribute_value_json_compatible, migrations.RunPython.noop),
+    ]

ecommerce/extensions/basket/migrations/0017_alter_lineattribute_value.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.20 on 2023-12-05 10:34
+
+import django.core.serializers.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basket', '0016_make_lineattribute_value_json_compatible'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lineattribute',
+            name='value',
+            field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Value'),
+        ),
+    ]

ecommerce/extensions/catalogue/migrations/0057_auto_20231205_1034.py

@@ -0,0 +1,73 @@
+# Generated by Django 3.2.20 on 2023-12-05 10:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+import oscar.models.fields.slugfield
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0056_auto_20231108_1355'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='option',
+            options={'ordering': ['order', 'name'], 'verbose_name': 'Option', 'verbose_name_plural': 'Options'},
+        ),
+        migrations.AddField(
+            model_name='historicaloption',
+            name='help_text',
+            field=models.CharField(blank=True, help_text='Help text shown to the user on the add to basket form', max_length=255, null=True, verbose_name='Help text'),
+        ),
+        migrations.AddField(
+            model_name='historicaloption',
+            name='option_group',
+            field=models.ForeignKey(blank=True, db_constraint=False, help_text='Select an option group if using type "Option" or "Multi Option"', null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='catalogue.attributeoptiongroup', verbose_name='Option Group'),
+        ),
+        migrations.AddField(
+            model_name='historicaloption',
+            name='order',
+            field=models.IntegerField(blank=True, db_index=True, help_text='Controls the ordering of product options on product detail pages', null=True, verbose_name='Ordering'),
+        ),
+        migrations.AddField(
+            model_name='option',
+            name='help_text',
+            field=models.CharField(blank=True, help_text='Help text shown to the user on the add to basket form', max_length=255, null=True, verbose_name='Help text'),
+        ),
+        migrations.AddField(
+            model_name='option',
+            name='option_group',
+            field=models.ForeignKey(blank=True, help_text='Select an option group if using type "Option" or "Multi Option"', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='product_options', to='catalogue.attributeoptiongroup', verbose_name='Option Group'),
+        ),
+        migrations.AddField(
+            model_name='option',
+            name='order',
+            field=models.IntegerField(blank=True, db_index=True, help_text='Controls the ordering of product options on product detail pages', null=True, verbose_name='Ordering'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloption',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date'), ('select', 'Select'), ('radio', 'Radio'), ('multi_select', 'Multi select'), ('checkbox', 'Checkbox')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='historicalproduct',
+            name='slug',
+            field=oscar.models.fields.slugfield.SlugField(allow_unicode=True, max_length=255, verbose_name='Slug'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date'), ('select', 'Select'), ('radio', 'Radio'), ('multi_select', 'Multi select'), ('checkbox', 'Checkbox')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='slug',
+            field=oscar.models.fields.slugfield.SlugField(allow_unicode=True, max_length=255, verbose_name='Slug'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='productattribute',
+            unique_together={('code', 'product_class')},
+        ),
+    ]

ecommerce/extensions/order/migrations/0027_make_lineattribute_value_json_compatible.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from django.core.paginator import Paginator
+from django.db import migrations
+
+
+def make_lineattribute_value_json_compatible(apps, schema_editor):
+    """
+    Makes line attribute value json compatible.
+    """
+    LineAttribute = apps.get_model("order", "LineAttribute")
+    attributes = LineAttribute.objects.order_by('id')
+    paginator = Paginator(attributes, 1000)
+
+    for page_number in paginator.page_range:
+        page = paginator.page(page_number)
+        updates = []
+
+        for obj in page.object_list:
+            obj.value = '"{}"'.format(obj.value)
+            updates.append(obj)
+
+        LineAttribute.objects.bulk_update(updates, ['value'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0026_auto_20231108_1355'),
+    ]
+
+    operations = [
+        migrations.RunPython(make_lineattribute_value_json_compatible, migrations.RunPython.noop),
+    ]

ecommerce/extensions/order/migrations/0028_alter_lineattribute_value.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.20 on 2023-12-05 10:34
+
+import django.core.serializers.json
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('order', '0027_make_lineattribute_value_json_compatible'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lineattribute',
+            name='value',
+            field=models.JSONField(encoder=django.core.serializers.json.DjangoJSONEncoder, verbose_name='Value'),
+        ),
+    ]

requirements/base.txt

@@ -168,7 +168,7 @@ django-libsass==0.9
     # via -r requirements/base.in
 django-model-utils==4.3.1
     # via edx-rbac
-django-oscar==3.1
+django-oscar==3.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in

requirements/constraints.txt

@@ -15,7 +15,7 @@
 cybersource-rest-client-python==0.0.21
 
 # Django 3.2 support is added in version 2.2 so pinning it to 2.2
-django-oscar==3.1
+django-oscar==3.2
 
 # Pinned because transifex-client==0.13.6 pins it
 urllib3>=1.24.2,<2.0.0

requirements/dev.txt

@@ -253,7 +253,7 @@ django-model-utils==4.3.1
     # via
     #   -r requirements/test.txt
     #   edx-rbac
-django-oscar==3.1
+django-oscar==3.2
     # via -r requirements/test.txt
 django-phonenumber-field==5.0.0
     # via

requirements/production.txt

@@ -171,7 +171,7 @@ django-libsass==0.9
     # via -r requirements/base.in
 django-model-utils==4.3.1
     # via edx-rbac
-django-oscar==3.1
+django-oscar==3.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in

requirements/test.txt

@@ -241,7 +241,7 @@ django-model-utils==4.3.1
     # via
     #   -r requirements/base.txt
     #   edx-rbac
-django-oscar==3.1
+django-oscar==3.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt