Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix relation between order and click and collect address #15697

Merged
merged 1 commit into from Mar 27, 2024
Merged

Fix relation between order and click and collect address #15697

merged 1 commit into from Mar 27, 2024

Conversation

IKarbowiak
Copy link
Member

Port of #15682

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

@IKarbowiak
Fix relation between order and click and collect address
814fdd2 
* Create a copy of collection point address during checkout completion

* Add migration for creating order shipping addresses
@IKarbowiak IKarbowiak self-assigned this Mar 25, 2024
@db-queries
Copy link

db-queries bot commented Mar 25, 2024

Here is the report for 814fdd2 (saleor:merx-213-staff-can-override-warehouse-address-when-editing-address-on-order-with-cc-main)
Base comparison is a6693fd.

Found 1 differences! (click me) 

# 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                                                    	         41	         41	              0
  query staff user                                                        	         22	         22	              3
  staff create                                                            	         23	         23	              3
  staff update groups and permissions                                     	         36	         36	              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	              0
  permission group create                                                 	         25	         25	              0
  permission group delete                                                 	         30	         30	              3
  permission group query                                                  	         14	         14	              0
  permission group update                                                 	         44	         44	              2
  permission group update remove users with manage staff                  	         36	         36	              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                                	         38	         38	              6

# saleor.graphql.checkoutbenchmark checkout mutations
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  add billing address to checkout                                         	         75	         75	             10
  add checkout lines                                                      	         80	         80	             12
  add checkout lines gift discount applies                                	        142	        142	             21
  add checkout lines order discount applies                               	        156	        156	             16
  add checkout lines with external shipping                               	        183	        183	             74
  add checkout lines with reservations                                    	        169	        169	             60
  add delivery to checkout                                                	         77	         77	             13
  add shipping to checkout                                                	         88	         88	             15
  checkout email update                                                   	         40	         40	              2
  checkout payment charge                                                 	         56	         56	             16
  checkout shipping address update                                        	         81	         81	              9
  checkout voucher code                                                   	        100	        100	             16
  complete checkout                                                       	        239	        239	             81
  complete checkout preorder                                              	        237	        237	             82
  complete checkout with digital line                                     	        280	        280	             95
  complete checkout with out of stock webhook                             	        241	        241	             81
  complete checkout with single line                                      	        241	        241	             81
  create checkout                                                         	         81	         81	              8
  create checkout with gift promotion                                     	        120	        120	             18
  create checkout with order promotion                                    	        103	        103	              8
  create checkout with reservations                                       	        147	        147	             26
  customer complete checkout                                              	        252	        252	             87
- customer complete checkout for cc                                       	        227	        229	             76
  update checkout lines                                                   	         73	         73	             12
  update checkout lines with reservations                                 	        175	        175	             71

# 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                                                   	         59	         59	              5
  user checkout details with tax app                                      	         81	         81	             27

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

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

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

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

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

# saleor.graphql.discountbenchmark promotion update
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  promotion update                                                        	         14	         14	              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                                        	         22	         22	              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                                           	         26	         26	              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                                                       	          6	          6	              0

# saleor.graphql.orderbenchmark fulfillment refund and return products
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  fulfillment refund products order lines                                 	         60	         60	              0
  fulfillment return products order lines                                 	        102	        102	              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                                                     	         56	         56	              7
  user order details                                                      	         54	         54	              8

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

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

# saleor.graphql.orderbenchmark order lines create
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  order lines create                                                      	         94	         94	             17
  order lines create variants on promotion                                	        153	        153	             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                                                     	          3	          3	              0
  categories for federation query count                                   	          3	          3	              0
  category delete                                                         	         49	         49	              4
  category view                                                           	         33	         33	              4

# saleor.graphql.productbenchmark collection
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  collection add products                                                 	         21	         21	              5
  collection bulk delete                                                  	         28	         28	              3
  collection view                                                         	         11	         11	              3
  collections for federation query count                                  	          6	          6	              0
  create collection                                                       	         37	         37	              5
  delete collection                                                       	         40	         40	              5
  remove products from collection                                         	         18	         18	              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                                           	         10	         10	              1
  filter products by boolean attributes                                   	         17	         17	              1
  filter products by gift card                                            	         14	         14	              2
  filter products by numeric attributes                                   	         16	         16	              1
  product create                                                          	         53	         53	              3
  product details                                                         	         46	         46	              4
  product translations                                                    	          8	          8	              1
  products for federation query count                                     	         12	         12	              4
  products media for federation query count                               	          5	          5	              0
  products types for federation query count                               	          2	          2	              0
  retrieve channel listings                                               	         20	         20	              0
  retrieve product attributes                                             	         11	         11	              1
  retrieve product images                                                 	          7	          7	              1
  retrieve product media                                                  	          7	          7	              1
  retrive products with product types and attributes                      	         10	         10	              1
  update product                                                          	         74	         74	              5

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

# saleor.graphql.productbenchmark variant
  test name                                                               	left count 	right count	duplicate count
  ------------------------------------------------------------------------	-----------	-----------	---------------
  product variant bulk create                                             	         46	         46	              1
  product variant create                                                  	         60	         60	              3
  products variants for federation query count                            	         10	         10	              3
  retrieve variant list                                                   	         37	         37	              2
  update product variant                                                  	         61	         61	              7

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

@codecov Codecov
Copy link

codecov bot commented Mar 25, 2024 •
edited

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.93%. Comparing base (a6693fd) to head (814fdd2).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main   #15697   +/-   ##
=======================================
  Coverage   93.93%   93.93%           
=======================================
  Files         932      932           
  Lines       71629    71631    +2     
  Branches     8404     8405    +1     
=======================================
+ Hits        67288    67290    +2     
  Misses       2785     2785           
  Partials     1556     1556

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

@korycins korycins added the migrations perf test Runs performance tests on modified migrations label Mar 25, 2024
@saleor-deployments
Copy link

No migrations were executed during test, commit 074d2d4

@saleor-deployments saleor-deployments bot removed the migrations perf test Runs performance tests on modified migrations label Mar 26, 2024
@magul magul added the migrations perf test Runs performance tests on modified migrations label Mar 26, 2024
@saleor-deployments
Copy link

No migrations were executed during test, commit 5e244dc

@saleor-deployments saleor-deployments bot removed the migrations perf test Runs performance tests on modified migrations label Mar 26, 2024
@korycins korycins added the migrations perf test Runs performance tests on modified migrations label Mar 26, 2024
@korycins korycins merged commit 47cedfd into main Mar 27, 2024
36 of 42 checks passed
@korycins korycins deleted the merx-213-staff-can-override-warehouse-address-when-editing-address-on-order-with-cc-main branch March 27, 2024 12:56
korycins pushed a commit that referenced this pull request Apr 15, 2024
@IKarbowiak @korycins
Fix relation between order and click and collect address (#15697)
1501fc0 
* Create a copy of collection point address during checkout completion

* Add migration for creating order shipping addresses
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@korycins korycins korycins approved these changes

@zedzior zedzior zedzior approved these changes

Assignees

@IKarbowiak IKarbowiak

Labels
migrations perf test Runs performance tests on modified migrations skip changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@IKarbowiak @korycins @zedzior @magul