Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Aug 19, 2024
1 parent 6e67f59 commit 8e3d534
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
4 changes: 3 additions & 1 deletion ecommerce/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,9 @@ def clear_and_delete_baskets(user=None):
basket_filter = {"user": user} if user else {"updated_on__lte": cutoff_date}

with transaction.atomic():
baskets = Basket.objects.select_for_update(skip_locked=True).filter(**basket_filter)
baskets = Basket.objects.select_for_update(skip_locked=True).filter(
**basket_filter
)
log.info(
"Basket deletion requested for baskets Ids: %s",
[basket.id for basket in baskets],
Expand Down
17 changes: 12 additions & 5 deletions ecommerce/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ def test_delete_baskets_with_user_args():
Test to verify that the basket of the user passed in the clear_and_delete_baskets fn is deleted only
"""
baskets = BasketFactory.create_batch(2)

assert Basket.objects.filter(user=baskets[0].user).count() == 1
clear_and_delete_baskets(baskets[0].user)
assert Basket.objects.filter(user=baskets[0].user).count() == 0
Expand All @@ -1109,15 +1109,21 @@ def test_delete_expired_basket(patch_now):
"""
Test to verify that the expired baskets are deleted on calling clear_and_delete_baskets fn without user argument
"""
patch_now.return_value = datetime.datetime.now(tz=datetime.timezone.utc) - datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS)
patch_now.return_value = datetime.datetime.now(
tz=datetime.timezone.utc
) - datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS)
BasketFactory.create_batch(3)
patch_now.return_value = datetime.datetime.now(tz=datetime.timezone.utc) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS + 1)
patch_now.return_value = datetime.datetime.now(
tz=datetime.timezone.utc
) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS + 1)
unexpired_baskets = BasketFactory.create_batch(3)
patch_now.stop()
# Calling the clear baskets without user argument so it should delete the expired baskets
clear_and_delete_baskets()
assert Basket.objects.all().count() == 3
assert list(Basket.objects.all().values_list("id", flat=True)) == [basket.id for basket in unexpired_baskets]
assert list(Basket.objects.all().values_list("id", flat=True)) == [
basket.id for basket in unexpired_baskets
]


def test_complete_order(mocker, user, basket_and_coupons):
Expand All @@ -1137,7 +1143,8 @@ def test_complete_order(mocker, user, basket_and_coupons):
patched_enroll.assert_called_once_with(order)
patched_clear_and_delete_baskets.assert_called_once_with(mocker.ANY)
assert (
patched_clear_and_delete_baskets.call_args[0][0] == basket_and_coupons.basket.user
patched_clear_and_delete_baskets.call_args[0][0]
== basket_and_coupons.basket.user
)


Expand Down
2 changes: 0 additions & 2 deletions ecommerce/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from ecommerce.api import ValidatedBasket
from ecommerce.constants import DISCOUNT_TYPE_PERCENT_OFF
from ecommerce.factories import (
BasketFactory,
BasketItemFactory,
CompanyFactory,
CouponEligibilityFactory,
Expand All @@ -23,7 +22,6 @@
ProductVersionFactory,
)
from ecommerce.models import CourseRunSelection
from users.factories import UserFactory

CouponGroup = namedtuple( # noqa: PYI024
"CouponGroup", ["coupon", "coupon_version", "payment", "payment_version"]
Expand Down

0 comments on commit 8e3d534

Please sign in to comment.