Part of CartController->BatchController memoisation

registrasion/views.py

@@ -5,9 +5,10 @@ from registrasion import util
 from registrasion.models import commerce
 from registrasion.models import inventory
 from registrasion.models import people
-from registrasion.controllers.discount import DiscountController
+from registrasion.controllers.batch import BatchController
 from registrasion.controllers.cart import CartController
 from registrasion.controllers.credit_note import CreditNoteController
+from registrasion.controllers.discount import DiscountController
 from registrasion.controllers.invoice import InvoiceController
 from registrasion.controllers.product import ProductController
 from registrasion.exceptions import CartValidationError
@@ -170,6 +171,7 @@ def guided_registration(request):
             category__in=cats,
         ).select_related("category")
 
+        with BatchController.batch(request.user):
             available_products = set(ProductController.available_products(
                 request.user,
                 products=all_products,
@@ -181,7 +183,6 @@ def guided_registration(request):
                 attendee.save()
                 return next_step
 
-        with CartController.operations_batch(request.user):
             for category in cats:
                 products = [
                     i for i in available_products
@@ -345,6 +346,7 @@ def product_category(request, category_id):
     category_id = int(category_id)  # Routing is [0-9]+
     category = inventory.Category.objects.get(pk=category_id)
 
+    with BatchController.batch(request.user):
         products = ProductController.available_products(
             request.user,
             category=category,