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 16, 2024
1 parent b20dc26 commit c15ca26
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
8 changes: 6 additions & 2 deletions ecommerce/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,15 @@ def clear_and_delete_baskets(user=None):
course_run_selections_ids = list(
course_run_selections.values_list("id", flat=True)
)
log.info("Deleting course run selections: %s", course_run_selections_ids)
log.info(
"Deleting course run selections: %s", course_run_selections_ids
)
course_run_selections.delete()

coupon_selections = basket.couponselection_set.all()
coupon_selections_ids = list(coupon_selections.values_list("id", flat=True))
coupon_selections_ids = list(
coupon_selections.values_list("id", flat=True)
)
log.info("Deleting coupon selections: %s", coupon_selections_ids)
coupon_selections.delete()

Expand Down
15 changes: 9 additions & 6 deletions ecommerce/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,9 @@ def test_delete_baskets_with_user_args(baskets_with_different_users):
clear_and_delete_baskets(user1)

assert Basket.objects.filter(user=user1).count() == 0
assert Basket.objects.filter(user=user2).count() == 1 # Not deleting basket of other users
assert (
Basket.objects.filter(user=user2).count() == 1
) # Not deleting basket of other users


@pytest.mark.parametrize("is_expired", [True, False])
Expand All @@ -1114,10 +1116,10 @@ def test_delete_expired_basket(mocker, user, basket_and_coupons, is_expired):
basket_and_coupons.basket.save()

if is_expired:
now_in_utc = mocker.patch("ecommerce.api.now_in_utc")
now_in_utc.return_value = datetime.datetime.now(
tz=datetime.timezone.utc
) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS)
now_in_utc = mocker.patch("ecommerce.api.now_in_utc")
now_in_utc.return_value = datetime.datetime.now(
tz=datetime.timezone.utc
) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS)
else:
mocker.patch("django.conf.settings.BASKET_EXPIRY_DAYS", 15)

Expand All @@ -1143,7 +1145,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
1 change: 0 additions & 1 deletion ecommerce/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def baskets_with_different_users():
user2 = UserFactory.create()
basket2 = BasketFactory.create(user=user2)


return SimpleNamespace(baskets=[basket1, basket2])


Expand Down

0 comments on commit c15ca26

Please sign in to comment.