[3.20] Add dedicated fields for Adyen plugin #17949

lkostrowski · 2025-07-10T09:55:18Z

I want to remove deprecated raw_response from transaction (and model). Adyen plugin is still using it unfortunately.

Since the raw_response is arbitrary json and may have sensitive data, I want to drop it asap, but Adyen plugin must still persist status and payment method to work.

That's why I created 2 dedicated for Adyen fields on Transaction just for Adyen plugin. After grace period, plugin is meant to write to these dedicated fields and raw_response can be dropped. Added logs for that.

After we remove Adyen plugin, these fields will be removed

#17951
#17952

db-queries · 2025-07-10T10:11:03Z

Here is the report for 04f9f81 (saleor:migrate-adyen-plugin-fields)
Missing base report (ab2cbe7). 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                                                         	         51	         51	              0
  delete staff members                                                    	         40	         40	              0
  query staff user                                                        	         22	         22	              3
  staff create                                                            	         22	         22	              3
  staff update groups and permissions                                     	         35	         35	              6
  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                                       	          3	          3	              1
  permission group create                                                 	         24	         24	              0
  permission group delete                                                 	         29	         29	              3
  permission group query                                                  	         14	         14	              0
  permission group update                                                 	         43	         43	              2
  permission group update remove users with manage staff                  	         35	         35	              3

# saleor.graphql.appbenchmarks app extensions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  app extensions                                                          	         25	         25	             10
  app extensions with filter[filter0]                                     	         24	         24	             10
  app extensions with filter[filter1]                                     	         12	         12	              2
  app extensions with filter[filter2]                                     	         24	         24	             10
  app extensions with filter[filter3]                                     	         12	         12	              2

# saleor.graphql.appbenchmarks apps
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  apps for federation query count                                         	          9	          9	              3
  apps with tokens and webhooks                                           	          9	          9	              0

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

# saleor.graphql.channelbenchmark channel
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  channels query                                                          	          5	          5	              0

# saleor.graphql.channelmutations channel update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  channel update mutation remove warehouse                                	         39	         39	              6

# saleor.graphql.checkoutbenchmark checkout mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  add billing address to checkout                                         	         73	         73	              7
  add checkout lines                                                      	        105	        105	             15
  add checkout lines catalogue discount applies                           	        202	        202	             16
  add checkout lines gift discount applies                                	        164	        164	             24
  add checkout lines multiple catalogue discount applies                  	        217	        217	             21
  add checkout lines order discount applies                               	        178	        178	             19
  add checkout lines with external shipping                               	        186	        186	             73
  add checkout lines with reservations                                    	        213	        213	             76
  add delivery to checkout                                                	         92	         92	             14
  add shipping to checkout                                                	         93	         93	             14
  checkout email update                                                   	         52	         52	              3
  checkout payment charge                                                 	         68	         68	             19
  checkout shipping address update                                        	         85	         85	              9
  checkout voucher code                                                   	         98	         98	             13
  complete checkout                                                       	        230	        230	             68
  complete checkout preorder                                              	        217	        217	             63
  complete checkout with digital line                                     	        246	        246	             66
  complete checkout with out of stock webhook                             	        232	        232	             68
  complete checkout with single line                                      	        232	        232	             68
  create checkout                                                         	         80	         80	              5
  create checkout with gift promotion                                     	        117	        117	             14
  create checkout with order promotion                                    	        102	        102	              5
  create checkout with reservations                                       	        179	        179	             37
  customer complete checkout                                              	        243	        243	             74
  customer complete checkout for cc                                       	        220	        220	             67
  update checkout lines                                                   	         95	         95	             15
  update checkout lines with reservations                                 	        226	        226	             91

# saleor.graphql.checkoutbenchmark checkouts
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  staff multiple checkouts                                                	          6	          6	              0

# saleor.graphql.checkoutbenchmark homepage
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  user checkout details                                                   	         62	         62	              5
  user checkout details with tax app                                      	         94	         94	             32

# saleor.graphql.discountbenchmark promotion create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion create                                                        	         23	         23	              1
  promotion create order promotion                                        	         37	         37	              7

# saleor.graphql.discountbenchmark promotion delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  gift promotion delete                                                   	         25	         25	              1
  promotion delete                                                        	         30	         30	              1

# saleor.graphql.discountbenchmark promotion rule create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule create                                                   	         23	         23	              1
  promotion rule create gift                                              	        134	        134	              7

# saleor.graphql.discountbenchmark promotion rule delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule delete                                                   	         23	         23	              0

# saleor.graphql.discountbenchmark promotion rule update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion rule update                                                   	         38	         38	              0

# saleor.graphql.discountbenchmark promotion update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion update                                                        	         16	         16	              0

# saleor.graphql.discountbenchmark promotions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotions querytest promotions query                                   	          9	          9	              0

# saleor.graphql.discountbenchmark sales
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  sales query with channel slug                                           	          9	          9	              0
  sales query without channel slug                                        	          7	          7	              0

# saleor.graphql.discountbenchmark voucher code bulk delete
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  voucher code bulk delete queries                                        	         20	         20	              3

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

# saleor.graphql.giftcardbenchmark gift card mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  create never expiry gift card                                           	         27	         27	              4
  gift card bulk activate by staff                                        	         15	         15	              3
  update gift card                                                        	         35	         35	              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                                                       	          6	          6	              0

# saleor.graphql.orderbenchmark fulfillment refund and return products
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment refund products order lines                                 	         48	         48	              0
  fulfillment return products order lines                                 	         94	         94	              3

# saleor.graphql.orderbenchmark order
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  staff multiple draft orders                                             	          7	          7	              0
  staff multiple orders                                                   	          7	          7	              0
  staff order details                                                     	         53	         53	              7
  user order details                                                      	         50	         50	              8

# saleor.graphql.orderbenchmark order bulk create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order bulk create                                                       	         22	         22	              2

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

# saleor.graphql.orderbenchmark order lines create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order lines create                                                      	         96	         96	             17
  order lines create variants on promotion                                	        157	        157	             22

# 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.paymentbenchmark payment transactions
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  payment transactions                                                    	         54	         54	             20

# saleor.graphql.productbenchmark category
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  categories children                                                     	          4	          4	              1
  categories for federation query count                                   	          3	          3	              0
  category delete                                                         	         46	         46	              4
  category view                                                           	         28	         28	              1

# saleor.graphql.productbenchmark collection
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  collection add products                                                 	         22	         22	              5
  collection bulk delete                                                  	         27	         27	              4
  collection view                                                         	          7	          7	              0
  collections for federation query count                                  	          4	          4	              1
  create collection                                                       	         37	         37	              6
  delete collection                                                       	         40	         40	              6
  remove products from collection                                         	         19	         19	              5
  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                                           	          7	          7	              0
  filter products by boolean attributes                                   	         14	         14	              0
  filter products by gift card                                            	         12	         12	              1
  filter products by numeric attributes                                   	         13	         13	              0
  product create                                                          	         48	         48	              3
  product details                                                         	         40	         40	              2
  product translations                                                    	          5	          5	              0
  products for federation query count                                     	          6	          6	              2
  products media for federation query count                               	          5	          5	              0
  products types for federation query count                               	          2	          2	              0
  retrieve channel listings                                               	         21	         21	              0
  retrieve product attributes                                             	          8	          8	              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                                                          	         71	         71	              6

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

# saleor.graphql.productbenchmark variant
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variant bulk create                                             	         45	         45	              1
  product variant create                                                  	         61	         61	              3
  products variants for federation query count                            	          6	          6	              2
  retrieve variant list                                                   	         34	         34	              1
  update product variant                                                  	         59	         59	              6

# 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               	         26	         26	              4
  product variants stocks delete by id                                    	         31	         31	              4
  product variants stocks delete by sku                                   	         31	         31	              4
  product variants stocks delete with out of stock webhook many calls     	         27	         27	              3
  product variants stocks update by sku                                   	         28	         28	              4
  product variants stocks update byid                                     	         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                                  	         20	         20	              0

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

# saleor.graphql.shippingbenchmark shipping zones
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  shipping zones query                                                    	          6	          6	              0

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

# saleor.graphql.warehousebenchmark stock bulk update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  stocks bulk update queries count                                        	         31	         31	              6

# 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                                                                	          6	          6	              0

# saleor.orderbenchmark fetch order prices
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fetch order prices catalogue discount                                   	         52	         52	              8
  fetch order prices multiple catalogue discounts                         	        114	        114	             19

# saleor.ordertest fetch
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fetch draft order lines info                                            	         21	         21	              1

codecov · 2025-07-10T10:11:14Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.35%. Comparing base (5165f25) to head (04f9f81).
Report is 143 commits behind head on 3.20.

Additional details and impacted files

@@            Coverage Diff             @@
##             3.20   #17949      +/-   ##
==========================================
+ Coverage   94.19%   96.35%   +2.16%     
==========================================
  Files         949      964      +15     
  Lines       74821    75644     +823     
  Branches    11064        0   -11064     
==========================================
+ Hits        70477    72889    +2412     
+ Misses       2766     2755      -11     
+ Partials     1578        0    -1578

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot

Pull Request Overview

Adds two dedicated legacy fields to the Transaction model for the Adyen plugin so that the arbitrary and potentially sensitive raw_response can be dropped after a grace period.

Introduce legacy_adyen_plugin_result_code and legacy_adyen_plugin_payment_method fields and corresponding migration
Extend GatewayResponse and create_transaction to carry these new fields
Update Adyen gateway handlers and tests to populate and read from the new legacy fields

Reviewed Changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
saleor/payment/utils.py	Pass legacy Adyen fields into transaction creation
saleor/payment/models.py	Add legacy fields with deprecation note in Transaction model
saleor/payment/migrations/0061_transaction_legacy_adyen_plugin_...py	Add database migration for new legacy fields
saleor/payment/interface.py	Extend GatewayResponse dataclass to include legacy fields
saleor/payment/gateways/adyen/webhooks.py	Populate legacy fields when creating transactions from webhooks
saleor/payment/gateways/adyen/plugin.py	Populate and read legacy fields across Adyen plugin flows
saleor/payment/gateways/adyen/tests/test_plugin.py	Adjust test to pass new legacy fields

Comments suppressed due to low confidence (1)

saleor/payment/gateways/adyen/plugin.py:635

There are no existing tests covering the new fallback logic in confirm_payment. Add tests for cases when the legacy fields are present or absent (including verifying the deprecation warning) to ensure correct behavior during the migration period.

        if (not result_code_temporary_field) and (not payment_method_temporary_field):

saleor/payment/models.py

saleor/payment/interface.py

saleor/payment/gateways/adyen/plugin.py

Move Adyen Plugin fields

04f9f81

This was referenced Jul 10, 2025

Adyen plugin response fields 321 #17950

Closed

[3.21] Add dedicated fields for Adyen plugin #17951

Merged

Add dedicated fields for Adyen plugin #17952

Merged

lkostrowski changed the title ~~Move Adyen Plugin fields~~ [3.20] Add dedicated fields for Adyen plugin Jul 10, 2025

lkostrowski marked this pull request as ready for review July 11, 2025 06:07

lkostrowski requested review from a team and Copilot July 11, 2025 06:07

Copilot AI reviewed Jul 11, 2025

View reviewed changes

saleor/payment/models.py Show resolved Hide resolved

saleor/payment/interface.py Show resolved Hide resolved

IKarbowiak approved these changes Jul 14, 2025

View reviewed changes

saleor/payment/gateways/adyen/plugin.py Show resolved Hide resolved

saleor/payment/gateways/adyen/plugin.py Show resolved Hide resolved

IKarbowiak requested a review from a team July 14, 2025 07:39

fowczarek added 3.21 3.20 and removed 3.21 labels Jul 15, 2025

fowczarek approved these changes Jul 17, 2025

View reviewed changes

lkostrowski merged commit 56a4343 into 3.20 Jul 18, 2025
30 checks passed

lkostrowski deleted the migrate-adyen-plugin-fields branch July 18, 2025 08:58

maarcingebala mentioned this pull request Jul 22, 2025

Release 3.20.96 #17992

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[3.20] Add dedicated fields for Adyen plugin #17949

[3.20] Add dedicated fields for Adyen plugin #17949

Uh oh!

lkostrowski commented Jul 10, 2025 •

edited

Loading

Uh oh!

db-queries bot commented Jul 10, 2025

Uh oh!

codecov bot commented Jul 10, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

[3.20] Add dedicated fields for Adyen plugin #17949

[3.20] Add dedicated fields for Adyen plugin #17949

Uh oh!

Conversation

lkostrowski commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

db-queries bot commented Jul 10, 2025

Uh oh!

codecov bot commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lkostrowski commented Jul 10, 2025 •

edited

Loading

codecov bot commented Jul 10, 2025 •

edited

Loading