Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lock checkoutComplete, create order from adyen notification #6048

Merged
merged 24 commits into from Sep 3, 2020
Merged

Lock checkoutComplete, create order from adyen notification #6048

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5bbe330
Init for locking checkoutComplete
Aug 24, 2020
7ca37db
Extract checkout logic from mutation. Fix tests
Aug 26, 2020
58c872f
Move test with digital product and checkoutComplete to test_checkout_…
Aug 27, 2020
d4284e5
Remove prints
Aug 27, 2020
a8d4ba0
Add tests for handle_capture
Aug 27, 2020
225a61f
Fix capture notification
Aug 27, 2020
5893575
Merge branch 'master' into adyen_lock_checkout_complete
Aug 28, 2020
f3a1ec6
Clean up code
Aug 28, 2020
67f85db
drop not needed type: ignore
Aug 28, 2020
14a853c
Merge branch 'master' into adyen_lock_checkout_complete
Aug 28, 2020
534f2d5
Extend temporary the msg of key error
Aug 28, 2020
f64d471
Drop additional info from faield response
Aug 31, 2020
c56ac05
Refactor after review
Aug 31, 2020
53f3089
Rebuild the lock for checkout. Reduce amount of queries
Sep 1, 2020
a3abc5f
Move all checkout complete logic to checkout_complete file.
Sep 1, 2020
3b9cafa
Merge branch 'master' into adyen_lock_checkout_complete
Sep 1, 2020
c38cc66
Rename abort_order_data
Sep 1, 2020
d25f194
remove integrity error as it is a subclass of DatabaseError
Sep 1, 2020
2ccb95f
Fix condition for void and refund
Sep 1, 2020
ca38344
Fix incorrect tax calculation for klarna
Sep 1, 2020
9e5c8a7
Add warning logger to notification
Sep 2, 2020
0f28c07
Cleanup the webhooks logic. Creae order after additional actions are …
Sep 3, 2020
76935d2
Convert uuid to str in mocks
Sep 3, 2020
4aace2a
Clean up code
Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 18 additions & 14 deletions saleor/graphql/checkout/utils.py → saleor/checkout/checkout_cleaner.py
View file
Open in desktop
@@ -1,27 +1,28 @@
from typing import Iterable, Union
from typing import Iterable, Optional, Type, Union

from django.core.exceptions import ValidationError

from ...checkout.error_codes import CheckoutErrorCode
from ...checkout.models import Checkout, CheckoutLine
from ...checkout.utils import is_fully_paid, is_valid_shipping_method
from ...discount import DiscountInfo
from ...payment.error_codes import PaymentErrorCode
from ..discount import DiscountInfo
from ..payment import gateway, models as payment_models
from ..payment.error_codes import PaymentErrorCode
from .error_codes import CheckoutErrorCode
from .models import Checkout, CheckoutLine
from .utils import is_fully_paid, is_valid_shipping_method


def clean_checkout_shipping(
checkout: Checkout,
lines: Iterable[CheckoutLine],
discounts: Iterable[DiscountInfo],
error_code: Union[CheckoutErrorCode, PaymentErrorCode],
error_code: Union[Type[CheckoutErrorCode], Type[PaymentErrorCode]],
):
if checkout.is_shipping_required():
if not checkout.shipping_method:
raise ValidationError(
{
"shipping_method": ValidationError(
"Shipping method is not set",
code=error_code.SHIPPING_METHOD_NOT_SET,
code=error_code.SHIPPING_METHOD_NOT_SET.value,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are those changes needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting:

Unexpected type(s): (str, Union[CheckoutErrorCode, PaymentErrorCode]) Possible types: (Any, Optional[str]) (Any, Optional[str])

And then it raises the exception on mypy:

saleor/checkout/checkout_cleaner.py:43: error: Argument "code" to "ValidationError" has incompatible type "Union[CheckoutErrorCode, PaymentErrorCode]"; expected "Optional[str]"  [arg-type]
Found 1 error in 1 file (checked 1 source file)

)
}
)
Expand All @@ -30,7 +31,7 @@ def clean_checkout_shipping(
{
"shipping_address": ValidationError(
"Shipping address is not set",
code=error_code.SHIPPING_ADDRESS_NOT_SET,
code=error_code.SHIPPING_ADDRESS_NOT_SET.value,
)
}
)
Expand All @@ -39,21 +40,22 @@ def clean_checkout_shipping(
{
"shipping_method": ValidationError(
"Shipping method is not valid for your shipping address",
code=error_code.INVALID_SHIPPING_METHOD,
code=error_code.INVALID_SHIPPING_METHOD.value,
)
}
)


def clean_billing_address(
checkout: Checkout, error_code: Union[CheckoutErrorCode, PaymentErrorCode],
checkout: Checkout,
error_code: Union[Type[CheckoutErrorCode], Type[PaymentErrorCode]],
):
if not checkout.billing_address:
raise ValidationError(
{
"billing_address": ValidationError(
"Billing address is not set",
code=error_code.BILLING_ADDRESS_NOT_SET,
code=error_code.BILLING_ADDRESS_NOT_SET.value,
)
}
)
Expand All @@ -63,11 +65,13 @@ def clean_checkout_payment(
checkout: Checkout,
lines: Iterable[CheckoutLine],
discounts: Iterable[DiscountInfo],
error_code: CheckoutErrorCode,
error_code: Type[CheckoutErrorCode],
last_payment: Optional[payment_models.Payment],
):
clean_billing_address(checkout, error_code)
if not is_fully_paid(checkout, lines, discounts):
gateway.payment_refund_or_void(last_payment)
raise ValidationError(
"Provided payment methods can not cover the checkout's total amount",
code=error_code.CHECKOUT_NOT_FULLY_PAID,
code=error_code.CHECKOUT_NOT_FULLY_PAID.value,
)