feat: order editing data model #2184

fPolic · 2022-09-12T09:49:19Z

What

add order editing entities
add repositories
add a feature flag for the order editing feature
add the migrations file

RESOLVES CORE-490

changeset-bot · 2022-09-12T09:49:22Z

⚠️ No Changeset found

Latest commit: 4d938c6

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

adrien2p

Few comments ;)

packages/medusa/src/migrations/1662976816913-order-editing.ts

packages/medusa/src/models/order-edit.ts

adrien2p · 2022-09-12T11:12:05Z

packages/medusa/src/models/order-item-change.ts

+  original_line_item: LineItem
+
+  @Column({ nullable: true })
+  line_item_id: string


suggestion: string | null

should we define type: "varchar" in the decorator as well, again I noticed that we handle this case somewhat inconsistently throughout the codebase

Yeah it is not consistent in the code base. But i would say that the type should represent the value that can be assigned on it. Wdyt?

packages/medusa/src/migrations/1662976816913-order-editing.ts

adrien2p · 2022-09-12T11:25:17Z

packages/medusa/src/models/order-item-change.ts

+
+  @OneToOne(() => LineItem, { nullable: true })
+  @JoinColumn({ name: "line_item_id" })
+  line_item: LineItem


suggestion: string | null

adrien2p · 2022-09-12T11:26:33Z

packages/medusa/src/models/order.ts

+      (oe) => oe.order
+    ),
+  ])
+  edits: OrderEdit[]


todo: We should add that in the description below with [EXPERIMENTAL] first

If you can update the property description in the oas comment bellow with [EXPERIMENTAL]

packages/medusa/src/migrations/1662982509900-order_editing.ts

packages/medusa/src/models/order-edit.ts

pKorsholm

A have a few comments on the decorator type used for the status' in orderEdit

packages/medusa/src/models/order-edit.ts

packages/medusa/src/models/order-item-change.ts

adrien2p

last few comments

packages/medusa/src/models/order-edit.ts

adrien2p · 2022-09-13T10:16:44Z

packages/medusa/src/models/order.ts

+      (oe) => oe.order
+    ),
+  ])
+  edits: OrderEdit[]


If you can update the property description in the oas comment bellow with [EXPERIMENTAL]

packages/medusa/src/models/order-item-change.ts

packages/medusa/src/models/order-edit.ts

adrien2p

LGTM

srindom

LGTM!

**What** - add order editing entities - add repositories - add a feature flag for the order editing feature - add the migrations file RESOLVES CORE-490

* docs for tax-inclusive pricing * changes based on feedback * changes based on feedback * fix link * fix: make prices optional param when updating a variant (#2155) **Why** - It should be possible to update variant props without having to send the prices array with every update * feat(medusa): Tax-inclusive pricing (#2131) * add feature flag for tax inclusive pricing * update db model for TIP * add migration * set featureflag column decorators * remove unused prop * update tests to reflect feature_flags as any array * fix types * reference key from featureFlag file * use feature flag key in models * fix copy paste mistake * unify spelling * Create gorgeous-experts-guess.md * feat(medusa): create/update endpoints of currency/region/price-lists/shipping-options should allow to pass includes_tax * test(integration): continue to add some integration test * test(integration): continue to add some integration test * test(unit): Fix region service tests * fix(medusa): API unit tests flags management * feat(medusa): Minor cleanup * style(medusa): Fix typo * fix(medusa): rebase * feat(medusa): Replace old tag with the new one * feat(medusa): revert flag * feat(medusa): Cleanup * feat(medusa): feedback * feat(medusa): Rename currency retrieve method * test(medudsa): fix unit tests * chore(medusa): fix oas * feat(medusa): ShippingMethod should include tax setting from parent option (#2021) * feat(medusa): Shipping method should includes tax from parent options * feat(medusa): Condition the includes tax flag to the availability of the feature and add some other tests * test(integration): Move cart/order ff test in separate files * fix: snapshots folder * fix(integration): snapshots * Create calm-baboons-sit.md * test(integration): file naming Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> * Feat/tax inclusive pricing extend price selection strategy (#2087) * initial changes to price selection strategy including unit tests * typing for tax calculation * update types and remove region and currency from prices results * fix casing * include tax calculation in priceselectionstrategy * integration tests for tax inclusive pricing price calculations * fix build * include tax inclusive considerations when calculating tax fields for variants * include only "includes_tax" fields from currency and region joins * test to see errors in pipelines * conditionally join featureflagged fields * add "includes_tax" to price list factory * add tests for tax inclusive price list prices and currency prices * fix unit tests * refactor pricing array checks to expect arraycontaining * undo error handler * Feat/tax inclusive pricing flag on generated lineitems (#2108) * include tax inclusive pricing flag on generated lineitems * initial addition of tax inclusivity for lineitem service * add generate test to ensure that includes_tax is set when returned from price selection strategy * add integration test for generating lineitem including tax * add test for negative tax inclusion * add tests for mixed pricing * add negative test for setting tax exclusivity * restructure the setting of includes_tax on lineitems * fix: update cwd to be correct in cart test * feat(medusa): Line item totals calculations (#2123) * feat(medusa): Update totals and tax calculation way to calculate the totals * feat(medusa): remove region feetching from decorate total * feat(medusa): cleanup * test(medusa): fix tax calculation tests * comment * test(integration): cleanup * test(integration): cleanup * fix(medusa): return service missing await * feat(medusa): cleanup * feat(medusa): cleanup * test(integration): fix data * feat(medusa): improve tax calculation readability * test(medusa): improve tax calculation structure case Co-authored-by: Sebastian Rindom <skrindom@gmail.com> * Feat(medusa): tax inclusive pricing in shipping method tax (#2125) * initial implementation and test * include tax inclusive calculations for getting shipping options * remove inaccurate comment * remove console log * refactor how prices and taxes are set for shipping methods * fix integration tests * remove verbose flag * fix integration tests * remove console log * format util * use util in price service and tax strategy * fix faulty integration test * undo tax calculation strategy changes in favor or Carlos' pr * undo changes to tax calculation strategy tests * round tax amount * feat(medusa): cleanup calculate tax amount utils and its usage (#2136) * feat(medusa): Refund line totals calculation (#2139) Rely on the update of the following pr #2136 **WIP Missing integration tests** **What** Update the totals calculation on the refund line to include the notion of tax inclusive **Test** - Update and add new tests around the refund Fixes CORE-482 * feat(medusa): Tax inclusive discounts calculations (#2137) **What** - Calculate line adjustments correctly taking into account the tax inclusivity - fix totals getLineItemTotals by adjusting the sub total with the original tax amount instead of the tax amount when the unit price includes the taxes **Tests** - The tests create a cart with a percentage discount of 15%, the cart includes 2 items mixing the tax inclusive and validate the items on the result cart as well as the totals on each item. I ve based my calculation validation based on what we have done + some articles around discount apply on price without taxes to validate the output., FIXES CORE-477 * Chore: shipping methods tax inclusive total (#2130) * chore: calculate tax inclusive shipping methods * chore: additional tests and check undefined tax_rate (#2157) * chore: additional tests and check undefined tax_rate * fix: naming + correct price type check * fix: remove price_includes_tax from type * fix: remove price_includes_tax from type Co-authored-by: Philip Korsholm <philip.korsholm@hotmail.com> Co-authored-by: adrien2p <adrien.deperetti@gmail.com> Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Co-authored-by: Sebastian Rindom <skrindom@gmail.com> Co-authored-by: Carlos R. L. Rodrigues <37986729+carlos-r-l-rodrigues@users.noreply.github.com> * Remove unused QueryBuilderService (#2104) **Issue number:** #2068 **What:** - removed unused query-builder service files - medusa/src/services/query-builder.js - medusa/src/services/__mocks__/query-builder.js - deleted export from medusa/src/services/index.ts - (extra) deleted documentation files related to QueryBuilderService (QueryBuilderService.md) * docs for tax-inclusive pricing * changes based on feedback * changes based on feedback * feat(medusa-fulfillment-webshipper): Support personal customs no in orders (#2167) * feat(webshipper): support personal customs no in orders * docs: update readme with personal customs number info * fix(medusa-file-spaces): return `fileKey` for Spaces upload (#2171) **What** - return `fileKey` in the response after the file is uploaded to Spaces Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> * fix(medusa): Export/import fixes including export fields that contains new line char (#2150) * feat(medusa-js,medusa-react,medusa): Add missing Currency endpoints (#2185) * fix(medusa): Resent notification replaces parent notification * chore: Bump medusa-file-minio * fix(medusa): allow address updates on carts w/o existing address (#2176) * chore: Bump minor version of plugins * chore: Centralise ESLint rules (#2162) * chore: centrilize eslint rules * feat: order editing data model (#2184) **What** - add order editing entities - add repositories - add a feature flag for the order editing feature - add the migrations file RESOLVES CORE-490 * fix link * fix(medusa): Check for Sales Channel on product import (#2202) * docs: change title in Create a Service documentation (#2201) Change title in Create a Service documentation * chore(release): Publish * added links to sidebar Co-authored-by: Sebastian Rindom <skrindom@gmail.com> Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> Co-authored-by: Philip Korsholm <philip.korsholm@hotmail.com> Co-authored-by: adrien2p <adrien.deperetti@gmail.com> Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Co-authored-by: Carlos R. L. Rodrigues <37986729+carlos-r-l-rodrigues@users.noreply.github.com> Co-authored-by: Dorian <46839236+DorianMazur@users.noreply.github.com> Co-authored-by: Frane Polić <16856471+fPolic@users.noreply.github.com> Co-authored-by: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Co-authored-by: Bhargava Prabu Reddy <prabu0reddy777@gmail.com> Co-authored-by: olivermrbl <oliver@mrbltech.com> Co-authored-by: sabakhilji <52318459+sabakhilji@users.noreply.github.com>

fPolic added 5 commits September 12, 2022 09:51

feat: add OE feature flag

97be92e

feat: add OrderItemChange entity

9625651

feat: order and order edit relation

c8581f9

fix: add missing columns to OEC

d584ea7

feat: order edit properties

08ada35

fix: add missing columns

0343b44

fPolic assigned fPolic and adrien2p and unassigned fPolic Sep 12, 2022

fPolic added 6 commits September 12, 2022 12:10

wip: migrations

f6fc43b

fix: col reference

67fb94f

fix: add nullables

e899248

feat: recreate migration

224f0fb

feat: add feature flag to the migration and format

cee6c2b

fix: recreate migration

9a02c66

fPolic marked this pull request as ready for review September 12, 2022 11:46

fPolic requested a review from a team as a code owner September 12, 2022 11:46

feat: add repositories

9f2ce1b

adrien2p reviewed Sep 12, 2022

View reviewed changes

adrien2p mentioned this pull request Sep 12, 2022

feat(medusa): Implement premises of order edit retrieval #2183

Merged

fix: remove public schema

1e4b170

adrien2p mentioned this pull request Sep 12, 2022

feat(medusa): Implement premises of the creation flow of an order edit #2187

Merged

srindom requested changes Sep 12, 2022

View reviewed changes

fix: use FF key, remove eager, remove user FKs

c3c86c2

adrien2p removed their assignment Sep 12, 2022

fix: change relation type and add constraints

d15e788

fPolic marked this pull request as draft September 12, 2022 15:32

carlos-r-l-rodrigues reviewed Sep 12, 2022

View reviewed changes

packages/medusa/src/models/order-edit.ts Outdated Show resolved Hide resolved

pKorsholm reviewed Sep 13, 2022

View reviewed changes

fPolic added 3 commits September 13, 2022 10:08

fix: change date decorator, remove nullable from ids

5337f5e

fix: remove nullable from created_by

041a2aa

feat: new migration

efebe13

adrien2p reviewed Sep 13, 2022

View reviewed changes

fPolic added 3 commits September 13, 2022 12:49

feat: remove create_at, extend oas for Order

1f1f23e

feat: order item change oas

673ec00

feat: order edit oas

2ec443b

fPolic marked this pull request as ready for review September 13, 2022 12:05

adrien2p approved these changes Sep 13, 2022

View reviewed changes

srindom approved these changes Sep 13, 2022

View reviewed changes

Merge branch 'develop' into feat/order-edit-model

4d938c6

srindom added the automerge label Sep 13, 2022

kodiakhq bot merged commit f2eb942 into develop Sep 13, 2022

kodiakhq bot deleted the feat/order-edit-model branch September 13, 2022 16:40

shahednasser pushed a commit that referenced this pull request Sep 14, 2022

feat: order editing data model (#2184)

99425c3

**What** - add order editing entities - add repositories - add a feature flag for the order editing feature - add the migrations file RESOLVES CORE-490

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: order editing data model #2184

feat: order editing data model #2184

fPolic commented Sep 12, 2022 •

edited

Loading

changeset-bot bot commented Sep 12, 2022 •

edited

Loading

adrien2p left a comment

adrien2p Sep 12, 2022

fPolic Sep 12, 2022

adrien2p Sep 12, 2022

adrien2p Sep 12, 2022

adrien2p Sep 12, 2022

adrien2p Sep 13, 2022

pKorsholm left a comment

adrien2p left a comment

adrien2p Sep 13, 2022

adrien2p left a comment

srindom left a comment

feat: order editing data model #2184

feat: order editing data model #2184

Conversation

fPolic commented Sep 12, 2022 • edited Loading

changeset-bot bot commented Sep 12, 2022 • edited Loading

⚠️ No Changeset found

adrien2p left a comment

Choose a reason for hiding this comment

adrien2p Sep 12, 2022

Choose a reason for hiding this comment

fPolic Sep 12, 2022

Choose a reason for hiding this comment

adrien2p Sep 12, 2022

Choose a reason for hiding this comment

adrien2p Sep 12, 2022

Choose a reason for hiding this comment

adrien2p Sep 12, 2022

Choose a reason for hiding this comment

adrien2p Sep 13, 2022

Choose a reason for hiding this comment

pKorsholm left a comment

Choose a reason for hiding this comment

adrien2p left a comment

Choose a reason for hiding this comment

adrien2p Sep 13, 2022

Choose a reason for hiding this comment

adrien2p left a comment

Choose a reason for hiding this comment

srindom left a comment

Choose a reason for hiding this comment

fPolic commented Sep 12, 2022 •

edited

Loading

changeset-bot bot commented Sep 12, 2022 •

edited

Loading