From 5441d47f88d759742e3d3d29b29bc38feceac583 Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Tue, 19 Oct 2021 19:16:47 +0200 Subject: [PATCH] fix: cleanup --- integration-tests/api/__tests__/store/cart.js | 4 +- integration-tests/api/package.json | 6 +- integration-tests/api/yarn.lock | 70 +++++++++---------- packages/medusa-plugin-meilisearch/yarn.lock | 60 ++++++++++++++++ packages/medusa/src/models/cart.ts | 26 ++++--- packages/medusa/src/services/cart.js | 8 +-- 6 files changed, 120 insertions(+), 54 deletions(-) diff --git a/integration-tests/api/__tests__/store/cart.js b/integration-tests/api/__tests__/store/cart.js index b394f7c8c8..560654bc51 100644 --- a/integration-tests/api/__tests__/store/cart.js +++ b/integration-tests/api/__tests__/store/cart.js @@ -30,7 +30,7 @@ describe("/store/carts", () => { const cwd = path.resolve(path.join(__dirname, "..", "..")) try { dbConnection = await initDb({ cwd }) - medusaProcess = await setupServer({ cwd, verbose: true }) + medusaProcess = await setupServer({ cwd }) } catch (error) { console.log(error) } @@ -745,7 +745,7 @@ describe("/store/carts", () => { }) }) - describe.only("shipping address + region updates", () => { + describe("shipping address + region updates", () => { beforeEach(async () => { try { await cartSeeder(dbConnection) diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json index 9608373adc..bde4983347 100644 --- a/integration-tests/api/package.json +++ b/integration-tests/api/package.json @@ -8,15 +8,15 @@ "build": "babel src -d dist --extensions \".ts,.js\"" }, "dependencies": { - "@medusajs/medusa": "1.1.45-dev-1634658131183", - "medusa-interfaces": "1.1.27-dev-1634658131183", + "@medusajs/medusa": "1.1.41-dev-1634316075104", + "medusa-interfaces": "1.1.23-dev-1634316075104", "typeorm": "^0.2.31" }, "devDependencies": { "@babel/cli": "^7.12.10", "@babel/core": "^7.12.10", "@babel/node": "^7.12.10", - "babel-preset-medusa-package": "1.1.17-dev-1634658131183", + "babel-preset-medusa-package": "1.1.15-dev-1634316075104", "jest": "^26.6.3" } } diff --git a/integration-tests/api/yarn.lock b/integration-tests/api/yarn.lock index 09428c420b..5bfce87d1e 100644 --- a/integration-tests/api/yarn.lock +++ b/integration-tests/api/yarn.lock @@ -1223,10 +1223,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@medusajs/medusa-cli@1.1.22-dev-1634658131183": - version "1.1.22-dev-1634658131183" - resolved "http://localhost:4873/@medusajs%2fmedusa-cli/-/medusa-cli-1.1.22-dev-1634658131183.tgz#9aad9860afadabf2a361ac696282399856b4aca0" - integrity sha512-KPzHuAUk21hUK1/0Kjs9HFRywQWI48MzD7YA+aTVWwHGjrrq+/V3bgTCA1VtZDE5rHv/7aMiEGXdrtwe984Rsw== +"@medusajs/medusa-cli@1.1.18-dev-1634316075104": + version "1.1.18-dev-1634316075104" + resolved "http://localhost:4873/@medusajs%2fmedusa-cli/-/medusa-cli-1.1.18-dev-1634316075104.tgz#65b891999ae2c3125d6ea8d83e0f28907fed9dfc" + integrity sha512-wfcfCdJn28C69j2r6EBc6YYVd/wwJ605SI9PI7tgE+0PJRo1NxUcV3+5py9YSAj1Yvjj70vy4mPvpjJfdy3P6g== dependencies: "@babel/polyfill" "^7.8.7" "@babel/runtime" "^7.9.6" @@ -1244,8 +1244,8 @@ is-valid-path "^0.1.1" joi-objectid "^3.0.1" meant "^1.0.1" - medusa-core-utils "1.1.26-dev-1634658131183" - medusa-telemetry "0.0.9-dev-1634658131183" + medusa-core-utils "1.1.22-dev-1634316075104" + medusa-telemetry "0.0.5-dev-1634316075104" netrc-parser "^3.1.6" open "^8.0.6" ora "^5.4.1" @@ -1259,13 +1259,13 @@ winston "^3.3.3" yargs "^15.3.1" -"@medusajs/medusa@1.1.45-dev-1634658131183": - version "1.1.45-dev-1634658131183" - resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.45-dev-1634658131183.tgz#73c8c29d973ac0a947baac458ee0383c3bafa367" - integrity sha512-f4VVd1b41vOU1cgvcoja+1VQfN4MY95Ju3Cl8q6FmiKI5gRcbGIpmVRWBuQz+8YCumMbAroEVNMRDQu+i0bcfg== +"@medusajs/medusa@1.1.41-dev-1634316075104": + version "1.1.41-dev-1634316075104" + resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.41-dev-1634316075104.tgz#8b81aa4a1234fdaf486822545cd8a91d079f7e4b" + integrity sha512-Xw5//89QYYmo+jIBntwDJmbUya/JZl8dbMYVBDcLnORlWRGpWuzLdILfIMW0XWkF8aVI829O9goqT+hsQ/cZ5w== dependencies: "@hapi/joi" "^16.1.8" - "@medusajs/medusa-cli" "1.1.22-dev-1634658131183" + "@medusajs/medusa-cli" "1.1.18-dev-1634316075104" "@types/lodash" "^4.14.168" awilix "^4.2.3" body-parser "^1.19.0" @@ -1287,8 +1287,8 @@ joi "^17.3.0" joi-objectid "^3.0.1" jsonwebtoken "^8.5.1" - medusa-core-utils "1.1.26-dev-1634658131183" - medusa-test-utils "1.1.29-dev-1634658131183" + medusa-core-utils "1.1.22-dev-1634316075104" + medusa-test-utils "1.1.25-dev-1634316075104" morgan "^1.9.1" multer "^1.4.2" passport "^0.4.0" @@ -1911,10 +1911,10 @@ babel-preset-jest@^26.6.2: babel-plugin-jest-hoist "^26.6.2" babel-preset-current-node-syntax "^1.0.0" -babel-preset-medusa-package@1.1.17-dev-1634658131183: - version "1.1.17-dev-1634658131183" - resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.17-dev-1634658131183.tgz#351936ebb42e36824f5ff54648f226728f31a5d4" - integrity sha512-jsL1PF3r5SSKUywYveXnnLwcmsrD0MzL2GapoREUmm4b6CQ5dPHCEORb3t0ClCk7KgnJd7AynOuvQGR4Zwqo1Q== +babel-preset-medusa-package@1.1.15-dev-1634316075104: + version "1.1.15-dev-1634316075104" + resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.15-dev-1634316075104.tgz#1180bb50676ff349fc59b0b9c8bcad97caef85dc" + integrity sha512-BUWSunUpuAbdZyV093TdwEc5DZvrbp3aqQlrouX9HxgqrFeXYFWNcZqZNADS9NHq1LJqNyHuE1Vz+IQnu9lj0g== dependencies: "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-decorators" "^7.12.1" @@ -5089,25 +5089,25 @@ media-typer@0.3.0: resolved "http://localhost:4873/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -medusa-core-utils@1.1.26-dev-1634658131183: - version "1.1.26-dev-1634658131183" - resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.26-dev-1634658131183.tgz#c2aadc8c6cb48f21ddbb4f3519514da87f0c8d8d" - integrity sha512-IXUFAJdR9D8cKCct89CR1J45056oRSIckKnaSf0TpVncHFvaGFQuwa6DkKAprTuOJ5idvTDn+B9BPcjJ/aec6Q== +medusa-core-utils@1.1.22-dev-1634316075104: + version "1.1.22-dev-1634316075104" + resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.22-dev-1634316075104.tgz#9cffe185fbce1899ffaae0e08e8f0007fca8571e" + integrity sha512-WRkquPYzodg5PSWTxnIDRMcn+N8LiLpq1Yx8DWIsmV/tsULe+Sz1CMJcUFRGF5bLcyN/Za9yIz6GCHmGOB64aw== dependencies: joi "^17.3.0" joi-objectid "^3.0.1" -medusa-interfaces@1.1.27-dev-1634658131183: - version "1.1.27-dev-1634658131183" - resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.27-dev-1634658131183.tgz#00b83bacc2202e81b1eed30d5558df9cc9c29a59" - integrity sha512-Bh1Ir51Rw8jWAyag4eAlB8iwfHa50ZSk3l+PdwkNq2wETm/Q0kh2Jpcfh0EC0tGHpfUe4s4Mjnj7nmobcCkfWg== +medusa-interfaces@1.1.23-dev-1634316075104: + version "1.1.23-dev-1634316075104" + resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.23-dev-1634316075104.tgz#7d787951fd4d66b75b3b235cd833b1840506804b" + integrity sha512-+6u2Q2lgALX2RYBjLOTFmCKB2HgarQbRr+u0uG81gyurF2/TxzwGb/hJLZIeS/Elk2HYuIpstswrAet7/9Rupw== dependencies: - medusa-core-utils "1.1.26-dev-1634658131183" + medusa-core-utils "1.1.22-dev-1634316075104" -medusa-telemetry@0.0.9-dev-1634658131183: - version "0.0.9-dev-1634658131183" - resolved "http://localhost:4873/medusa-telemetry/-/medusa-telemetry-0.0.9-dev-1634658131183.tgz#d47ef4082f309ae6c8c741146ec6238f480ef235" - integrity sha512-rwysPKpJYL7NobXUb1ShZrGJhQA3P52QbbJb3F9pc9Qch+SV9RCkhjPPOwwzyM8yAP42DTXvX66gAlhPd9/BOA== +medusa-telemetry@0.0.5-dev-1634316075104: + version "0.0.5-dev-1634316075104" + resolved "http://localhost:4873/medusa-telemetry/-/medusa-telemetry-0.0.5-dev-1634316075104.tgz#c1bd94ab2e2c3d4dc4bc3d664d96a9091a924fd9" + integrity sha512-Lh/izeAaHt/ClugwMi+Gwsa2OAzVuuNW5WhFAiHQhrR0BA4bYee4xLKWqWw+JGfjMfodOCwF+Zl3I5qINXuaFg== dependencies: axios "^0.21.1" axios-retry "^3.1.9" @@ -5119,13 +5119,13 @@ medusa-telemetry@0.0.9-dev-1634658131183: remove-trailing-slash "^0.1.1" uuid "^8.3.2" -medusa-test-utils@1.1.29-dev-1634658131183: - version "1.1.29-dev-1634658131183" - resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.29-dev-1634658131183.tgz#3b58665eb71d2d6e65bb4ed05376e084f18140b4" - integrity sha512-gYECUfDdJKcyLGc9WeujTv1a5FUUxkStT4UFYhsgK6QYVBo7mc10XPBS4mMXBH9cnu4gSipFNmZyuVO4i2nMYQ== +medusa-test-utils@1.1.25-dev-1634316075104: + version "1.1.25-dev-1634316075104" + resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.25-dev-1634316075104.tgz#5958d02013a73f8ddcaf4140d9c81e900172f826" + integrity sha512-2P+Mq+kICR4oa2AhT36HhP8VR15tEli6XBT/yWweVBkRzrjoGptqHg5BtDtUt/s+PYy7STlKG/tin/VH6J3zLg== dependencies: "@babel/plugin-transform-classes" "^7.9.5" - medusa-core-utils "1.1.26-dev-1634658131183" + medusa-core-utils "1.1.22-dev-1634316075104" randomatic "^3.1.1" merge-descriptors@1.0.1: diff --git a/packages/medusa-plugin-meilisearch/yarn.lock b/packages/medusa-plugin-meilisearch/yarn.lock index 15a5be80b3..2cd22af7e9 100644 --- a/packages/medusa-plugin-meilisearch/yarn.lock +++ b/packages/medusa-plugin-meilisearch/yarn.lock @@ -953,6 +953,18 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@hapi/hoek@^9.0.0": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + +"@hapi/topo@^5.0.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + dependencies: + "@hapi/hoek" "^9.0.0" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1154,6 +1166,23 @@ readdirp "^2.2.1" upath "^1.1.1" +"@sideway/address@^4.1.0": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.2.tgz#811b84333a335739d3969cfc434736268170cad1" + integrity sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@sideway/formula@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== + +"@sideway/pinpoint@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" + integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -3502,6 +3531,22 @@ jest@^25.5.2: import-local "^3.0.2" jest-cli "^25.5.4" +joi-objectid@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/joi-objectid/-/joi-objectid-3.0.1.tgz#63ace7860f8e1a993a28d40c40ffd8eff01a3668" + integrity sha512-V/3hbTlGpvJ03Me6DJbdBI08hBTasFOmipsauOsxOSnsF1blxV537WTl1zPwbfcKle4AK0Ma4OPnzMH4LlvTpQ== + +joi@^17.3.0: + version "17.4.2" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.2.tgz#02f4eb5cf88e515e614830239379dcbbe28ce7f7" + integrity sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw== + dependencies: + "@hapi/hoek" "^9.0.0" + "@hapi/topo" "^5.0.0" + "@sideway/address" "^4.1.0" + "@sideway/formula" "^3.0.0" + "@sideway/pinpoint" "^2.0.0" + js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3732,6 +3777,21 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= +medusa-core-utils@^1.1.20, medusa-core-utils@^1.1.23: + version "1.1.23" + resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.23.tgz#1e9260d5066117350dbf56dc176dd25e488e90a1" + integrity sha512-3KnfbCGud09xYC7qrc+kw2XmBFa4UuGBOPT2IU3j70BjFhEU9ftD45oolKXNUziOZIIGRf/FIwGj+Lwgy6IAfA== + dependencies: + joi "^17.3.0" + joi-objectid "^3.0.1" + +medusa-interfaces@^1.1.23: + version "1.1.24" + resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.24.tgz#13d0bc4afbd56c028c9e4bc562b0ce7a2023453c" + integrity sha512-jzdHRN6AmX2Tuh3nbZd9PQJ0z1b6TzAAfyjak2rmakfoXzv19cAcXq5iUV04kQk+659Q+A14ei1LD/IemMYDmA== + dependencies: + medusa-core-utils "^1.1.23" + meilisearch@^0.20.0: version "0.20.0" resolved "https://registry.yarnpkg.com/meilisearch/-/meilisearch-0.20.0.tgz#42899fec7a2ddefcd035e30ed5dd47aa65a6727f" diff --git a/packages/medusa/src/models/cart.ts b/packages/medusa/src/models/cart.ts index 53160a6914..5588d24c3b 100644 --- a/packages/medusa/src/models/cart.ts +++ b/packages/medusa/src/models/cart.ts @@ -151,9 +151,11 @@ export class Cart { @JoinColumn({ name: "shipping_address_id" }) shipping_address: Address - @OneToMany(() => LineItem, (lineItem) => lineItem.cart, { - cascade: ["insert", "remove"], - }) + @OneToMany( + () => LineItem, + lineItem => lineItem.cart, + { cascade: ["insert", "remove"] } + ) items: LineItem[] @Index() @@ -202,9 +204,11 @@ export class Cart { payment_session: PaymentSession - @OneToMany(() => PaymentSession, (paymentSession) => paymentSession.cart, { - cascade: true, - }) + @OneToMany( + () => PaymentSession, + paymentSession => paymentSession.cart, + { cascade: true } + ) payment_sessions: PaymentSession[] @Index() @@ -215,9 +219,11 @@ export class Cart { @JoinColumn({ name: "payment_id" }) payment: Payment - @OneToMany(() => ShippingMethod, (method) => method.cart, { - cascade: ["soft-remove", "remove"], - }) + @OneToMany( + () => ShippingMethod, + method => method.cart, + { cascade: ["soft-remove", "remove"] } + ) shipping_methods: ShippingMethod[] @DbAwareColumn({ type: "enum", enum: CartType, default: "default" }) @@ -267,7 +273,7 @@ export class Cart { @AfterLoad() private afterLoad() { if (this.payment_sessions) { - this.payment_session = this.payment_sessions.find((p) => p.is_selected) + this.payment_session = this.payment_sessions.find(p => p.is_selected) } } } diff --git a/packages/medusa/src/services/cart.js b/packages/medusa/src/services/cart.js index 9ec9b996e4..a584832c4a 100644 --- a/packages/medusa/src/services/cart.js +++ b/packages/medusa/src/services/cart.js @@ -771,8 +771,8 @@ class CartService extends BaseService { addressOrId.country_code = addressOrId.country_code.toLowerCase() if (addressOrId.id) { - cart.billing_address_id = addressOrId.id - cart.billing_address = addressOrId + const updated = await addrRepo.save(addressOrId) + cart.billing_address = updated } else { if (cart.billing_address_id) { const addr = await addrRepo.findOne({ @@ -823,8 +823,8 @@ class CartService extends BaseService { } if (addressOrId.id) { - await addrRepo.save(addressOrId) - cart.shipping_address_id = addressOrId.id + const updated = await addrRepo.save(addressOrId) + cart.shipping_address = updated } else { if (cart.shipping_address_id) { const addr = await addrRepo.findOne({