From 7c7f86e8e8be20173e774ea86b53e75c98e72e9a Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Fri, 12 Mar 2021 14:23:03 +0100 Subject: [PATCH] fix: allows shipping option filters in return (#202) * fix: allows shipping option filters in return * fix: test * chore: update fixtures * docs: update openapi --- docs-util/fixture-gen/package.json | 8 +- docs-util/fixture-gen/yarn.lock | 411 +----------- docs-util/helpers/test-server.js | 6 +- docs/api/admin-spec3.json | 620 +++++++++--------- docs/api/admin-spec3.yaml | 36 +- docs/api/fixtures.json | 350 +++++----- docs/api/store-spec3.json | 51 ++ docs/api/store-spec3.yaml | 162 +++-- .../api/__tests__/store/shipping-options.js | 134 ++++ integration-tests/api/package.json | 6 +- integration-tests/api/yarn.lock | 48 +- .../store/shipping-options/list-options.js | 5 + 12 files changed, 864 insertions(+), 973 deletions(-) create mode 100644 integration-tests/api/__tests__/store/shipping-options.js diff --git a/docs-util/fixture-gen/package.json b/docs-util/fixture-gen/package.json index 40595aaf5b..d4af7e7693 100644 --- a/docs-util/fixture-gen/package.json +++ b/docs-util/fixture-gen/package.json @@ -7,13 +7,13 @@ "build": "babel src -d dist --extensions \".ts,.js\"" }, "dependencies": { - "@medusajs/medusa": "^1.1.3", - "medusa-interfaces": "^1.1.0" + "@medusajs/medusa": "1.1.11-dev-1615546466988", + "medusa-interfaces": "1.1.1-dev-1615546466988" }, "devDependencies": { "@babel/cli": "^7.12.10", "@babel/core": "^7.12.10", "@babel/node": "^7.12.10", - "babel-preset-medusa-package": "^1.1.0" + "babel-preset-medusa-package": "1.1.0-dev-1615546466988" } -} \ No newline at end of file +} diff --git a/docs-util/fixture-gen/yarn.lock b/docs-util/fixture-gen/yarn.lock index 036fd50a59..e42289e335 100644 --- a/docs-util/fixture-gen/yarn.lock +++ b/docs-util/fixture-gen/yarn.lock @@ -946,13 +946,14 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@medusajs/medusa@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@medusajs/medusa/-/medusa-1.1.3.tgz#253cf73a45d066eb25cfa58efa81674a45759ef1" - integrity sha512-QSEe0fQuEndyJ7WUPKfaPYO5pCR5xNLT/6NAObgi2nuo4WroA2nqqU01bOuWf/Sa4PnH0YMtJ0H86qzLa0MARA== +"@medusajs/medusa@1.1.11-dev-1615546466988": + version "1.1.11-dev-1615546466988" + resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.11-dev-1615546466988.tgz#6d09c9ae174cee30a70e76e7e50e69bfc7d4b92a" + integrity sha512-Y9gB8VXoZ/SN00UB8hRJ4xWRdSZX3mCz19ls2SDP4SrqUlWcG04LZDYeKbXQqXRKFFzwR/yNnWOCkLvlrK+69w== dependencies: "@babel/plugin-transform-classes" "^7.9.5" "@hapi/joi" "^16.1.8" + "@types/lodash" "^4.14.168" awilix "^4.2.3" body-parser "^1.19.0" bull "^3.12.1" @@ -970,8 +971,8 @@ joi "^17.3.0" joi-objectid "^3.0.1" jsonwebtoken "^8.5.1" - medusa-core-utils "^1.1.0" - medusa-test-utils "^1.1.1" + medusa-core-utils "1.1.0-dev-1615546466988" + medusa-test-utils "1.1.3-dev-1615546466988" morgan "^1.9.1" multer "^1.4.2" passport "^0.4.0" @@ -985,7 +986,6 @@ request-ip "^2.1.3" resolve-cwd "^3.0.0" scrypt-kdf "^2.0.1" - typeorm "^0.2.29" ulid "^2.3.0" uuid "^8.3.1" winston "^3.2.1" @@ -1045,11 +1045,6 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== -"@sqltools/formatter@1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.2.tgz#9390a8127c0dcba61ebd7fdcc748655e191bdd68" - integrity sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q== - "@types/fs-extra@^8.0.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068" @@ -1065,6 +1060,11 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/lodash@^4.14.168": + version "4.14.168" + resolved "http://localhost:4873/@types%2flodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" + integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1083,21 +1083,6 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1105,18 +1090,6 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -any-promise@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1133,23 +1106,11 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-root-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad" - integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw== - append-field@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56" integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY= -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -1223,10 +1184,10 @@ babel-plugin-transform-typescript-metadata@^0.3.1: dependencies: "@babel/helper-plugin-utils" "^7.0.0" -babel-preset-medusa-package@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0.tgz#3b5a5fc5679a92747a5f13ab5419252b0de67b84" - integrity sha512-1rGnObrfr4WCcmYciovqn8JbwNq2KtbEho/acQAYIxl6G3LOODK/jBH2zQHeW5k4GxjVe72JZDdqjfdm88KmEw== +babel-preset-medusa-package@1.1.0-dev-1615546466988: + version "1.1.0-dev-1615546466988" + resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0-dev-1615546466988.tgz#7b99e2a01c4aa9ccd0f293ca6015c866cae941b5" + integrity sha512-lMNL7fpsVgHJsiX69p7VLmNh7wCjA6nRZq9nslRisBYgeZ4O5fpatlXvL22kU4HaxGhhhF6n5LdpovCcvXoJYg== dependencies: "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-decorators" "^7.12.1" @@ -1243,11 +1204,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" @@ -1351,14 +1307,6 @@ buffer-writer@2.0.0: resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - bull@^3.12.1: version "3.20.0" resolved "https://registry.yarnpkg.com/bull/-/bull-3.20.0.tgz#ca394d623f13ade6cddb7481f630988bce2d4d09" @@ -1424,17 +1372,6 @@ caniuse-lite@^1.0.30001173: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001181.tgz#4f0e5184e1ea7c3bf2727e735cbe7ca9a451d673" integrity sha512-m5ul/ARCX50JB8BSNM+oiPmQrR5UmngaQ3QThTTp5HcIIQGP/nPBs82BYLE+tigzm3VW+F4BJIhUyaVtEweelQ== -chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1444,14 +1381,6 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chokidar@^3.4.0, chokidar@^3.4.2: version "3.5.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" @@ -1477,27 +1406,6 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -cli-highlight@^2.1.10: - version "2.1.10" - resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.10.tgz#26a087da9209dce4fcb8cf5427dc97cd96ac173a" - integrity sha512-CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw== - dependencies: - chalk "^4.0.0" - highlight.js "^10.0.0" - mz "^2.4.0" - parse5 "^5.1.1" - parse5-htmlparser2-tree-adapter "^6.0.0" - yargs "^16.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - cluster-key-slot@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d" @@ -1518,19 +1426,12 @@ color-convert@^1.9.0, color-convert@^1.9.1: dependencies: color-name "1.1.3" -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0, color-name@~1.1.4: +color-name@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -1790,11 +1691,6 @@ electron-to-chromium@^1.3.634: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.648.tgz#b05926eca1843c04b283e682a1fc6c10af7e9dda" integrity sha512-4POzwyQ80tkDiBwkxn7IpfzioimrjRSFX1sCQ3pLZsYJ5ERYmwzdq0hZZ3nFP7Z6GtmnSn3xwWDm8FPlMeOoEQ== -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - enabled@2.0.x: version "2.0.0" resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" @@ -1861,16 +1757,11 @@ escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -2002,11 +1893,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== -figlet@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.5.0.tgz#2db4d00a584e5155a96080632db919213c3e003c" - integrity sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww== - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -2126,11 +2012,6 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - get-intrinsic@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.0.tgz#892e62931e6938c8a23ea5aaebcfb67bd97da97e" @@ -2201,23 +2082,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" @@ -2261,11 +2130,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -highlight.js@^10.0.0: - version "10.5.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.5.0.tgz#3f09fede6a865757378f2d9ebdcbc15ba268f98f" - integrity sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw== - homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -2302,11 +2166,6 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - ignore@^5.1.1: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" @@ -2320,7 +2179,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2463,11 +2322,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -2596,14 +2450,6 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.14.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" @@ -2803,28 +2649,28 @@ 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.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.1.0.tgz#0641b365b769dbf99856025d935eef5cf5d81f2c" - integrity sha512-zocRthKhLK3eSjrXbAhZZkIMBRxyvU7GcAMFh5UCEgfe7f935vjE7r5lGTr5jTEwgwaoTUk9ep0VBekz0SEdyw== +medusa-core-utils@1.1.0-dev-1615546466988: + version "1.1.0-dev-1615546466988" + resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.0-dev-1615546466988.tgz#dfcc316b59d24c0c03c2f3eb53f8c9fe9771cc03" + integrity sha512-LHKb/CiNTgbCDHJPt32QCnm4/J39uMasv19TUSB3/8Np85RWalXWQjMWmQF+f/pFuzB0/6bx7z4SFiYK6dw7YQ== dependencies: joi "^17.3.0" joi-objectid "^3.0.1" -medusa-interfaces@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.1.0.tgz#fdced50c2aac5956b4a40da34841df60a96d16c4" - integrity sha512-wSgHR/MYGJzj6y54u25v7lGX8gTaAJarwN2VIHDTn0lsVGlIPqJem+tbJkDLdUV7V5mERSq5FGoqnIFHeJaDgQ== +medusa-interfaces@1.1.1-dev-1615546466988: + version "1.1.1-dev-1615546466988" + resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.1-dev-1615546466988.tgz#0e109781d8691b8495c79e4d3bccd5c63668fcf0" + integrity sha512-Hc+aSqTwPU63HJDi11eGj5uP3ebCi3BC5YEDptumMf/JRDDZdwq8SRcwtCNKMBSIlPpsqjBqHcm8Dn7uvwXhhA== dependencies: - medusa-core-utils "^1.1.0" + medusa-core-utils "1.1.0-dev-1615546466988" -medusa-test-utils@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/medusa-test-utils/-/medusa-test-utils-1.1.1.tgz#e6c9faf9339a2fa22f162c9864091d6e12792215" - integrity sha512-Fx55x1widi9yz3tQSvQbkACyNZMu05j9q9Ta0eDWwb1q96RpTQg0BMc0Em+ZXE9EwxWHqgDUqlAfLGmCW6aQUg== +medusa-test-utils@1.1.3-dev-1615546466988: + version "1.1.3-dev-1615546466988" + resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.3-dev-1615546466988.tgz#85e3f5b435fe4259cab3ac69bad9a23d1b301c4f" + integrity sha512-ZBqX7+UEFYXcdoRFnNiv6uv3UR+bU2IBLMVdAk+/FpxX9GYBW385LKoUiCs6oRIAtHqFICHh+RNuakI2v7ra7A== dependencies: "@babel/plugin-transform-classes" "^7.9.5" - medusa-core-utils "^1.1.0" + medusa-core-utils "1.1.0-dev-1615546466988" randomatic "^3.1.1" merge-descriptors@1.0.1: @@ -2913,11 +2759,6 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.5" -mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - moment-timezone@^0.5.31: version "0.5.32" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz#db7677cc3cc680fd30303ebd90b0da1ca0dfecc2" @@ -2975,15 +2816,6 @@ multer@^1.4.2: type-is "^1.6.4" xtend "^4.0.0" -mz@^2.4.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" - integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - dependencies: - any-promise "^1.0.0" - object-assign "^4.0.1" - thenify-all "^1.0.0" - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -3044,7 +2876,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -3168,33 +3000,11 @@ packet-reader@1.0.0: resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== -parent-require@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-require/-/parent-require-1.0.0.tgz#746a167638083a860b0eef6732cb27ed46c32977" - integrity sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc= - parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= -parse5-htmlparser2-tree-adapter@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== - dependencies: - parse5 "^6.0.1" - -parse5@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - -parse5@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -3594,11 +3404,6 @@ request-ip@^2.1.3: dependencies: is_js "^0.9.0" -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -3669,11 +3474,6 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@>=0.6.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - scrypt-kdf@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6" @@ -3740,14 +3540,6 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sha.js@^2.4.11: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - simple-swizzle@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" @@ -3843,11 +3635,6 @@ split2@^3.1.1: dependencies: readable-stream "^3.0.0" -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -3876,15 +3663,6 @@ streamsearch@0.1.2: resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - string.prototype.trimend@^1.0.1, string.prototype.trimend@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" @@ -3920,25 +3698,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -3946,32 +3705,11 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - text-hex@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== -thenify-all@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" - integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= - dependencies: - thenify ">= 3.1.0 < 4" - -"thenify@>= 3.1.0 < 4": - version "3.3.1" - resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" - integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== - dependencies: - any-promise "^1.0.0" - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" @@ -4019,11 +3757,6 @@ triple-beam@^1.2.0, triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -tslib@^1.13.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - tslib@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" @@ -4042,28 +3775,6 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typeorm@^0.2.29: - version "0.2.30" - resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.30.tgz#a0df2256402cbcdde8049a244437560495ce9b38" - integrity sha512-qpr8AO3Phi6ZF7qMHOrRdNisVt8jE1KfmW0ooLFcXscA87aJ12aBPyB9cJfxGNjNwd7B3WIK9ZlBveWiqd74QA== - dependencies: - "@sqltools/formatter" "1.2.2" - app-root-path "^3.0.0" - buffer "^5.5.0" - chalk "^4.1.0" - cli-highlight "^2.1.10" - debug "^4.1.1" - dotenv "^8.2.0" - glob "^7.1.6" - js-yaml "^3.14.0" - mkdirp "^1.0.4" - reflect-metadata "^0.1.13" - sha.js "^2.4.11" - tslib "^1.13.0" - xml2js "^0.4.23" - yargonaut "^1.1.2" - yargs "^16.0.3" - uid-safe@~2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" @@ -4203,71 +3914,17 @@ winston@^3.2.1: triple-beam "^1.3.0" winston-transport "^4.4.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xml2js@^0.4.23: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== - xtend@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" - integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargonaut@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/yargonaut/-/yargonaut-1.1.4.tgz#c64f56432c7465271221f53f5cc517890c3d6e0c" - integrity sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA== - dependencies: - chalk "^1.1.1" - figlet "^1.1.1" - parent-require "^1.0.0" - -yargs-parser@^20.2.2: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs@^16.0.0, yargs@^16.0.3: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" diff --git a/docs-util/helpers/test-server.js b/docs-util/helpers/test-server.js index 215f28e80c..1ce58decd7 100644 --- a/docs-util/helpers/test-server.js +++ b/docs-util/helpers/test-server.js @@ -1,12 +1,14 @@ const path = require("path"); const express = require("express"); const getPort = require("get-port"); - -const loaders = require("@medusajs/medusa/dist/loaders").default; +const importFrom = require("import-from"); const initialize = async () => { const app = express(); + const loaders = importFrom(process.cwd(), "@medusajs/medusa/dist/loaders") + .default; + const { dbConnection } = await loaders({ directory: path.resolve(process.cwd()), expressApp: app, diff --git a/docs/api/admin-spec3.json b/docs/api/admin-spec3.json index f6648c935e..0e7fdaad36 100644 --- a/docs/api/admin-spec3.json +++ b/docs/api/admin-spec3.json @@ -71,80 +71,6 @@ } ], "paths": { - "/auth": { - "post": { - "operationId": "PostAuth", - "summary": "Authenticate a User", - "description": "Logs a User in and authorizes them to manage Store settings.", - "parameters": [], - "tags": [ - "Auth" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "customer": { - "$ref": "#/components/schemas/user" - } - } - } - } - } - } - }, - "requestBody": { - "content": { - "application/json": { - "schema": { - "type": "object", - "required": [ - "email", - "password" - ], - "properties": { - "email": { - "type": "string", - "description": "The User's email." - }, - "password": { - "type": "string", - "description": "The User's password." - } - } - } - } - } - } - }, - "get": { - "operationId": "GetAuth", - "summary": "Get Session", - "description": "Gets the currently logged in User.", - "tags": [ - "Auth" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "customer": { - "$ref": "#/components/schemas/user" - } - } - } - } - } - } - } - } - }, "/collections": { "post": { "operationId": "PostCollections", @@ -357,6 +283,80 @@ } } }, + "/auth": { + "post": { + "operationId": "PostAuth", + "summary": "Authenticate a User", + "description": "Logs a User in and authorizes them to manage Store settings.", + "parameters": [], + "tags": [ + "Auth" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "customer": { + "$ref": "#/components/schemas/user" + } + } + } + } + } + } + }, + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "email", + "password" + ], + "properties": { + "email": { + "type": "string", + "description": "The User's email." + }, + "password": { + "type": "string", + "description": "The User's password." + } + } + } + } + } + } + }, + "get": { + "operationId": "GetAuth", + "summary": "Get Session", + "description": "Gets the currently logged in User.", + "tags": [ + "Auth" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "customer": { + "$ref": "#/components/schemas/user" + } + } + } + } + } + } + } + } + }, "/customers": { "post": { "operationId": "PostCustomers", @@ -534,6 +534,242 @@ } } }, + "/gift-cards": { + "post": { + "operationId": "PostGiftCards", + "summary": "Create a Gift Card", + "description": "Creates a Gift Card that can redeemed by its unique code. The Gift Card is only valid within 1 region.", + "requestBody": { + "content": { + "application/json": { + "schema": { + "properties": { + "value": { + "type": "integer", + "description": "The value (excluding VAT) that the Gift Card should represent." + }, + "is_disabled": { + "type": "boolean", + "description": "Whether the Gift Card is disabled on creation. You will have to enable it later to make it available to Customers." + }, + "ends_at": { + "type": "string", + "format": "date-time", + "description": "The time at which the Gift Card should no longer be available." + }, + "region_id": { + "description": "The id of the Region in which the Gift Card can be used.", + "type": "array", + "items": { + "type": "string" + } + }, + "metadata": { + "description": "An optional set of key-value pairs to hold additional information.", + "type": "object" + } + } + } + } + } + }, + "tags": [ + "Gift Card" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "gift_card": { + "$ref": "#/components/schemas/gift_card" + } + } + } + } + } + } + } + }, + "get": { + "operationId": "GetGiftCards", + "summary": "List Gift Cards", + "description": "Retrieves a list of Gift Cards.", + "tags": [ + "Gift Card" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "gift_cards": { + "type": "array", + "items": { + "$ref": "#/components/schemas/gift_card" + } + } + } + } + } + } + } + } + } + }, + "/gift-cards/{id}": { + "delete": { + "operationId": "DeleteGiftCardsGiftCard", + "summary": "Delete a Gift Card", + "description": "Deletes a Gift Card", + "parameters": [ + { + "in": "path", + "name": "id", + "required": true, + "description": "The id of the Gift Card to delete.", + "schema": { + "type": "string" + } + } + ], + "tags": [ + "Gift Card" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "id": { + "type": "string", + "description": "The id of the deleted Gift Card" + }, + "object": { + "type": "string", + "description": "The type of the object that was deleted." + }, + "deleted": { + "type": "boolean" + } + } + } + } + } + } + } + }, + "get": { + "operationId": "GetGiftCardsGiftCard", + "summary": "Retrieve a Gift Card", + "description": "Retrieves a Gift Card.", + "parameters": [ + { + "in": "path", + "name": "id", + "required": true, + "description": "The id of the Gift Card.", + "schema": { + "type": "string" + } + } + ], + "tags": [ + "Gift Card" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "gift_card": { + "$ref": "#/components/schemas/gift_card" + } + } + } + } + } + } + } + }, + "post": { + "operationId": "PostGiftCardsGiftCard", + "summary": "Create a Gift Card", + "description": "Creates a Gift Card that can redeemed by its unique code. The Gift Card is only valid within 1 region.", + "parameters": [ + { + "in": "path", + "name": "id", + "required": true, + "description": "The id of the Gift Card.", + "schema": { + "type": "string" + } + } + ], + "requestBody": { + "content": { + "application/json": { + "schema": { + "properties": { + "balance": { + "type": "integer", + "description": "The value (excluding VAT) that the Gift Card should represent." + }, + "is_disabled": { + "type": "boolean", + "description": "Whether the Gift Card is disabled on creation. You will have to enable it later to make it available to Customers." + }, + "ends_at": { + "type": "string", + "format": "date-time", + "description": "The time at which the Gift Card should no longer be available." + }, + "region_id": { + "description": "The id of the Region in which the Gift Card can be used.", + "type": "array", + "items": { + "type": "string" + } + }, + "metadata": { + "description": "An optional set of key-value pairs to hold additional information.", + "type": "object" + } + } + } + } + } + }, + "tags": [ + "Gift Card" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "gift_card": { + "$ref": "#/components/schemas/gift_card" + } + } + } + } + } + } + } + } + }, "/discounts/{id}/regions/{region_id}": { "post": { "operationId": "PostDiscountsDiscountRegionsRegion", @@ -1038,242 +1274,6 @@ } } }, - "/gift-cards": { - "post": { - "operationId": "PostGiftCards", - "summary": "Create a Gift Card", - "description": "Creates a Gift Card that can redeemed by its unique code. The Gift Card is only valid within 1 region.", - "requestBody": { - "content": { - "application/json": { - "schema": { - "properties": { - "value": { - "type": "integer", - "description": "The value (excluding VAT) that the Gift Card should represent." - }, - "is_disabled": { - "type": "boolean", - "description": "Whether the Gift Card is disabled on creation. You will have to enable it later to make it available to Customers." - }, - "ends_at": { - "type": "string", - "format": "date-time", - "description": "The time at which the Gift Card should no longer be available." - }, - "region_id": { - "description": "The id of the Region in which the Gift Card can be used.", - "type": "array", - "items": { - "type": "string" - } - }, - "metadata": { - "description": "An optional set of key-value pairs to hold additional information.", - "type": "object" - } - } - } - } - } - }, - "tags": [ - "Gift Card" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "gift_card": { - "$ref": "#/components/schemas/gift_card" - } - } - } - } - } - } - } - }, - "get": { - "operationId": "GetGiftCards", - "summary": "List Gift Cards", - "description": "Retrieves a list of Gift Cards.", - "tags": [ - "Gift Card" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "gift_cards": { - "type": "array", - "items": { - "$ref": "#/components/schemas/gift_card" - } - } - } - } - } - } - } - } - } - }, - "/gift-cards/{id}": { - "delete": { - "operationId": "DeleteGiftCardsGiftCard", - "summary": "Delete a Gift Card", - "description": "Deletes a Gift Card", - "parameters": [ - { - "in": "path", - "name": "id", - "required": true, - "description": "The id of the Gift Card to delete.", - "schema": { - "type": "string" - } - } - ], - "tags": [ - "Gift Card" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "id": { - "type": "string", - "description": "The id of the deleted Gift Card" - }, - "object": { - "type": "string", - "description": "The type of the object that was deleted." - }, - "deleted": { - "type": "boolean" - } - } - } - } - } - } - } - }, - "get": { - "operationId": "GetGiftCardsGiftCard", - "summary": "Retrieve a Gift Card", - "description": "Retrieves a Gift Card.", - "parameters": [ - { - "in": "path", - "name": "id", - "required": true, - "description": "The id of the Gift Card.", - "schema": { - "type": "string" - } - } - ], - "tags": [ - "Gift Card" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "gift_card": { - "$ref": "#/components/schemas/gift_card" - } - } - } - } - } - } - } - }, - "post": { - "operationId": "PostGiftCardsGiftCard", - "summary": "Create a Gift Card", - "description": "Creates a Gift Card that can redeemed by its unique code. The Gift Card is only valid within 1 region.", - "parameters": [ - { - "in": "path", - "name": "id", - "required": true, - "description": "The id of the Gift Card.", - "schema": { - "type": "string" - } - } - ], - "requestBody": { - "content": { - "application/json": { - "schema": { - "properties": { - "balance": { - "type": "integer", - "description": "The value (excluding VAT) that the Gift Card should represent." - }, - "is_disabled": { - "type": "boolean", - "description": "Whether the Gift Card is disabled on creation. You will have to enable it later to make it available to Customers." - }, - "ends_at": { - "type": "string", - "format": "date-time", - "description": "The time at which the Gift Card should no longer be available." - }, - "region_id": { - "description": "The id of the Region in which the Gift Card can be used.", - "type": "array", - "items": { - "type": "string" - } - }, - "metadata": { - "description": "An optional set of key-value pairs to hold additional information.", - "type": "object" - } - } - } - } - } - }, - "tags": [ - "Gift Card" - ], - "responses": { - "200": { - "description": "OK", - "content": { - "application/json": { - "schema": { - "properties": { - "gift_card": { - "$ref": "#/components/schemas/gift_card" - } - } - } - } - } - } - } - } - }, "/notifications": { "get": { "operationId": "GetNotifications", diff --git a/docs/api/admin-spec3.yaml b/docs/api/admin-spec3.yaml index 6668035d49..04561a293e 100644 --- a/docs/api/admin-spec3.yaml +++ b/docs/api/admin-spec3.yaml @@ -3480,6 +3480,24 @@ paths: properties: shipping_profiles: $ref: '#/components/schemas/shipping_profile' + /swaps: + get: + operationId: GetSwaps + summary: List Swaps + description: Retrieves a list of Swaps. + tags: + - Swap + responses: + '200': + description: OK + content: + application/json: + schema: + properties: + swaps: + type: array + items: + $ref: '#/components/schemas/swap' '/store/currencies/{code}': post: operationId: PostStoreCurrenciesCode @@ -3590,24 +3608,6 @@ paths: type: array items: $ref: '#/components/schemas/store' - /swaps: - get: - operationId: GetSwaps - summary: List Swaps - description: Retrieves a list of Swaps. - tags: - - Swap - responses: - '200': - description: OK - content: - application/json: - schema: - properties: - swaps: - type: array - items: - $ref: '#/components/schemas/swap' /variants: get: operationId: GetVariants diff --git a/docs/api/fixtures.json b/docs/api/fixtures.json index c7b37fa53a..ebd064e427 100644 --- a/docs/api/fixtures.json +++ b/docs/api/fixtures.json @@ -1,7 +1,7 @@ { "resources": { "customer": { - "id": "cus_01F0BGFY6ANPB473KJ5H8V889M", + "id": "cus_01F0K18KCA0FNCJHWYV7HYPENX", "email": "test1@email.com", "first_name": null, "last_name": null, @@ -10,21 +10,21 @@ "phone": null, "has_account": false, "orders": [], - "created_at": "2021-03-09T12:48:21.706Z", - "updated_at": "2021-03-09T12:48:21.706Z", + "created_at": "2021-03-12T10:56:08.074Z", + "updated_at": "2021-03-12T10:56:08.074Z", "deleted_at": null, "metadata": null }, "order": { - "id": "order_01F0BGFG2Z0X0ETETP0YS0HRCT", + "id": "order_01F0K17W8Z3T61W1MHSQRRCKH4", "status": "pending", "fulfillment_status": "not_fulfilled", "payment_status": "not_paid", "display_id": 1, "cart_id": null, - "customer_id": "cus_01F0BGFG280DRD18VXM1F9GJXA", + "customer_id": "cus_01F0K17W7MAHJX7WWJRM6TK5EY", "customer": { - "id": "cus_01F0BGFG280DRD18VXM1F9GJXA", + "id": "cus_01F0K17W7MAHJX7WWJRM6TK5EY", "email": "test@email.com", "first_name": null, "last_name": null, @@ -32,14 +32,14 @@ "password_hash": null, "phone": null, "has_account": false, - "created_at": "2021-03-09T12:48:07.240Z", - "updated_at": "2021-03-09T12:48:07.240Z", + "created_at": "2021-03-12T10:55:44.372Z", + "updated_at": "2021-03-12T10:55:44.372Z", "deleted_at": null, "metadata": null }, "email": "test@email.com", "billing_address": { - "id": "addr_01F0BGFG30PG1NP6V0EDJDF6PW", + "id": "addr_01F0K17W8ZDQS2S1EX8A293RTZ", "customer_id": null, "company": null, "first_name": "lebron", @@ -51,13 +51,13 @@ "province": null, "postal_code": null, "phone": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "deleted_at": null, "metadata": null }, "shipping_address": { - "id": "addr_01F0BGFG30EBKX6C89N35YB2PX", + "id": "addr_01F0K17W8ZV35SS5XHM1RMA4BF", "customer_id": null, "company": null, "first_name": "lebron", @@ -69,22 +69,22 @@ "province": null, "postal_code": null, "phone": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "deleted_at": null, "metadata": null }, - "region_id": "reg_01F0BGFG21NC3VQ662FYNF3P4Z", + "region_id": "reg_01F0K17W77HC1F9NB27M6R1AP0", "region": { - "id": "reg_01F0BGFG21NC3VQ662FYNF3P4Z", + "id": "reg_01F0K17W77HC1F9NB27M6R1AP0", "name": "Test Region", "currency_code": "usd", "tax_rate": "0", "tax_code": null, "payment_providers": [], "fulfillment_providers": [], - "created_at": "2021-03-09T12:48:07.233Z", - "updated_at": "2021-03-09T12:48:07.233Z", + "created_at": "2021-03-12T10:55:44.359Z", + "updated_at": "2021-03-12T10:55:44.359Z", "deleted_at": null, "metadata": null }, @@ -95,25 +95,25 @@ "id": "test-discount", "code": "TEST134", "is_dynamic": false, - "rule_id": "dru_01F0BGFG30S3FSBE67PKDCTT0Y", + "rule_id": "dru_01F0K17W8ZM2ZX3F1WSBHK7CGS", "rule": { - "id": "dru_01F0BGFG30S3FSBE67PKDCTT0Y", + "id": "dru_01F0K17W8ZM2ZX3F1WSBHK7CGS", "description": "Test Discount", "type": "percentage", "value": 10, "allocation": "total", "usage_limit": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "deleted_at": null, "metadata": null }, "is_disabled": false, "parent_discount_id": null, - "starts_at": "2021-03-09T12:48:07.263Z", + "starts_at": "2021-03-12T10:55:44.415Z", "ends_at": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "deleted_at": null, "metadata": null } @@ -121,25 +121,25 @@ "gift_cards": [], "shipping_methods": [ { - "id": "sm_01F0BGFG3SQZC01D8JP4REY0RF", - "shipping_option_id": "so_01F0BGFG2DV0GR6VD87AQ7XAB2", - "order_id": "order_01F0BGFG2Z0X0ETETP0YS0HRCT", + "id": "sm_01F0K17WA1GJXPNM9PZ5TCS2QV", + "shipping_option_id": "so_01F0K17W7VA316M9Y0PHBDCD9P", + "order_id": "order_01F0K17W8Z3T61W1MHSQRRCKH4", "claim_order_id": null, "cart_id": null, "swap_id": null, "return_id": null, "shipping_option": { - "id": "so_01F0BGFG2DV0GR6VD87AQ7XAB2", + "id": "so_01F0K17W7VA316M9Y0PHBDCD9P", "name": "test-option", - "region_id": "reg_01F0BGFG21NC3VQ662FYNF3P4Z", - "profile_id": "sp_01F0BGFG04GKTA9FTYWBT19NKJ", + "region_id": "reg_01F0K17W77HC1F9NB27M6R1AP0", + "profile_id": "sp_01F0K17W52ZB0BKW4S0QKQBSGC", "provider_id": "test-ful", "price_type": "flat_rate", "amount": 1000, "is_return": false, "data": {}, - "created_at": "2021-03-09T12:48:07.245Z", - "updated_at": "2021-03-09T12:48:07.245Z", + "created_at": "2021-03-12T10:55:44.379Z", + "updated_at": "2021-03-12T10:55:44.379Z", "deleted_at": null, "metadata": null }, @@ -152,7 +152,7 @@ "id": "test-payment", "swap_id": null, "cart_id": null, - "order_id": "order_01F0BGFG2Z0X0ETETP0YS0HRCT", + "order_id": "order_01F0K17W8Z3T61W1MHSQRRCKH4", "amount": 10000, "currency_code": "usd", "amount_refunded": 0, @@ -160,8 +160,8 @@ "data": {}, "captured_at": null, "canceled_at": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "metadata": null, "idempotency_key": null } @@ -175,7 +175,7 @@ { "id": "test-item", "cart_id": null, - "order_id": "order_01F0BGFG2Z0X0ETETP0YS0HRCT", + "order_id": "order_01F0K17W8Z3T61W1MHSQRRCKH4", "swap_id": null, "claim_order_id": null, "title": "Line Item", @@ -192,16 +192,16 @@ "fulfilled_quantity": 1, "returned_quantity": null, "shipped_quantity": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "metadata": null, "refundable": 7200 } ], "gift_card_transactions": [], "canceled_at": null, - "created_at": "2021-03-09T12:48:07.263Z", - "updated_at": "2021-03-09T12:48:07.263Z", + "created_at": "2021-03-12T10:55:44.415Z", + "updated_at": "2021-03-12T10:55:44.415Z", "metadata": null, "shipping_total": 1000, "gift_card_total": 0, @@ -213,7 +213,7 @@ "refundable_amount": 8200 }, "product": { - "id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", + "id": "prod_01F0K1814DVJA4WW8SQA4C2S21", "title": "Test product", "subtitle": null, "description": "test-product-description", @@ -223,38 +223,38 @@ "thumbnail": null, "options": [ { - "id": "opt_01F0BGG4N2W8EZJP5KDV0W2250", + "id": "opt_01F0K1814KYQSBS6ESDGGV703V", "title": "size", - "product_id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "product_id": "prod_01F0K1814DVJA4WW8SQA4C2S21", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, { - "id": "opt_01F0BGG4N3Q09ME0BEZG6XZGFQ", + "id": "opt_01F0K1814MV2PBHXFVTHAD8KA8", "title": "color", - "product_id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "product_id": "prod_01F0K1814DVJA4WW8SQA4C2S21", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null } ], "variants": [ { - "id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", + "id": "variant_01F0K1815DA13R050ETD3QE8CG", "title": "Test variant", - "product_id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", + "product_id": "prod_01F0K1814DVJA4WW8SQA4C2S21", "product": { - "id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", + "id": "prod_01F0K1814DVJA4WW8SQA4C2S21", "title": "Test product", "subtitle": null, "description": "test-product-description", "handle": "test-product", "is_giftcard": false, "thumbnail": null, - "profile_id": "sp_01F0BGG4J2RGH25WZVP8S6VNGW", + "profile_id": "sp_01F0K1810TK56G1RQFJJTN3ZCN", "weight": null, "length": null, "height": null, @@ -265,21 +265,21 @@ "material": null, "collection_id": "test-collection", "type_id": "test-type", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, "prices": [ { - "id": "ma_01F0BGG4P5K0TCMD72MJFS0M65", + "id": "ma_01F0K1815N7BMYYVP6Z63VS49A", "currency_code": "usd", "amount": 100, "sale_amount": null, - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", "region_id": null, - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null } ], @@ -300,33 +300,33 @@ "width": null, "options": [ { - "id": "optval_01F0BGG4NY1PRPV3FXQ3J66GQH", + "id": "optval_01F0K1815D5D7KMHJ4EF9HFMH2", "value": "large", - "option_id": "opt_01F0BGG4N2W8EZJP5KDV0W2250", - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "option_id": "opt_01F0K1814KYQSBS6ESDGGV703V", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, { - "id": "optval_01F0BGG4NYTMFH5EXJ4C7QAKSK", + "id": "optval_01F0K1815EZ5KV8N3QB5AAAEED", "value": "green", - "option_id": "opt_01F0BGG4N3Q09ME0BEZG6XZGFQ", - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "option_id": "opt_01F0K1814MV2PBHXFVTHAD8KA8", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null } ], - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null } ], - "profile_id": "sp_01F0BGG4J2RGH25WZVP8S6VNGW", + "profile_id": "sp_01F0K1810TK56G1RQFJJTN3ZCN", "weight": null, "length": null, "height": null, @@ -340,8 +340,8 @@ "id": "test-collection", "title": "Test collection", "handle": null, - "created_at": "2021-03-09T12:48:28.250Z", - "updated_at": "2021-03-09T12:48:28.250Z", + "created_at": "2021-03-12T10:55:49.309Z", + "updated_at": "2021-03-12T10:55:49.309Z", "deleted_at": null, "metadata": null }, @@ -349,8 +349,8 @@ "type": { "id": "test-type", "value": "test-type", - "created_at": "2021-03-09T12:48:28.260Z", - "updated_at": "2021-03-09T12:48:28.260Z", + "created_at": "2021-03-12T10:55:49.332Z", + "updated_at": "2021-03-12T10:55:49.332Z", "deleted_at": null, "metadata": null }, @@ -358,32 +358,32 @@ { "id": "tag1", "value": "123", - "created_at": "2021-03-09T12:48:28.257Z", - "updated_at": "2021-03-09T12:48:28.257Z", + "created_at": "2021-03-12T10:55:49.326Z", + "updated_at": "2021-03-12T10:55:49.326Z", "deleted_at": null, "metadata": null }, { - "id": "ptag_01F0BGG4MRHZSMYN9Q1YQZHPWT", + "id": "ptag_01F0K1814933N3JKMQH1VYRY5P", "value": "456", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null } ], - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "metadata": null }, "cart": { - "id": "cart_01F0BGFQA6ETNHS7QGEZD9VTF2", + "id": "cart_01F0K18Q13W272V5GVAKDEX36X", "email": null, "billing_address_id": null, "billing_address": null, - "shipping_address_id": "addr_01F0BGFQA6YF81V6CREDHNCZMZ", + "shipping_address_id": "addr_01F0K18Q13X1YVRPS0QDP1CKEQ", "shipping_address": { - "id": "addr_01F0BGFQA6YF81V6CREDHNCZMZ", + "id": "addr_01F0K18Q13X1YVRPS0QDP1CKEQ", "customer_id": null, "company": null, "first_name": null, @@ -395,8 +395,8 @@ "province": null, "postal_code": null, "phone": null, - "created_at": "2021-03-09T12:48:14.638Z", - "updated_at": "2021-03-09T12:48:14.638Z", + "created_at": "2021-03-12T10:56:11.787Z", + "updated_at": "2021-03-12T10:56:11.787Z", "deleted_at": null, "metadata": null }, @@ -421,8 +421,8 @@ ], "payment_providers": [], "fulfillment_providers": [], - "created_at": "2021-03-09T12:48:14.601Z", - "updated_at": "2021-03-09T12:48:14.601Z", + "created_at": "2021-03-12T10:56:11.763Z", + "updated_at": "2021-03-12T10:56:11.763Z", "deleted_at": null, "metadata": null }, @@ -435,11 +435,15 @@ "shipping_methods": [], "type": "default", "completed_at": null, - "created_at": "2021-03-09T12:48:14.638Z", - "updated_at": "2021-03-09T12:48:14.777Z", + "created_at": "2021-03-12T10:56:11.787Z", + "updated_at": "2021-03-12T10:56:11.875Z", "deleted_at": null, "metadata": null, "idempotency_key": null, + "context": { + "ip": "::ffff:127.0.0.1", + "user_agent": "axios/0.21.1" + }, "shipping_total": 0, "discount_total": 0, "tax_total": 0, @@ -448,53 +452,53 @@ "total": 0 }, "product_collection": { - "id": "pcol_01F0BGG81W0FERCAHMR79J72G8", + "id": "pcol_01F0K18VNNBZ2PEC74BW6NEF7X", "title": "Summer Collection", "handle": "summer-collection", - "created_at": "2021-03-09T12:48:31.804Z", - "updated_at": "2021-03-09T12:48:31.804Z", + "created_at": "2021-03-12T10:56:16.564Z", + "updated_at": "2021-03-12T10:56:16.564Z", "deleted_at": null, "metadata": null }, "discount": { - "id": "disc_01F0BGG1BJH91HJ7J9Q0NR0BR6", + "id": "disc_01F0K188KEVS1K6GZV087EF46E", "code": "10DISC", "is_dynamic": false, - "rule_id": "dru_01F0BGG1B3BCZ292BSRRK72JGS", + "rule_id": "dru_01F0K188JR04H4Z843MRMRC6SS", "rule": { - "id": "dru_01F0BGG1B3BCZ292BSRRK72JGS", + "id": "dru_01F0K188JR04H4Z843MRMRC6SS", "description": "10 Percent", "type": "percentage", "value": 10, "allocation": "total", "usage_limit": null, - "created_at": "2021-03-09T12:48:24.921Z", - "updated_at": "2021-03-09T12:48:24.921Z", + "created_at": "2021-03-12T10:55:57.004Z", + "updated_at": "2021-03-12T10:55:57.004Z", "deleted_at": null, "metadata": null }, "is_disabled": false, "parent_discount_id": null, - "starts_at": "2021-03-09T12:48:24.921Z", + "starts_at": "2021-03-12T10:55:57.004Z", "ends_at": null, - "created_at": "2021-03-09T12:48:24.921Z", - "updated_at": "2021-03-09T12:48:24.921Z", + "created_at": "2021-03-12T10:55:57.004Z", + "updated_at": "2021-03-12T10:55:57.004Z", "deleted_at": null, "metadata": null }, "product_variant": { - "id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", + "id": "variant_01F0K1815DA13R050ETD3QE8CG", "title": "Test variant", - "product_id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", + "product_id": "prod_01F0K1814DVJA4WW8SQA4C2S21", "product": { - "id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", + "id": "prod_01F0K1814DVJA4WW8SQA4C2S21", "title": "Test product", "subtitle": null, "description": "test-product-description", "handle": "test-product", "is_giftcard": false, "thumbnail": null, - "profile_id": "sp_01F0BGG4J2RGH25WZVP8S6VNGW", + "profile_id": "sp_01F0K1810TK56G1RQFJJTN3ZCN", "weight": null, "length": null, "height": null, @@ -505,21 +509,21 @@ "material": null, "collection_id": "test-collection", "type_id": "test-type", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, "prices": [ { - "id": "ma_01F0BGG4P5K0TCMD72MJFS0M65", + "id": "ma_01F0K1815N7BMYYVP6Z63VS49A", "currency_code": "usd", "amount": 100, "sale_amount": null, - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", "region_id": null, - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null } ], @@ -540,93 +544,93 @@ "width": null, "options": [ { - "id": "optval_01F0BGG4NY1PRPV3FXQ3J66GQH", + "id": "optval_01F0K1815D5D7KMHJ4EF9HFMH2", "value": "large", - "option_id": "opt_01F0BGG4N2W8EZJP5KDV0W2250", - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "option_id": "opt_01F0K1814KYQSBS6ESDGGV703V", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, { - "id": "optval_01F0BGG4NYTMFH5EXJ4C7QAKSK", + "id": "optval_01F0K1815EZ5KV8N3QB5AAAEED", "value": "green", - "option_id": "opt_01F0BGG4N3Q09ME0BEZG6XZGFQ", - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "option_id": "opt_01F0K1814MV2PBHXFVTHAD8KA8", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null } ], - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, "product_option": { - "id": "opt_01F0BGG4N2W8EZJP5KDV0W2250", + "id": "opt_01F0K1814KYQSBS6ESDGGV703V", "title": "size", - "product_id": "prod_01F0BGG4MWSZH7YYJGHGZMQKHM", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "product_id": "prod_01F0K1814DVJA4WW8SQA4C2S21", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, "product_option_value": { - "id": "optval_01F0BGG4NY1PRPV3FXQ3J66GQH", + "id": "optval_01F0K1815D5D7KMHJ4EF9HFMH2", "value": "large", - "option_id": "opt_01F0BGG4N2W8EZJP5KDV0W2250", - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "option_id": "opt_01F0K1814KYQSBS6ESDGGV703V", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null, "metadata": null }, "money_amount": { - "id": "ma_01F0BGG4P5K0TCMD72MJFS0M65", + "id": "ma_01F0K1815N7BMYYVP6Z63VS49A", "currency_code": "usd", "amount": 100, "sale_amount": null, - "variant_id": "variant_01F0BGG4NYDVW4V6AHKB58DQWT", + "variant_id": "variant_01F0K1815DA13R050ETD3QE8CG", "region_id": null, - "created_at": "2021-03-09T12:48:28.304Z", - "updated_at": "2021-03-09T12:48:28.304Z", + "created_at": "2021-03-12T10:55:49.379Z", + "updated_at": "2021-03-12T10:55:49.379Z", "deleted_at": null }, "gift_card": { - "id": "gift_01F0BF6H3XHRT2SF4Y05AM95B9", - "code": "HRYB-SMX4-XXQN-2SRL", + "id": "gift_01F0K18FQFN944SHCBRRK0844M", + "code": "O6UW-SZPS-GB62-Y3Q8", "value": 1000, "balance": 1000, - "region_id": "reg_01F0BF6H2MZ06R2G2ZGZCAX3NS", + "region_id": "reg_01F0K18FP7NA54BTMGDB75ABA7", "region": { - "id": "reg_01F0BF6H2MZ06R2G2ZGZCAX3NS", + "id": "reg_01F0K18FP7NA54BTMGDB75ABA7", "name": "Test Region", "currency_code": "usd", "tax_rate": "0", "tax_code": null, "payment_providers": [], "fulfillment_providers": [], - "created_at": "2021-03-09T12:25:44.788Z", - "updated_at": "2021-03-09T12:25:44.788Z", + "created_at": "2021-03-12T10:56:04.295Z", + "updated_at": "2021-03-12T10:56:04.295Z", "deleted_at": null, "metadata": null }, "is_disabled": false, "ends_at": null, - "created_at": "2021-03-09T12:25:44.818Z", - "updated_at": "2021-03-09T12:25:44.818Z", + "created_at": "2021-03-12T10:56:04.324Z", + "updated_at": "2021-03-12T10:56:04.324Z", "deleted_at": null, "metadata": null }, "shipping_option": { - "id": "so_01F0BGFTXZ6V3GAJHBKHNTR54H", + "id": "so_01F0K184VDZ5AXZXS05RCCNSJH", "name": "Free Shipping", - "region_id": "reg_01F0BGFTW7J0DGWKJJP3X7AWP9", + "region_id": "reg_01F0K184SWFZH676GN3E59EHMN", "region": { - "id": "reg_01F0BGFTW7J0DGWKJJP3X7AWP9", + "id": "reg_01F0K184SWFZH676GN3E59EHMN", "name": "Test Region", "currency_code": "usd", "tax_rate": "0", @@ -638,18 +642,18 @@ "is_installed": true } ], - "created_at": "2021-03-09T12:48:18.311Z", - "updated_at": "2021-03-09T12:48:18.311Z", + "created_at": "2021-03-12T10:55:53.148Z", + "updated_at": "2021-03-12T10:55:53.148Z", "deleted_at": null, "metadata": null }, - "profile_id": "sp_01F0BGFTVGXRBATSDBZN5SK2JP", + "profile_id": "sp_01F0K184SAYPYPHCMVENN6V8KH", "profile": { - "id": "sp_01F0BGFTVGXRBATSDBZN5SK2JP", + "id": "sp_01F0K184SAYPYPHCMVENN6V8KH", "name": "Default Shipping Profile", "type": "default", - "created_at": "2021-03-09T12:48:18.240Z", - "updated_at": "2021-03-09T12:48:18.240Z", + "created_at": "2021-03-12T10:55:53.081Z", + "updated_at": "2021-03-12T10:55:53.081Z", "deleted_at": null, "metadata": null }, @@ -659,13 +663,13 @@ "is_return": false, "requirements": [], "data": {}, - "created_at": "2021-03-09T12:48:18.354Z", - "updated_at": "2021-03-09T12:48:18.354Z", + "created_at": "2021-03-12T10:55:53.184Z", + "updated_at": "2021-03-12T10:55:53.184Z", "deleted_at": null, "metadata": null }, "region": { - "id": "reg_01F0BGFTW7J0DGWKJJP3X7AWP9", + "id": "reg_01F0K184SWFZH676GN3E59EHMN", "name": "Test Region", "currency_code": "usd", "tax_rate": "0", @@ -677,17 +681,17 @@ "is_installed": true } ], - "created_at": "2021-03-09T12:48:18.311Z", - "updated_at": "2021-03-09T12:48:18.311Z", + "created_at": "2021-03-12T10:55:53.148Z", + "updated_at": "2021-03-12T10:55:53.148Z", "deleted_at": null, "metadata": null }, "return": { - "id": "ret_01F0BGFGGVWNV93E789K1DB2QK", + "id": "ret_01F0K17WQFXJ8R8HS0NFQGRWT2", "status": "requested", "items": [ { - "return_id": "ret_01F0BGFGGVWNV93E789K1DB2QK", + "return_id": "ret_01F0K17WQFXJ8R8HS0NFQGRWT2", "item_id": "test-item", "quantity": 1, "is_requested": true, @@ -698,36 +702,36 @@ ], "swap_id": null, "claim_order_id": null, - "order_id": "order_01F0BGFGBMCTXE6CD7KCTZG5D1", + "order_id": "order_01F0K17WJC0F5K5G111Y53E641", "shipping_method": null, "shipping_data": null, "refund_amount": 7200, "received_at": null, - "created_at": "2021-03-09T12:48:07.680Z", - "updated_at": "2021-03-09T12:48:07.680Z", + "created_at": "2021-03-12T10:55:44.853Z", + "updated_at": "2021-03-12T10:55:44.853Z", "metadata": null, - "idempotency_key": "abb55222-1d22-4852-9714-9b63baec3633" + "idempotency_key": "21d6d548-fd78-4ad7-831f-309930b69455" }, "notification": { - "id": "noti_01F0BGFKZ7P3NC5V1PG10S75N0", + "id": "noti_01F0K18CB6ZS9N2NZYSCFMRY44", "resource_type": "order", "resource_id": "order_01F0BF66ZBXNJ98WDQ9SCWH8Y7", "event_name": "order.placed", "to": "test@email.com", "provider_id": "test-not", - "created_at": "2021-03-09T12:48:11.238Z", - "updated_at": "2021-03-09T12:48:11.238Z", + "created_at": "2021-03-12T10:56:00.869Z", + "updated_at": "2021-03-12T10:56:00.869Z", "resends": [] }, "discount_rule": { - "id": "dru_01F0BGG1B3BCZ292BSRRK72JGS", + "id": "dru_01F0K188JR04H4Z843MRMRC6SS", "description": "10 Percent", "type": "percentage", "value": 10, "allocation": "total", "usage_limit": null, - "created_at": "2021-03-09T12:48:24.921Z", - "updated_at": "2021-03-09T12:48:24.921Z", + "created_at": "2021-03-12T10:55:57.004Z", + "updated_at": "2021-03-12T10:55:57.004Z", "deleted_at": null, "metadata": null } diff --git a/docs/api/store-spec3.json b/docs/api/store-spec3.json index 28e3e02a74..ad97dbda54 100644 --- a/docs/api/store-spec3.json +++ b/docs/api/store-spec3.json @@ -846,6 +846,10 @@ } } } + }, + "context": { + "description": "An optional object to provide context to the Cart. The `context` field is automatically populated with `ip` and `user_agent`", + "type": "object" } } } @@ -1386,6 +1390,10 @@ "customer_id": { "description": "The id of the Customer to associate the Cart with.", "type": "string" + }, + "context": { + "description": "An optional object to provide context to the Cart.", + "type": "object" } } } @@ -1473,6 +1481,41 @@ } } }, + "/gift-cards/{code}": { + "get": { + "operationId": "GetGiftCardsCode", + "summary": "Retrieve Gift Card by Code", + "description": "Retrieves a Gift Card by its associated unqiue code.", + "tags": [ + "Region" + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "properties": { + "id": { + "description": "The id of the Gift Card" + }, + "code": { + "description": "The code of the Gift Card" + }, + "value": { + "description": "The original value of the Gift Card." + }, + "balance": { + "description": "The current balanace of the Gift Card" + } + } + } + } + } + } + } + } + }, "/orders/cart/{cart_id}": { "get": { "operationId": "GetOrdersOrderCartId", @@ -1709,6 +1752,14 @@ "summary": "Retrieve Shipping Options", "description": "Retrieves a list of Shipping Options.", "parameters": [ + { + "in": "query", + "name": "is_return", + "description": "Whether return Shipping Options should be included. By default all Shipping Options are returned.", + "schema": { + "type": "boolean" + } + }, { "in": "query", "name": "product_ids", diff --git a/docs/api/store-spec3.yaml b/docs/api/store-spec3.yaml index 0998688653..d05736a526 100644 --- a/docs/api/store-spec3.yaml +++ b/docs/api/store-spec3.yaml @@ -237,6 +237,12 @@ paths: quantity: description: The quantity of the Product Variant to add type: integer + context: + description: >- + An optional object to provide context to the Cart. The + `context` field is automatically populated with `ip` and + `user_agent` + type: object tags: - Cart responses: @@ -594,6 +600,9 @@ paths: customer_id: description: The id of the Customer to associate the Cart with. type: string + context: + description: An optional object to provide context to the Cart. + type: object tags: - Cart responses: @@ -977,22 +986,13 @@ paths: password: type: string description: The new password to set for the Customer. - '/orders/cart/{cart_id}': + '/gift-cards/{code}': get: - operationId: GetOrdersOrderCartId - summary: Retrieves Order by Cart id - description: >- - Retrieves an Order by the id of the Cart that was used to create the - Order. - parameters: - - in: path - name: cart_id - required: true - description: The id of Cart. - schema: - type: string + operationId: GetGiftCardsCode + summary: Retrieve Gift Card by Code + description: Retrieves a Gift Card by its associated unqiue code. tags: - - Order + - Region responses: '200': description: OK @@ -1000,31 +1000,14 @@ paths: application/json: schema: properties: - order: - $ref: '#/components/schemas/order' - '/orders/{id}': - get: - operationId: GetOrdersOrder - summary: Retrieves an Order - description: Retrieves an Order - parameters: - - in: path - name: id - required: true - description: The id of the Order. - schema: - type: string - tags: - - Order - responses: - '200': - description: OK - content: - application/json: - schema: - properties: - customer: - $ref: '#/components/schemas/customer' + id: + description: The id of the Gift Card + code: + description: The code of the Gift Card + value: + description: The original value of the Gift Card. + balance: + description: The current balanace of the Gift Card '/products/{id}': get: operationId: GetProductsProduct @@ -1075,6 +1058,54 @@ paths: type: array items: $ref: '#/components/schemas/product' + '/orders/cart/{cart_id}': + get: + operationId: GetOrdersOrderCartId + summary: Retrieves Order by Cart id + description: >- + Retrieves an Order by the id of the Cart that was used to create the + Order. + parameters: + - in: path + name: cart_id + required: true + description: The id of Cart. + schema: + type: string + tags: + - Order + responses: + '200': + description: OK + content: + application/json: + schema: + properties: + order: + $ref: '#/components/schemas/order' + '/orders/{id}': + get: + operationId: GetOrdersOrder + summary: Retrieves an Order + description: Retrieves an Order + parameters: + - in: path + name: id + required: true + description: The id of the Order. + schema: + type: string + tags: + - Order + responses: + '200': + description: OK + content: + application/json: + schema: + properties: + customer: + $ref: '#/components/schemas/customer' '/regions/{id}': get: operationId: GetRegionsRegion @@ -1125,12 +1156,42 @@ paths: type: array items: $ref: '#/components/schemas/region' + '/swaps/{cart_id}': + get: + operationId: GetSwapsSwapCartId + summary: Retrieve Swap by Cart id + description: Retrieves a Swap by the id of the Cart used to confirm the Swap. + parameters: + - in: path + name: cart_id + required: true + description: The id of the Cart + schema: + type: string + tags: + - Swap + responses: + '200': + description: OK + content: + application/json: + schema: + properties: + swap: + $ref: '#/components/schemas/swap' /shipping-options: get: operationId: GetShippingOptions summary: Retrieve Shipping Options description: Retrieves a list of Shipping Options. parameters: + - in: query + name: is_return + description: >- + Whether return Shipping Options should be included. By default all + Shipping Options are returned. + schema: + type: boolean - in: query name: product_ids description: A comma separated list of Product ids to filter Shipping Options by. @@ -1179,29 +1240,6 @@ paths: type: array items: $ref: '#/components/schemas/shipping_option' - '/swaps/{cart_id}': - get: - operationId: GetSwapsSwapCartId - summary: Retrieve Swap by Cart id - description: Retrieves a Swap by the id of the Cart used to confirm the Swap. - parameters: - - in: path - name: cart_id - required: true - description: The id of the Cart - schema: - type: string - tags: - - Swap - responses: - '200': - description: OK - content: - application/json: - schema: - properties: - swap: - $ref: '#/components/schemas/swap' '/variants/{variant_id}': get: operationId: GetVariantsVariant diff --git a/integration-tests/api/__tests__/store/shipping-options.js b/integration-tests/api/__tests__/store/shipping-options.js new file mode 100644 index 0000000000..0aa9e33cf3 --- /dev/null +++ b/integration-tests/api/__tests__/store/shipping-options.js @@ -0,0 +1,134 @@ +const { dropDatabase } = require("pg-god"); +const path = require("path"); +const { Region, ShippingProfile, ShippingOption } = require("@medusajs/medusa"); + +const setupServer = require("../../../helpers/setup-server"); +const { useApi } = require("../../../helpers/use-api"); +const { initDb } = require("../../../helpers/use-db"); + +jest.setTimeout(30000); + +describe("/store/shipping-options", () => { + let medusaProcess; + let dbConnection; + + beforeAll(async () => { + const cwd = path.resolve(path.join(__dirname, "..", "..")); + dbConnection = await initDb({ cwd }); + medusaProcess = await setupServer({ cwd }); + }); + + afterAll(async () => { + dbConnection.close(); + await dropDatabase({ databaseName: "medusa-integration" }); + + medusaProcess.kill(); + }); + + describe("POST /store/shipping-options", () => { + beforeEach(async () => { + const manager = dbConnection.manager; + await manager.query( + `ALTER SEQUENCE order_display_id_seq RESTART WITH 111` + ); + + await manager.insert(Region, { + id: "region", + name: "Test Region", + currency_code: "usd", + tax_rate: 0, + }); + await manager.insert(Region, { + id: "region2", + name: "Test Region 2", + currency_code: "usd", + tax_rate: 0, + }); + + const defaultProfile = await manager.findOne(ShippingProfile, { + type: "default", + }); + + await manager.insert(ShippingOption, { + id: "test-out", + name: "Test out", + profile_id: defaultProfile.id, + region_id: "region", + provider_id: "test-ful", + data: {}, + price_type: "flat_rate", + amount: 2000, + is_return: false, + }); + + await manager.insert(ShippingOption, { + id: "test-return", + name: "Test ret", + profile_id: defaultProfile.id, + region_id: "region", + provider_id: "test-ful", + data: {}, + price_type: "flat_rate", + amount: 1000, + is_return: true, + }); + + await manager.insert(ShippingOption, { + id: "test-region2", + name: "Test region 2", + profile_id: defaultProfile.id, + region_id: "region2", + provider_id: "test-ful", + data: {}, + price_type: "flat_rate", + amount: 1000, + is_return: false, + }); + }); + + afterEach(async () => { + const manager = dbConnection.manager; + await manager.query(`DELETE FROM "shipping_option"`); + await manager.query(`DELETE FROM "region"`); + }); + + it("retrieves all shipping options", async () => { + const api = useApi(); + + const response = await api.get("/store/shipping-options").catch((err) => { + return err.response; + }); + + expect(response.status).toEqual(200); + expect(response.data.shipping_options.length).toEqual(3); + }); + + it("creates a return with shipping method", async () => { + const api = useApi(); + + const response = await api + .get("/store/shipping-options?is_return=true") + .catch((err) => { + return err.response; + }); + + expect(response.status).toEqual(200); + expect(response.data.shipping_options.length).toEqual(1); + expect(response.data.shipping_options[0].id).toEqual("test-return"); + }); + + it("creates a return with shipping method", async () => { + const api = useApi(); + + const response = await api + .get("/store/shipping-options?region_id=region2") + .catch((err) => { + return err.response; + }); + + expect(response.status).toEqual(200); + expect(response.data.shipping_options.length).toEqual(1); + expect(response.data.shipping_options[0].id).toEqual("test-region2"); + }); + }); +}); diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json index 68baef992d..056de2d8ee 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.11-dev-1615544779907", - "medusa-interfaces": "1.1.1-dev-1615544779907", + "@medusajs/medusa": "1.1.11-dev-1615546159319", + "medusa-interfaces": "1.1.1-dev-1615546159319", "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.0-dev-1615544779907", + "babel-preset-medusa-package": "1.1.0-dev-1615546159319", "jest": "^26.6.3" } } diff --git a/integration-tests/api/yarn.lock b/integration-tests/api/yarn.lock index 63e1648ffa..e8640b53ff 100644 --- a/integration-tests/api/yarn.lock +++ b/integration-tests/api/yarn.lock @@ -1369,10 +1369,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@medusajs/medusa@1.1.11-dev-1615544779907": - version "1.1.11-dev-1615544779907" - resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.11-dev-1615544779907.tgz#0c8e51d9d23c6825380b0fac5428298178441fce" - integrity sha512-LIgWdzNjszEUVqQrGqJxsqs7mG3FDRhJvxopQNCKEy3+zb//u0soXdr8erydIuIk5a4sHQNu874BhrV1MsWODQ== +"@medusajs/medusa@1.1.11-dev-1615546159319": + version "1.1.11-dev-1615546159319" + resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.11-dev-1615546159319.tgz#88d494cd9f765d69cfa8450aad1c459e3f358c2c" + integrity sha512-0REuafQjwykR6zbjjuIq151S3nLWdHBIFcy7fzKcR7Yhs2XkHMDFToUD01/uY2d/GqmKGvn/HsDLPx2a7Sj4SQ== dependencies: "@babel/plugin-transform-classes" "^7.9.5" "@hapi/joi" "^16.1.8" @@ -1394,8 +1394,8 @@ joi "^17.3.0" joi-objectid "^3.0.1" jsonwebtoken "^8.5.1" - medusa-core-utils "1.1.0-dev-1615544779907" - medusa-test-utils "1.1.3-dev-1615544779907" + medusa-core-utils "1.1.0-dev-1615546159319" + medusa-test-utils "1.1.3-dev-1615546159319" morgan "^1.9.1" multer "^1.4.2" passport "^0.4.0" @@ -1884,10 +1884,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.0-dev-1615544779907: - version "1.1.0-dev-1615544779907" - resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0-dev-1615544779907.tgz#81e49a5a3109447ceae7b115da45ed979b88e1ef" - integrity sha512-CZA2poMKpYusH+97J+WQ3SQh6JbIGF41BCVVhvVft/QnioRBka+IYr6E+9rntha+jYPVeHSDxvPOGrpcfQwWsA== +babel-preset-medusa-package@1.1.0-dev-1615546159319: + version "1.1.0-dev-1615546159319" + resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.0-dev-1615546159319.tgz#eaaa8908d9b04487cbfbd90cd5422c8ade611506" + integrity sha512-IS60RphbSYg+PQA5ywdjba2eL+pyHaHAUm93658fAMezSKnRaDEvtle42DK63EifQC35K1pQc0j7YUbgg8ZODg== dependencies: "@babel/plugin-proposal-class-properties" "^7.12.1" "@babel/plugin-proposal-decorators" "^7.12.1" @@ -4493,28 +4493,28 @@ 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.0-dev-1615544779907: - version "1.1.0-dev-1615544779907" - resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.0-dev-1615544779907.tgz#6f91b2dba621ca53f410091b9ce4bcd08983f9a6" - integrity sha512-+X/UCUEC/15xZ0kpp0oLJI0yA/7mAS2sV/QViAiPIyDb+YF+YjaFZEvNtc/aKjNeX4RlGgiD8B6RW/J4b8T6IQ== +medusa-core-utils@1.1.0-dev-1615546159319: + version "1.1.0-dev-1615546159319" + resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.0-dev-1615546159319.tgz#34147e32463b002c51b815f7329e88881a0fbec2" + integrity sha512-t/QeZmHaFdBmn1wC+StZDq+tJescILybCSNIOFLSUlOaUaOPGwZ0UhYN/MNeMrBwAoQq9ZO5QjJsNNbQK33gWA== dependencies: joi "^17.3.0" joi-objectid "^3.0.1" -medusa-interfaces@1.1.1-dev-1615544779907: - version "1.1.1-dev-1615544779907" - resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.1-dev-1615544779907.tgz#833be0be4682bb3fcf07e3b6b03d68cfd6c44f7d" - integrity sha512-xKsL7BSFnVcKwpt90Irv6qnmR7h0Q6nmkpfcKOzZ9PBbWeQwO9aavrFK71zzMiYxmyqwE4bboT4QyRD4qVxaGw== +medusa-interfaces@1.1.1-dev-1615546159319: + version "1.1.1-dev-1615546159319" + resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.1-dev-1615546159319.tgz#a75e2841a9c68b26bc688706d59fccfd655c8f41" + integrity sha512-BqE+ARKvJgmLHABuAGfCSquNa1XPF8+ll/dB6XMMjPAPzlGF9kV/GhQIsjq8fzoZ8ZvrLBD0ak5ndOK/BH/NEA== dependencies: - medusa-core-utils "1.1.0-dev-1615544779907" + medusa-core-utils "1.1.0-dev-1615546159319" -medusa-test-utils@1.1.3-dev-1615544779907: - version "1.1.3-dev-1615544779907" - resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.3-dev-1615544779907.tgz#39e3c38298eb2100be1e21466d5715b0e068850e" - integrity sha512-OAcJ/tG9Lq3g1ITwhMen54+rYQupq0TXYZCACcKuCRJF6IiROU+wXA51yIcvQLxGv7yzmOzAblS/giMkmAyZkQ== +medusa-test-utils@1.1.3-dev-1615546159319: + version "1.1.3-dev-1615546159319" + resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.3-dev-1615546159319.tgz#912b4bf83e03c247bc189ebc315c9db4200f3a71" + integrity sha512-hW8xwrf52a5PAzZDL/kOk9Mlv4Jdpgfx+IPUz/F2D3D8ky3OwikwonXKvPvaRC5JaCdjI/xipPaSWUkJeb1dzg== dependencies: "@babel/plugin-transform-classes" "^7.9.5" - medusa-core-utils "1.1.0-dev-1615544779907" + medusa-core-utils "1.1.0-dev-1615546159319" randomatic "^3.1.1" merge-descriptors@1.0.1: diff --git a/packages/medusa/src/api/routes/store/shipping-options/list-options.js b/packages/medusa/src/api/routes/store/shipping-options/list-options.js index fec19753c7..274d348ab6 100644 --- a/packages/medusa/src/api/routes/store/shipping-options/list-options.js +++ b/packages/medusa/src/api/routes/store/shipping-options/list-options.js @@ -4,6 +4,7 @@ * summary: Retrieve Shipping Options * description: "Retrieves a list of Shipping Options." * parameters: + * - (query) is_return {boolean} Whether return Shipping Options should be included. By default all Shipping Options are returned. * - (query) product_ids {string} A comma separated list of Product ids to filter Shipping Options by. * - (query) region_id {string} the Region to retrieve Shipping Options from. * tags: @@ -31,6 +32,10 @@ export default async (req, res) => { const query = {} + if ("is_return" in req.query) { + query.is_return = req.query.is_return === "true" + } + if (regionId) { query.region_id = regionId }