Clean up order discounts #16116

IKarbowiak · 2024-06-11T09:01:36Z

Fix applying shipping voucher
Update TaxableObject.shipping_price resolver for Order
Update TaxableObject.discounts resolver - only discounts not applied yet should be returned - ENTIRE_ORDER voucher and manual discounts (for now it will also return the apply_once_per_order voucher as it's not included in line prices for draft orders)
Update descriptions for unit_price and total_price on TaxableObjectLine type

Internal issue: https://linear.app/saleor/issue/SHOPX-845/discounts-api-returns-empty-response-when-there-are-discounts-applied

Fixes #14884

Impact

New migrations
New/Updated API fields or mutations
Deprecated API fields or mutations
Removed API types, fields, or mutations

Docs

Link to documentation:

Pull Request Checklist

Privileged queries and mutations are either absent or guarded by proper permission checks
Database queries are optimized and the number of queries is constant
Database migrations are either absent or optimized for zero downtime
The changes are covered by test cases
All new fields/inputs/mutations have proper labels added (ADDED_IN_X, PREVIEW_FEATURE, etc.)
All migrations have proper dependencies
All indexes are added concurrently in migrations
All RunSql and RunPython migrations have revert option defined

…ce resolver for Order

db-queries · 2024-06-11T09:25:51Z

Here is the report for f649670 (saleor:SHOPX-845-clean-up-discount-instances)
Missing base report (11967b0). 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	              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                                       	          3	          3	              0
  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                                                          	         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
  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                                         	         79	         79	             10
  add checkout lines                                                      	         91	         91	             14
  add checkout lines catalogue discount applies                           	        189	        189	             15
  add checkout lines gift discount applies                                	        154	        154	             23
  add checkout lines multiple catalogue discount applies                  	        204	        204	             20
  add checkout lines order discount applies                               	        167	        167	             18
  add checkout lines with external shipping                               	        193	        193	             77
  add checkout lines with reservations                                    	        191	        191	             66
  add delivery to checkout                                                	         87	         87	             14
  add shipping to checkout                                                	         97	         97	             19
  checkout email update                                                   	         45	         45	              2
  checkout payment charge                                                 	         60	         60	             17
  checkout shipping address update                                        	         91	         91	             11
  checkout voucher code                                                   	        104	        104	             17
  complete checkout                                                       	        249	        249	             85
  complete checkout preorder                                              	        240	        240	             83
  complete checkout with digital line                                     	        283	        283	             96
  complete checkout with out of stock webhook                             	        251	        251	             85
  complete checkout with single line                                      	        251	        251	             85
  create checkout                                                         	         86	         86	              9
  create checkout with gift promotion                                     	        126	        126	             19
  create checkout with order promotion                                    	        108	        108	              9
  create checkout with reservations                                       	        157	        157	             28
  customer complete checkout                                              	        262	        262	             91
  customer complete checkout for cc                                       	        233	        233	             78
  update checkout lines                                                   	         84	         84	             14
  update checkout lines with reservations                                 	        197	        197	             79

# 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                                                   	         63	         63	              6
  user checkout details with tax app                                      	         85	         85	             28

# 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	              2

# 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                                 	         61	         61	              0
  fulfillment return products order lines                                 	        103	        103	              7

# 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                                                     	         57	         57	              7
  user order details                                                      	         55	         55	              8

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

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

# saleor.graphql.orderbenchmark order lines create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order lines create                                                      	         95	         95	             17
  order lines create variants on promotion                                	        154	        154	             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	              0
  categories for federation query count                                   	          3	          3	              0
  category delete                                                         	         48	         48	              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	              3
  collection view                                                         	          7	          7	              0
  collections for federation query count                                  	          4	          4	              0
  create collection                                                       	         37	         37	              5
  delete collection                                                       	         40	         40	              5
  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                                                         	         41	         41	              1
  product translations                                                    	          5	          5	              0
  products for federation query count                                     	          6	          6	              1
  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	              5

# 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	              1
  retrieve variant list                                                   	         34	         34	              1
  update product variant                                                  	         64	         64	              7

# saleor.graphql.productbenchmark variant stocks
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variants stocks create                                          	         28	         28	              4
  product variants stocks create with single webhook called               	         27	         27	              4
  product variants stocks delete by id                                    	         29	         29	              4
  product variants stocks delete by sku                                   	         29	         29	              4
  product variants stocks delete with out of stock webhook many calls     	         25	         25	              3
  product variants stocks update by sku                                   	         27	         27	              4
  product variants stocks update byid                                     	         27	         27	              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	              5

# 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                                   	         45	         45	              6
  fetch order prices multiple catalogue discounts                         	        107	        107	             20

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

codecov · 2024-06-11T09:26:52Z

Codecov Report

Attention: Patch coverage is 90.47619% with 2 lines in your changes missing coverage. Please review.

Please upload report for BASE (3.19@11967b0). Learn more about missing BASE report.

❗ Current head 9d406d0 differs from pull request most recent head f649670

Please upload reports for the commit f649670 to get more accurate results.

Files	Patch %	Lines
saleor/webhook/payloads.py	50.00%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             3.19   #16116   +/-   ##
=======================================
  Coverage        ?   93.98%           
=======================================
  Files           ?      931           
  Lines           ?    72208           
  Branches        ?     8543           
=======================================
  Hits            ?    67864           
  Misses          ?     2776           
  Partials        ?     1568

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

…ct.discounts for apply_once_per_order vouchers

saleor/order/base_calculations.py

saleor/order/models.py

saleor/plugins/webhook/tests/subscription_webhooks/test_create_deliveries_for_taxes.py

* Fix applying shipping voucher on order and TaxableObject.shipping_price resolver for Order * Add is_order_level_voucher utils * Update TaxableObject.discounts resolver for Order * Add more tests for create_deliveries_for_taxes and adjust TaxableObject.discounts for apply_once_per_order vouchers * Update descriptions of unit_price and total_price on TaxableObjectLine * Aplpy code review suggestions

Fix applying shipping voucher on order and TaxableObject.shipping_pri…

26d7978

…ce resolver for Order

IKarbowiak force-pushed the SHOPX-845-clean-up-discount-instances branch from 6dbc5c3 to 26d7978 Compare June 11, 2024 09:07

IKarbowiak self-assigned this Jun 11, 2024

IKarbowiak added 3.19 shopping Shopping Experience team topics labels Jun 11, 2024

IKarbowiak added 2 commits June 11, 2024 11:37

Add is_order_level_voucher utils

bc5f12c

Update TaxableObject.discounts resolver for Order

9d406d0

IKarbowiak force-pushed the SHOPX-845-clean-up-discount-instances branch from 23aea67 to 9d406d0 Compare June 11, 2024 12:01

IKarbowiak added 2 commits June 12, 2024 10:15

Add more tests for create_deliveries_for_taxes and adjust TaxableObje…

0c8e033

…ct.discounts for apply_once_per_order vouchers

Update descriptions of unit_price and total_price on TaxableObjectLine

96efe74

IKarbowiak added the test deployment Deploy test environment for pull request label Jun 12, 2024

github-actions bot temporarily deployed to shopx-845-clean-up-discount-instances June 12, 2024 08:55 Inactive

IKarbowiak marked this pull request as ready for review June 12, 2024 08:55

IKarbowiak requested review from a team and korycins June 12, 2024 08:57

korycins approved these changes Jun 13, 2024

View reviewed changes

saleor/order/base_calculations.py Outdated Show resolved Hide resolved

tomaszszymanski129 approved these changes Jun 13, 2024

View reviewed changes

saleor/order/models.py Outdated Show resolved Hide resolved

saleor/plugins/webhook/tests/subscription_webhooks/test_create_deliveries_for_taxes.py Outdated Show resolved Hide resolved

Air-t reviewed Jun 13, 2024

View reviewed changes

saleor/plugins/webhook/tests/subscription_webhooks/test_create_deliveries_for_taxes.py Outdated Show resolved Hide resolved

Air-t reviewed Jun 13, 2024

View reviewed changes

saleor/plugins/webhook/tests/subscription_webhooks/test_create_deliveries_for_taxes.py Outdated Show resolved Hide resolved

Air-t reviewed Jun 13, 2024

View reviewed changes

saleor/plugins/webhook/tests/subscription_webhooks/test_create_deliveries_for_taxes.py Outdated Show resolved Hide resolved

Air-t approved these changes Jun 13, 2024

View reviewed changes

Aplpy code review suggestions

f649670

github-actions bot temporarily deployed to shopx-845-clean-up-discount-instances June 13, 2024 10:58 Inactive

IKarbowiak requested a review from szczecha June 13, 2024 12:03

szczecha approved these changes Jun 18, 2024

View reviewed changes

IKarbowiak merged commit dddcbad into 3.19 Jun 18, 2024
4 checks passed

IKarbowiak deleted the SHOPX-845-clean-up-discount-instances branch June 18, 2024 07:19

IKarbowiak mentioned this pull request Jun 18, 2024

Clean up order discounts #16164

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up order discounts #16116

Clean up order discounts #16116

IKarbowiak commented Jun 11, 2024 •

edited

Loading

db-queries bot commented Jun 11, 2024 •

edited

Loading

codecov bot commented Jun 11, 2024 •

edited

Loading

Clean up order discounts #16116

Clean up order discounts #16116

Conversation

IKarbowiak commented Jun 11, 2024 • edited Loading

Impact

Docs

Pull Request Checklist

db-queries bot commented Jun 11, 2024 • edited Loading

codecov bot commented Jun 11, 2024 • edited Loading

Codecov Report

IKarbowiak commented Jun 11, 2024 •

edited

Loading

db-queries bot commented Jun 11, 2024 •

edited

Loading

codecov bot commented Jun 11, 2024 •

edited

Loading