Rename "session" field to "cart_id"

src/pretix/base/migrations/0004_auto_20151024_0848.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0003_event_is_public'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='cartposition',
+            old_name='session',
+            new_name='cart_id'
+        ),
+        migrations.AlterField(
+            model_name='cartposition',
+            name='cart_id',
+            field=models.CharField(blank=True, verbose_name='Cart ID (e.g. session key)', max_length=255, null=True),
+        ),
+    ]

src/pretix/base/models/orders.py

@@ -369,8 +369,8 @@ class CartPosition(ObjectWithAnswers, Versionable):
     :type event: Evnt
     :param item: The selected item
     :type item: Item
-    :param session: The user session that contains this cart position
-    :type session: str
+    :param cart_id: The user session that contains this cart position
+    :type cart_id: str
     :param variation: The selected ItemVariation or null, if the item has no properties
     :type variation: ItemVariation
     :param datetime: The datetime this item was put into the cart
@@ -386,9 +386,9 @@ class CartPosition(ObjectWithAnswers, Versionable):
         Event,
         verbose_name=_("Event")
     )
-    session = models.CharField(
+    cart_id = models.CharField(
         max_length=255, null=True, blank=True,
-        verbose_name=_("Session")
+        verbose_name=_("Cart ID (e.g. session key)")
     )
     item = VersionedForeignKey(
         Item,

src/pretix/base/payment.py

@@ -403,7 +403,7 @@ class FreeOrderProvider(BasePaymentProvider):
 
     def payment_is_valid_session(self, request: HttpRequest) -> bool:
         return CartPosition.objects.current.filter(
-            Q(session=request.session.session_key) & Q(event=request.event)
+            Q(cart_id=request.session.session_key) & Q(event=request.event)
         ).aggregate(sum=Sum('price'))['sum'] == 0
 
     @property
@@ -446,7 +446,7 @@ class FreeOrderProvider(BasePaymentProvider):
 
     def is_allowed(self, request: HttpRequest) -> bool:
         return CartPosition.objects.current.filter(
-            session=request.session.session_key, event=request.event
+            cart_id=request.session.session_key, event=request.event
         ).aggregate(sum=Sum('price'))['sum'] == 0
 
 

src/pretix/base/services/cart.py

@@ -29,21 +29,21 @@ error_messages = {
 }
 
 
-def _extend_existing(event, session, expiry):
+def _extend_existing(event, cart_id, expiry):
     # Extend this user's cart session to 30 minutes from now to ensure all items in the
     # cart expire at the same time
     # We can extend the reservation of items which are not yet expired without risk
     CartPosition.objects.current.filter(
-        Q(session=session) & Q(event=event) & Q(expires__gt=now())
+        Q(cart_id=cart_id) & Q(event=event) & Q(expires__gt=now())
     ).update(expires=expiry)
 
 
-def _re_add_expired_positions(items, event, session):
+def _re_add_expired_positions(items, event, cart_id):
     positions = set()
     # For items that are already expired, we have to delete and re-add them, as they might
     # be no longer available or prices might have changed. Sorry!
     expired = CartPosition.objects.current.filter(
-        Q(session=session) & Q(event=event) & Q(expires__lte=now())
+        Q(cart_id=cart_id) & Q(event=event) & Q(expires__lte=now())
     )
     for cp in expired:
         items.insert(0, (cp.item_id, cp.variation_id, 1, cp))
@@ -64,7 +64,7 @@ def _check_date(event):
         raise CartError(error_messages['ended'])
 
 
-def _add_items(event, items, session, expiry):
+def _add_items(event, items, cart_id, expiry):
     err = None
 
     # Fetch items from the database
@@ -124,33 +124,33 @@ def _add_items(event, items, session, expiry):
             else:
                 CartPosition.objects.create(
                     event=event, item=item, variation=variation, price=price, expires=expiry,
-                    session=session
+                    cart_id=cart_id
                 )
     return err
 
 
-def _add_items_to_cart(event: Event, items: list, session: str=None):
+def _add_items_to_cart(event: Event, items: list, cart_id: str=None):
     with event.lock():
         _check_date(event)
-        existing = CartPosition.objects.current.filter(Q(session=session) & Q(event=event)).count()
+        existing = CartPosition.objects.current.filter(Q(cart_id=cart_id) & Q(event=event)).count()
         if sum(i[2] for i in items) + existing > int(event.settings.max_items_per_order):
             # TODO: i18n plurals
             raise CartError(error_messages['max_items'] % event.settings.max_items_per_order)
 
         expiry = now() + timedelta(minutes=event.settings.get('reservation_time', as_type=int))
-        _extend_existing(event, session, expiry)
+        _extend_existing(event, cart_id, expiry)
 
-        expired = _re_add_expired_positions(items, event, session)
+        expired = _re_add_expired_positions(items, event, cart_id)
         if not items:
             raise CartError(error_messages['empty'])
 
-        err = _add_items(event, items, session, expiry)
+        err = _add_items(event, items, cart_id, expiry)
         _delete_expired(expired)
         if err:
             raise CartError(err)
 
 
-def add_items_to_cart(event: str, items: list, session: str=None):
+def add_items_to_cart(event: str, items: list, cart_id: str=None):
     """
     Adds a list of items to a user's cart.
     :param event: The event ID in question
@@ -160,12 +160,12 @@ def add_items_to_cart(event: str, items: list, session: str=None):
     """
     event = Event.objects.current.get(identity=event)
     try:
-        return _add_items_to_cart(event, items, session)
+        return _add_items_to_cart(event, items, cart_id)
     except EventLock.LockTimeoutException:
         raise CartError(error_messages['busy'])
 
 
-def remove_items_from_cart(event: str, items: list, session: str=None):
+def remove_items_from_cart(event: str, items: list, cart_id: str=None):
     """
     Removes a list of items from a user's cart.
     :param event: The event ID in question
@@ -175,7 +175,7 @@ def remove_items_from_cart(event: str, items: list, session: str=None):
     event = Event.objects.current.get(identity=event)
 
     for item, variation, cnt in items:
-        cw = Q(session=session) & Q(item_id=item) & Q(event=event)
+        cw = Q(cart_id=cart_id) & Q(item_id=item) & Q(event=event)
         if variation:
             cw &= Q(variation_id=variation)
         else:
@@ -188,10 +188,10 @@ if settings.HAS_CELERY:
     from pretix.celery import app
 
     @app.task(bind=True, max_retries=5, default_retry_delay=2)
-    def add_items_to_cart_task(self, event: str, items: list, session: str):
+    def add_items_to_cart_task(self, event: str, items: list, cart_id: str):
         event = Event.objects.current.get(identity=event)
         try:
-            return _add_items_to_cart(event, items, session)
+            return _add_items_to_cart(event, items, cart_id)
         except EventLock.LockTimeoutException:
             self.retry(exc=CartError(error_messages['busy']))
 

src/pretix/presale/checkoutflow.py

@@ -194,7 +194,7 @@ class PaymentStep(QuestionsViewMixin, CartMixin, TemplateFlowStep):
     @cached_property
     def _total_order_value(self):
         return CartPosition.objects.current.filter(
-            Q(session=self.request.session.session_key) & Q(event=self.request.event)
+            Q(cart_id=self.request.session.session_key) & Q(event=self.request.event)
         ).aggregate(sum=Sum('price'))['sum']
 
     @cached_property

src/pretix/presale/views/__init__.py

@@ -15,7 +15,7 @@ class CartMixin:
         A list of this users cart position
         """
         return list(CartPosition.objects.current.filter(
-            session=self.request.session.session_key, event=self.request.event
+            cart_id=self.request.session.session_key, event=self.request.event
         ).order_by(
             'item', 'variation'
         ).select_related(
@@ -27,7 +27,7 @@ class CartMixin:
 
     def get_cart(self, answers=False, queryset=None, payment_fee=None):
         queryset = queryset or CartPosition.objects.current.filter(
-            session=self.request.session.session_key, event=self.request.event
+            cart_id=self.request.session.session_key, event=self.request.event
         )
 
         prefetch = ['variation__values', 'variation__values__prop']