Lock checkoutComplete, create order from adyen notification #6048

korycins · 2020-08-24T10:21:09Z

refactor checkoutComplete mutation
extract whole checkoutComplete logic to separate file
use checkout_complete logic to create order from Adyen notification
apply lock for handling the adyen notifciation and mutation checkoutComplete

lgtm-com · 2020-08-24T10:56:14Z

This pull request fixes 2 alerts when merging 5bbe330 into 628e980 - view on LGTM.com

fixed alerts:

2 for Unused local variable

lgtm-com · 2020-08-26T11:25:00Z

This pull request fixes 2 alerts when merging 7ca37db into 527c92b - view on LGTM.com

fixed alerts:

2 for Unused local variable

codecov · 2020-08-26T15:05:27Z

Codecov Report

Merging #6048 into master will increase coverage by 0.08%.
The diff coverage is 86.60%.

@@            Coverage Diff             @@
##           master    #6048      +/-   ##
==========================================
+ Coverage   91.73%   91.82%   +0.08%     
==========================================
  Files         387      389       +2     
  Lines       25338    25699     +361     
  Branches     2382     2451      +69     
==========================================
+ Hits        23243    23597     +354     
- Misses       1509     1514       +5     
- Partials      586      588       +2

Impacted Files	Coverage Δ
saleor/payment/utils.py	`87.71% <0.00%> (ø)`
saleor/payment/gateways/adyen/plugin.py	`77.30% <33.33%> (-0.27%)`	⬇️
saleor/payment/gateways/adyen/utils.py	`93.75% <71.42%> (-0.52%)`	⬇️
saleor/core/transactions.py	`85.71% <85.71%> (ø)`
saleor/graphql/checkout/mutations.py	`95.01% <85.71%> (+1.34%)`	⬆️
saleor/payment/gateways/adyen/webhooks.py	`81.11% <86.31%> (+1.04%)`	⬆️
saleor/checkout/complete_checkout.py	`88.00% <88.00%> (ø)`
saleor/checkout/checkout_cleaner.py	`100.00% <100.00%> (ø)`
saleor/checkout/models.py	`95.45% <100.00%> (+0.08%)`	⬆️
saleor/checkout/utils.py	`86.87% <100.00%> (-0.48%)`	⬇️
... and 15 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c451e87...4aace2a. Read the comment docs.

fowczarek

For now it great.

…complete. Fix incorrect mock patchess

lgtm-com · 2020-08-27T11:10:56Z

This pull request fixes 2 alerts when merging 58c872f into 527c92b - view on LGTM.com

fixed alerts:

2 for Unused local variable

lgtm-com · 2020-08-27T12:40:33Z

This pull request fixes 2 alerts when merging a8d4ba0 into 527c92b - view on LGTM.com

fixed alerts:

2 for Unused local variable

patrys · 2020-08-27T15:34:30Z

Are the schema changes intentional?

lgtm-com · 2020-08-27T16:06:40Z

This pull request fixes 2 alerts when merging 225a61f into bf87e63 - view on LGTM.com

fixed alerts:

2 for Unused local variable

korycins · 2020-08-28T06:49:04Z

Are the schema changes intentional?

@patrys , I didn't add any changes for schema. Not sure why it raises the error. I assume that I need to update my branch with master

patrys · 2020-09-01T12:23:58Z

@korycins Was this branch rebased after the test change that increased the number of queries on master? Trying to make sure we're not comparing apples to oranges here.

korycins · 2020-09-01T12:25:46Z

@patrys Yes. I did that to get the current number of queries. - commit 3b9cafa

patrys · 2020-09-01T12:29:34Z

saleor/checkout/checkout_cleaner.py

 ):
    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,


Why are those changes needed?

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)

saleor/core/transactions.py

lgtm-com · 2020-09-01T16:52:47Z

This pull request fixes 2 alerts when merging ca38344 into c1d39ce - view on LGTM.com

fixed alerts:

2 for Unused local variable

saleor/core/transactions.py

lgtm-com · 2020-09-02T11:47:50Z

This pull request fixes 2 alerts when merging 9e5c8a7 into 344dffc - view on LGTM.com

fixed alerts:

2 for Unused local variable

…done

lgtm-com · 2020-09-03T09:53:03Z

This pull request fixes 2 alerts when merging 76935d2 into 344dffc - view on LGTM.com

fixed alerts:

2 for Unused local variable

lgtm-com · 2020-09-03T10:38:02Z

This pull request fixes 2 alerts when merging 4aace2a into 344dffc - view on LGTM.com

fixed alerts:

2 for Unused local variable

Init for locking checkoutComplete

5bbe330

korycins self-assigned this Aug 24, 2020

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 24, 2020 10:21 Inactive

Extract checkout logic from mutation. Fix tests

7ca37db

korycins requested a review from fowczarek August 26, 2020 10:51

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 26, 2020 10:54 Inactive

fowczarek approved these changes Aug 27, 2020

View reviewed changes

Move test with digital product and checkoutComplete to test_checkout_…

58c872f

…complete. Fix incorrect mock patchess

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 27, 2020 10:37 Inactive

Maciej Korycinski added 2 commits August 27, 2020 13:27

Remove prints

d4284e5

Add tests for handle_capture

a8d4ba0

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 27, 2020 12:09 Inactive

Fix capture notification

225a61f

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 27, 2020 15:29 Inactive

korycins requested review from IKarbowiak, fowczarek, d-wysocki and tomaszszymanski129 August 27, 2020 15:32

korycins marked this pull request as ready for review August 27, 2020 15:32

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 27, 2020 22:16 Inactive

Merge branch 'master' into adyen_lock_checkout_complete

5893575

github-actions bot temporarily deployed to adyen-lock-checkout-complete August 28, 2020 07:01 Inactive

patrys reviewed Sep 1, 2020

View reviewed changes

saleor/core/transactions.py Outdated Show resolved Hide resolved

maarcingebala approved these changes Sep 1, 2020

View reviewed changes

Maciej Korycinski added 3 commits September 1, 2020 14:47

remove integrity error as it is a subclass of DatabaseError

d25f194

Fix condition for void and refund

2ccb95f

Fix incorrect tax calculation for klarna

ca38344

korycins requested review from IKarbowiak and fowczarek September 1, 2020 16:20

github-actions bot temporarily deployed to adyen-lock-checkout-complete September 1, 2020 16:20 Inactive

IKarbowiak reviewed Sep 2, 2020

View reviewed changes

saleor/core/transactions.py Show resolved Hide resolved

IKarbowiak approved these changes Sep 2, 2020

View reviewed changes

Add warning logger to notification

9e5c8a7

github-actions bot temporarily deployed to adyen-lock-checkout-complete September 2, 2020 11:15 Inactive

fowczarek approved these changes Sep 3, 2020

View reviewed changes

korycins added the in progress label Sep 3, 2020

Cleanup the webhooks logic. Creae order after additional actions are …

0f28c07

…done

github-actions bot temporarily deployed to adyen-lock-checkout-complete September 3, 2020 09:02 Inactive

Convert uuid to str in mocks

76935d2

github-actions bot temporarily deployed to adyen-lock-checkout-complete September 3, 2020 09:20 Inactive

Clean up code

4aace2a

korycins removed the in progress label Sep 3, 2020

github-actions bot temporarily deployed to adyen-lock-checkout-complete September 3, 2020 10:05 Inactive

maarcingebala merged commit a242fb6 into master Sep 3, 2020

maarcingebala deleted the adyen_lock_checkout_complete branch September 3, 2020 10:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Lock checkoutComplete, create order from adyen notification #6048

Lock checkoutComplete, create order from adyen notification #6048

korycins commented Aug 24, 2020 •

edited

lgtm-com bot commented Aug 24, 2020

lgtm-com bot commented Aug 26, 2020

codecov bot commented Aug 26, 2020 •

edited

fowczarek left a comment

lgtm-com bot commented Aug 27, 2020

lgtm-com bot commented Aug 27, 2020

patrys commented Aug 27, 2020

lgtm-com bot commented Aug 27, 2020

korycins commented Aug 28, 2020 •

edited

patrys commented Sep 1, 2020

korycins commented Sep 1, 2020

patrys Sep 1, 2020

korycins Sep 1, 2020

lgtm-com bot commented Sep 1, 2020

lgtm-com bot commented Sep 2, 2020

lgtm-com bot commented Sep 3, 2020

lgtm-com bot commented Sep 3, 2020

Lock checkoutComplete, create order from adyen notification #6048

Lock checkoutComplete, create order from adyen notification #6048

Conversation

korycins commented Aug 24, 2020 • edited

lgtm-com bot commented Aug 24, 2020

lgtm-com bot commented Aug 26, 2020

codecov bot commented Aug 26, 2020 • edited

Codecov Report

fowczarek left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Aug 27, 2020

lgtm-com bot commented Aug 27, 2020

patrys commented Aug 27, 2020

lgtm-com bot commented Aug 27, 2020

korycins commented Aug 28, 2020 • edited

patrys commented Sep 1, 2020

korycins commented Sep 1, 2020

patrys Sep 1, 2020

Choose a reason for hiding this comment

korycins Sep 1, 2020

Choose a reason for hiding this comment

lgtm-com bot commented Sep 1, 2020

lgtm-com bot commented Sep 2, 2020

lgtm-com bot commented Sep 3, 2020

lgtm-com bot commented Sep 3, 2020

korycins commented Aug 24, 2020 •

edited

codecov bot commented Aug 26, 2020 •

edited

korycins commented Aug 28, 2020 •

edited