Skip to content

Commit

Permalink
fix: fixed basket deletion issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Anas12091101 committed Aug 15, 2024
1 parent 1075d52 commit 5b41811
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
11 changes: 6 additions & 5 deletions ecommerce/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -771,12 +771,13 @@ def complete_order(order):
if order_coupon_ids:
set_coupons_to_redeemed(order.purchaser.email, order_coupon_ids)

baskets = Basket.objects.select_for_update(skip_locked=True).filter(
user=order.purchaser
)
with transaction.atomic():
baskets = Basket.objects.select_for_update(skip_locked=True).filter(
user=order.purchaser
)

# clear the basket
clear_and_delete_baskets(baskets)
# clear the basket
clear_and_delete_baskets(baskets)


def enroll_user_in_order_items(order):
Expand Down
15 changes: 8 additions & 7 deletions ecommerce/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from datetime import timedelta

from django.conf import settings

from django.db import transaction
from ecommerce.api import clear_and_delete_baskets
from ecommerce.models import Basket
from mitxpro.celery import app
Expand All @@ -21,9 +21,10 @@ def delete_expired_baskets(self):
cutoff_date = now_in_utc() - timedelta(days=settings.BASKET_EXPIRY_DAYS)
log.info("Starting the deletion of expired baskets at %s", now_in_utc())

expired_baskets = Basket.objects.select_for_update(skip_locked=True).filter(
updated_on__lte=cutoff_date
)
log.info("Found %d expired baskets to delete", len(expired_baskets))
if expired_baskets:
clear_and_delete_baskets(expired_baskets)
with transaction.atomic():
expired_baskets = Basket.objects.select_for_update(skip_locked=True).filter(
updated_on__lte=cutoff_date
)
log.info("Found %d expired baskets to delete", len(expired_baskets))
if expired_baskets:
clear_and_delete_baskets(expired_baskets)

0 comments on commit 5b41811

Please sign in to comment.