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.

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

Fix incorrect payment captured amount for Adyen #11705

Merged
merged 1 commit into from Jan 12, 2023

Conversation

korycins
Copy link
Member

Port of changes from: #11650
It looks like the 3.2+ had some Adyen fixes(#9504) that weren't ported to 3.1.
I tried to match the new fix with the old one. I also dropped some small part of the logic (it was something that was covered in the #11650 also), to match with the flow that already exist in 3.1.

Impact

  • New migrations
  • New/Updated API fields or mutations
  • Deprecated API fields or mutations
  • Removed API types, fields, or mutations
  • Documentation needs to be updated

Pull Request Checklist

  • Privileged queries and mutations are guarded by proper permission checks
  • Database queries are optimized and the number of queries is constant
  • Database migration files are up to date
  • The changes are tested
  • GraphQL schema and type definitions are up to date
  • Changes are mentioned in the changelog

@korycins korycins added the 3.4 label Jan 11, 2023
@korycins korycins self-assigned this Jan 11, 2023
@db-queries
Copy link

db-queries bot commented Jan 11, 2023

Here is the report for 1cbedcb (saleor:fix-adyen-incorrect-payment-captured-amount-3-4)
Missing base report (fbf37e8). The results couldn't be compared.

No differences were found.

# saleor.graphql.accountbenchmark account
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  addresses for federation query count                                    	          9	          9	              2
  customers query                                                         	         48	         48	              0
  delete staff members                                                    	         35	         35	              0
  query staff user                                                        	         18	         18	              3
  staff create                                                            	         23	         23	              3
  staff update groups and permissions                                     	         35	         35	              5
  users for federation query count                                        	          8	          8	              3

# saleor.graphql.accountbenchmark permission group
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  groups for federation query count                                       	          5	          5	              2
  permission group create                                                 	         21	         21	              2
  permission group delete                                                 	         22	         22	              3
  permission group query                                                  	          7	          7	              0
  permission group update                                                 	         35	         35	              1
  permission group update remove users with manage staff                  	         29	         29	              3

# saleor.graphql.appbenchmarks app extensions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  app extensions                                                          	         15	         15	              0
  app extensions with filter[filter0]                                     	         14	         14	              0
  app extensions with filter[filter1]                                     	         10	         10	              0
  app extensions with filter[filter2]                                     	         14	         14	              0
  app extensions with filter[filter3]                                     	         10	         10	              0

# saleor.graphql.appbenchmarks apps
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  apps for federation query count                                         	          9	          9	              3

# saleor.graphql.attributebenchmark attribute
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  attribute translation                                                   	          6	          6	              0
  attribute value translation                                             	         26	         26	              0
  query attribute                                                         	          6	          6	              0
  query attributes                                                        	          8	          8	              0

# saleor.graphql.checkoutbenchmark checkout mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  add billing address to checkout                                         	         46	         46	              4
  add checkout lines                                                      	         55	         55	              4
  add checkout lines with external shipping                               	         88	         88	             13
  add checkout lines with reservations                                    	        118	        118	             37
  add delivery to checkout                                                	         60	         60	              8
  add shipping to checkout                                                	         63	         63	              8
  checkout email update                                                   	         26	         26	              0
  checkout payment charge                                                 	         44	         44	             15
  checkout shipping address update                                        	         65	         65	             12
  checkout voucher code                                                   	         73	         73	             11
  complete checkout                                                       	        151	        151	             25
  complete checkout preorder                                              	        169	        169	             37
  complete checkout with digital line                                     	        211	        211	             51
  complete checkout with out of stock webhook                             	        153	        153	             25
  complete checkout with single line                                      	        153	        153	             25
  create checkout                                                         	         69	         69	             10
  create checkout for cc                                                  	         64	         64	              8
  create checkout with reservations                                       	        118	        118	             20
  customer complete checkout                                              	        166	        166	             29
  customer complete checkout for cc                                       	        169	        169	             32
  update checkout lines                                                   	         49	         49	              4
  update checkout lines with reservations                                 	        124	        124	             49

# saleor.graphql.checkoutbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  user checkout details                                                   	         42	         42	              3

# saleor.graphql.discountbenchmark sales
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  sales query with channel slug                                           	         19	         19	              0
  sales query withot channel slug                                         	         18	         18	              0

# saleor.graphql.discountbenchmark vouchers
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  vouchers query with channel slug                                        	         19	         19	              0
  vouchers query withot channel slug                                      	         18	         18	              0

# saleor.graphql.giftcardbenchmark gift card mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  create never expiry gift card                                           	         28	         28	              4
  gift card bulk activate by staff                                        	         16	         16	              3
  update gift card                                                        	         36	         36	              4

# saleor.graphql.giftcardbenchmark gift card queries
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  filter gift cards by products                                           	         14	         14	              3
  filter gift cards by tags                                               	         12	         12	              3
  filter gift cards by used by user                                       	         13	         13	              3
  query gift card details                                                 	         14	         14	              3
  query gift cards                                                        	         12	         12	              3

# saleor.graphql.orderbenchmark fulfillment
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment query                                                       	          9	          9	              0

# saleor.graphql.orderbenchmark fulfillment refund and return products
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment refund products order lines                                 	         56	         56	              2
  fulfillment return products order lines                                 	        108	        108	             12

# saleor.graphql.orderbenchmark order
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  staff multiple draft orders                                             	        542	        542	            436
  staff multiple orders                                                   	        162	        162	             86
  staff order details                                                     	         48	         48	              8
  user order details                                                      	         46	         46	              9

# saleor.graphql.orderbenchmark order fulfill
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order fulfill                                                           	         19	         19	              3
  order fulfill with gift cards                                           	         19	         19	              3

# saleor.graphql.pagebenchmark page type
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  page types for federation query count                                   	          3	          3	              0
  query page type                                                         	         18	         18	              6
  query page types                                                        	         25	         25	             12

# saleor.graphql.productbenchmark category
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  categories children                                                     	          3	          3	              0
  categories for federation query count                                   	          3	          3	              0
  category delete                                                         	         86	         86	             16
  category view                                                           	         26	         26	              1

# saleor.graphql.productbenchmark collection
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  collection add products                                                 	         36	         36	              6
  collection bulk delete                                                  	         47	         47	              8
  collection view                                                         	          6	          6	              0
  collections for federation query count                                  	          7	          7	              2
  create collection                                                       	         36	         36	              5
  delete collection                                                       	         39	         39	              7
  remove products from collection                                         	         33	         33	              6
  retrieve collection channel listings                                    	          5	          5	              0

# saleor.graphql.productbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  report product sales                                                    	         10	         10	              3
  retrieve product list                                                   	          4	          4	              0

# saleor.graphql.productbenchmark product
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  filter products by attributes                                           	          9	          9	              0
  filter products by boolean attributes                                   	         19	         19	              0
  filter products by gift card                                            	         11	         11	              1
  filter products by numeric attributes                                   	         18	         18	              0
  product create                                                          	         72	         72	              8
  product details                                                         	         33	         33	              0
  product translations                                                    	          5	          5	              0
  products for federation query count                                     	          6	          6	              2
  products media for federation query count                               	          3	          3	              0
  products types for federation query count                               	          2	          2	              0
  retrieve channel listings                                               	         17	         17	              0
  retrieve product attributes                                             	          9	          9	              0
  retrieve product images                                                 	          4	          4	              0
  retrieve product media                                                  	          4	          4	              0
  retrive products with product types and attributes                      	          7	          7	              0
  update product                                                          	         51	         51	             11

# saleor.graphql.productbenchmark product variant channel listing update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  variant channel listing update                                          	         45	         45	              3

# saleor.graphql.productbenchmark variant
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variant bulk create                                             	         68	         68	              3
  product variant create                                                  	         78	         78	              5
  products variants for federation query count                            	          6	          6	              2
  retrieve variant list                                                   	         28	         28	              2
  update product variant                                                  	         76	         76	              9

# saleor.graphql.productbenchmark variant stocks
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variants stocks create                                          	         26	         26	              4
  product variants stocks create with single webhook called               	         25	         25	              4
  product variants stocks delete                                          	         27	         27	              4
  product variants stocks delete with out of stock webhook many calls     	         23	         23	              3
  product variants stocks update                                          	         28	         28	              4
  query product variants stocks                                           	         10	         10	              0

# saleor.graphql.producttest product sorting attributes
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  sort product not having attribute data                                  	         23	         23	              0

# saleor.graphql.shippingbenchmark shipping methods
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  vouchers query with channel slug                                        	          9	          9	              0
  vouchers query without channel slug                                     	          9	          9	              0

# saleor.graphql.shopbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  retrieve shop                                                           	          4	          4	              0

# saleor.graphql.warehousebenchmark stocks
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  stocks query                                                            	          5	          5	              0

# saleor.graphql.webhookbenchmark webhook events
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  webhooks                                                                	          9	          9	              0

@codecov
Copy link

codecov bot commented Jan 11, 2023

Codecov Report

Merging #11705 (1cbedcb) into 3.4 (1459897) will increase coverage by 0.01%.
The diff coverage is 78.04%.

@@            Coverage Diff             @@
##              3.4   #11705      +/-   ##
==========================================
+ Coverage   93.31%   93.32%   +0.01%     
==========================================
  Files         600      600              
  Lines       47204    47202       -2     
  Branches     7964     7967       +3     
==========================================
+ Hits        44047    44051       +4     
+ Misses       2029     2024       -5     
+ Partials     1128     1127       -1     
Impacted Files Coverage Δ
saleor/account/models.py 94.21% <ø> (ø)
saleor/payment/gateways/adyen/plugin.py 86.85% <ø> (+1.19%) ⬆️
saleor/payment/gateways/adyen/webhooks.py 88.84% <77.41%> (-0.48%) ⬇️
saleor/payment/utils.py 93.86% <77.77%> (+0.06%) ⬆️
saleor/__init__.py 100.00% <100.00%> (ø)
saleor/warehouse/management.py 95.83% <0.00%> (+0.32%) ⬆️
...aleor/payment/gateways/dummy_credit_card/plugin.py 95.65% <0.00%> (+8.69%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@korycins korycins marked this pull request as ready for review January 11, 2023 12:47
@korycins korycins requested a review from a team January 11, 2023 12:48
@IKarbowiak IKarbowiak requested a review from a team January 11, 2023 13:05
@korycins korycins merged commit 7d23ef6 into 3.4 Jan 12, 2023
@korycins korycins deleted the fix-adyen-incorrect-payment-captured-amount-3-4 branch January 12, 2023 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants