Zubair django oscar31 test pr2

ecommerce/extensions/api/v2/tests/views/test_publication.py

@@ -260,11 +260,11 @@ def assert_seat_saved(self, course, expected, test_mobile_seats=False):
         if test_mobile_seats and verified_product:
             android_seat = course.seat_products.get(title='Android ' + seat_title)
             self.assertEqual(android_seat.expires, expires)
-            self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price'])
+            self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price, expected['price'])
 
             ios_seat = course.seat_products.get(title='Ios ' + seat_title)
             self.assertEqual(ios_seat.expires, expires)
-            self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price'])
+            self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price, expected['price'])
 
         return seat
 

ecommerce/extensions/catalogue/migrations/0058_auto_20240214_1243.py

@@ -0,0 +1,97 @@
+# Generated by Django 3.2.20 on 2024-02-14 12:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0057_add_app_store_id_product_attr'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='option',
+            options={'ordering': ['name'], 'verbose_name': 'Option', 'verbose_name_plural': 'Options'},
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='historicalcategory',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='historicalcategory',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='historicaloption',
+            name='required',
+            field=models.BooleanField(default=False, verbose_name='Is this option required?'),
+        ),
+        migrations.AddField(
+            model_name='historicalproduct',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='historicalproduct',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='option',
+            name='required',
+            field=models.BooleanField(default=False, verbose_name='Is this option required?'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloption',
+            name='name',
+            field=models.CharField(db_index=True, max_length=128, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloption',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='historicalproductattributevalue',
+            name='value_boolean',
+            field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='name',
+            field=models.CharField(db_index=True, max_length=128, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='productattributevalue',
+            name='value_boolean',
+            field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'),
+        ),
+    ]

ecommerce/extensions/payment/processors/stripe.py

@@ -166,7 +166,6 @@ def get_capture_context(self, request):
                     # don't create a new intent for the same basket
                     idempotency_key=self.generate_basket_pi_idempotency_key(basket),
                 )
-
                 # id is the payment_intent_id from Stripe
                 transaction_id = stripe_response['id']
 

ecommerce/extensions/voucher/management/commands/tests/test_update_voucher_names.py

@@ -13,13 +13,14 @@ class ManagementCommandTests(TestCase):
     def setUp(self):
         self.voucher_name = 'Test voucher'
         self.data = {
-            'name': self.voucher_name,
             'start_datetime': timezone.now(),
             'end_datetime': timezone.now() + timedelta(days=7)
         }
+
         for item in range(3):
             code = 'TESTCODE' + str(item)
-            Voucher.objects.create(code=code, **self.data)
+            name = self.voucher_name + str(item)
+            Voucher.objects.create(name=name, code=code, **self.data)
 
         self.LOGGER_NAME = 'ecommerce.extensions.voucher.management.commands.update_voucher_names'
 
@@ -43,7 +44,7 @@ def test_update_voucher_names_task(self):
         assert vouchers.count() == 3
 
         for voucher in vouchers:
-            assert voucher.name == f'{voucher.id} - {self.voucher_name}'
+            assert voucher.name[:-1] == f'{voucher.id} - {self.voucher_name}'
 
     @mock.patch('ecommerce.extensions.voucher.tasks.update_voucher_names_task.delay')
     def test_update_voucher_names_synchronous(self, mock_delay):
@@ -57,7 +58,7 @@ def test_update_voucher_names_synchronous(self, mock_delay):
         assert vouchers.count() == 3
 
         for voucher in vouchers:
-            assert voucher.name == f'{voucher.id} - {self.voucher_name}'
+            assert voucher.name[:-1] == f'{voucher.id} - {self.voucher_name}'
 
         mock_delay.assert_not_called()
 
@@ -114,15 +115,15 @@ def test_voucher_name_update_idempotent(self):
         vouchers = Voucher.objects.all()
         assert vouchers.count() == 3
         for voucher in vouchers:
-            assert voucher.name == self.voucher_name
+            assert voucher.name[:-1] == self.voucher_name
 
         # And after each time we run the command
         for _ in range(2):
             call_command('update_voucher_names', run_async=True)
 
             vouchers = Voucher.objects.all()
             for voucher in vouchers:
-                assert voucher.name == f'{voucher.id} - {self.voucher_name}'
+                assert voucher.name[:-1] == f'{voucher.id} - {self.voucher_name}'
 
     @mock.patch('ecommerce.extensions.voucher.tasks.update_voucher_names_task.delay')
     def test_update_voucher_names_command_failure(self, mock_delay):

ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.20 on 2023-11-14 11:20
+
+from django.core.paginator import Paginator
+from django.db import migrations
+
+
+def make_voucher_names_unique(apps, schema_editor):
+    """
+    Appends a number to voucher names.
+    """
+    Voucher = apps.get_model('voucher', 'Voucher')
+    vouchers = Voucher.objects.order_by('date_created')
+    paginator = Paginator(vouchers, 1000)
+
+    for page_number in paginator.page_range:
+        page = paginator.page(page_number)
+        updates = []
+
+        for obj in page.object_list:
+            if f"{obj.id} -" not in obj.name: 
+                obj.name = '%d - %s' % (obj.id, obj.name)
+                if len(obj.name) > 128:
+                    obj.name = obj.name[:128]
+                updates.append(obj)
+
+        Voucher.objects.bulk_update(updates, ['name'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('voucher', '0012_voucher_is_public'),
+    ]
+
+    operations = [
+        migrations.RunPython(make_voucher_names_unique, migrations.RunPython.noop),
+    ]