fix: tests

integration-tests/api/__tests__/admin/__snapshots__/auth.js.snap

@@ -1,5 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`/admin/auth creates admin session correctly 1`] = `
+Object {
+  "api_token": "test_token",
+  "created_at": Any<String>,
+  "deleted_at": null,
+  "email": "admin@medusa.js",
+  "first_name": null,
+  "id": "admin_user",
+  "last_name": null,
+  "metadata": null,
+  "updated_at": Any<String>,
+}
+`;
+
 exports[`/admin/discounts creates admin session correctly 1`] = `
 Object {
   "api_token": "test_token",
@@ -13,4 +27,3 @@ Object {
   "updated_at": Any<String>,
 }
 `;
-

integration-tests/api/__tests__/store/__snapshots__/auth.js.snap

@@ -1,5 +1,22 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`/admin/auth creates store session correctly 1`] = `
+Object {
+  "billing_address_id": null,
+  "created_at": Any<String>,
+  "deleted_at": null,
+  "email": "test@testesen.dk",
+  "first_name": "test",
+  "has_account": true,
+  "id": Any<String>,
+  "last_name": "testesen",
+  "metadata": null,
+  "orders": Array [],
+  "phone": "12345678",
+  "updated_at": Any<String>,
+}
+`;
+
 exports[`/admin/discounts creates store session correctly 1`] = `
 Object {
   "billing_address_id": null,

integration-tests/api/__tests__/store/cart.js

@@ -145,6 +145,7 @@ describe("/store/carts", () => {
           discounts: [{ code: "CREATED" }],
         })
       } catch (error) {
+        console.log(error.response)
         expect(error.response.status).toEqual(400)
         expect(error.response.data.message).toEqual(
           "Discount has been used maximum allowed times"

integration-tests/api/helpers/cart-seeder.js

@@ -51,8 +51,6 @@ module.exports = async (connection, data = {}) => {
     currency_code: "usd",
     tax_rate: 0,
   })
-<<<<<<< HEAD
-=======
 
   // Region with multiple countries
   const regionWithMultipleCoutries = manager.create(Region, {
@@ -69,7 +67,6 @@ module.exports = async (connection, data = {}) => {
   await manager.query(
     `UPDATE "country" SET region_id='test-region-multiple' WHERE iso_2 = 'dk'`
   )
->>>>>>> develop
 
   const freeRule = manager.create(DiscountRule, {
     id: "free-shipping-rule",
@@ -103,11 +100,8 @@ module.exports = async (connection, data = {}) => {
     code: "10PERCENT",
     is_dynamic: false,
     is_disabled: false,
-<<<<<<< HEAD
-=======
     starts_at: tenDaysAgo,
     ends_at: tenDaysFromToday,
->>>>>>> develop
   })
 
   tenPercent.regions = [r]
@@ -128,13 +122,6 @@ module.exports = async (connection, data = {}) => {
     value: 10000,
     allocation: "total",
   })
-<<<<<<< HEAD
-
-  d.rule = dr
-  d.regions = [r]
-
-  await manager.save(d)
-=======
 
   d.rule = dr
   d.regions = [r]
@@ -226,7 +213,6 @@ module.exports = async (connection, data = {}) => {
   DynamicDiscount.regions = [r]
   DynamicDiscount.rule = DynamicRule
   await manager.save(DynamicDiscount)
->>>>>>> develop
 
   await manager.query(
     `UPDATE "country" SET region_id='test-region' WHERE iso_2 = 'us'`
@@ -389,8 +375,6 @@ module.exports = async (connection, data = {}) => {
     completed_at: null,
     items: [],
   })
-<<<<<<< HEAD
-=======
 
   const swapCart = manager.create(Cart, {
     id: "swap-cart",
@@ -410,7 +394,6 @@ module.exports = async (connection, data = {}) => {
       swap_id: "test-swap",
     },
   })
->>>>>>> develop
 
   const pay = manager.create(Payment, {
     id: "test-payment",
@@ -420,14 +403,6 @@ module.exports = async (connection, data = {}) => {
     provider_id: "test-pay",
     data: {},
   })
-<<<<<<< HEAD
-
-  await manager.save(pay)
-
-  cart2.payment = pay
-
-  await manager.save(cart2)
-=======
 
   await manager.save(pay)
 
@@ -451,7 +426,6 @@ module.exports = async (connection, data = {}) => {
 
   await manager.save(cart2)
   await manager.save(swapCart)
->>>>>>> develop
 
   await manager.insert(PaymentSession, {
     id: "test-session",
@@ -461,8 +435,6 @@ module.exports = async (connection, data = {}) => {
     data: {},
     status: "authorized",
   })
-<<<<<<< HEAD
-=======
 
   await manager.insert(PaymentSession, {
     id: "test-swap-session",
@@ -472,7 +444,6 @@ module.exports = async (connection, data = {}) => {
     data: {},
     status: "authorized",
   })
->>>>>>> develop
 
   await manager.insert(ShippingMethod, {
     id: "test-method",

integration-tests/api/helpers/swap-seeder.js

@@ -100,7 +100,6 @@ module.exports = async (connection, data = {}) => {
   })
 
   await manager.save(swap)
-<<<<<<< HEAD
 
   const rmaCart = manager.create(Cart, {
     id: "test-cart-rma",
@@ -154,8 +153,6 @@ module.exports = async (connection, data = {}) => {
   })
 
   await manager.save(swapWithRMAMethod)
-=======
->>>>>>> develop
 
   const cartTemplate = async (cartId) => {
     const cart = manager.create(Cart, {
@@ -255,10 +252,6 @@ module.exports = async (connection, data = {}) => {
     order_id: orderWithSwap.id,
     item_id: li.id,
     refund_amount: li.quantity * li.unit_price,
-<<<<<<< HEAD
-    // shipping_method_id: ,
-=======
->>>>>>> develop
   })
 
   await manager.save(swapReturn)

integration-tests/api/package.json

@@ -8,15 +8,15 @@
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {
-    "@medusajs/medusa": "1.1.40-dev-1631630701835",
+    "@medusajs/medusa": "1.1.41-dev-1633030366783",
-    "medusa-interfaces": "1.1.21-dev-1631630701835",
+    "medusa-interfaces": "1.1.23-dev-1633030366783",
     "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.13-dev-1631630701835",
+    "babel-preset-medusa-package": "1.1.15-dev-1633030366783",
     "jest": "^26.6.3"
   }
 }

integration-tests/api/yarn.lock

@@ -1223,10 +1223,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@medusajs/medusa-cli@1.1.16-dev-1631630701835":
+"@medusajs/medusa-cli@1.1.18-dev-1633030366783":
-  version "1.1.16-dev-1631630701835"
+  version "1.1.18-dev-1633030366783"
-  resolved "http://localhost:4873/@medusajs%2fmedusa-cli/-/medusa-cli-1.1.16-dev-1631630701835.tgz#7fcb95cb9a45e0367cc5becfff7f5d1533b46b5f"
+  resolved "http://localhost:4873/@medusajs%2fmedusa-cli/-/medusa-cli-1.1.18-dev-1633030366783.tgz#1112165ea9c03c797cd8d01f1149da989b9bea55"
-  integrity sha512-UomtR8B1lBFDb3h1y060fOcWcZi812Jwt8Kgjxqtpn+aRj6Bu7+I3WJGHBVSx4VnUBINSYbtiQMpEwqVGTCKnw==
+  integrity sha512-EIDxOs9STvFWwXv+8VWetrzABkijGOzcbKJzJ1jeDYjl61uRnELoWg57aeWj6wzKcTjhYRRKDrivMRUiexkHsA==
   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.20-dev-1631630701835"
+    medusa-core-utils "1.1.22-dev-1633030366783"
-    medusa-telemetry "0.0.3-dev-1631630701835"
+    medusa-telemetry "0.0.5-dev-1633030366783"
     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.40-dev-1631630701835":
+"@medusajs/medusa@1.1.41-dev-1633030366783":
-  version "1.1.40-dev-1631630701835"
+  version "1.1.41-dev-1633030366783"
-  resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.40-dev-1631630701835.tgz#fa67ceda5887fd31196b3bcfd3115a9e02d68448"
+  resolved "http://localhost:4873/@medusajs%2fmedusa/-/medusa-1.1.41-dev-1633030366783.tgz#0beb57e9844c3b85c59bfcde86183a2a625e3a91"
-  integrity sha512-svPsKonuBrwRgtYod7U7ho9bN84K7N/QorMJG9+wklEO4jp6zXG+U5DQcfVAKQ00cHHe50OcnfX1ZS0kVNovYw==
+  integrity sha512-b1QGscpszVYhDLOea7WhbW0DCgEKBKchHP1nNLj07mWTxE5vOBuAZeUSh1FHNw0jbPhtn9mOaFz2wwIgxPcfqw==
   dependencies:
     "@hapi/joi" "^16.1.8"
-    "@medusajs/medusa-cli" "1.1.16-dev-1631630701835"
+    "@medusajs/medusa-cli" "1.1.18-dev-1633030366783"
     "@types/lodash" "^4.14.168"
     awilix "^4.2.3"
     body-parser "^1.19.0"
@@ -1283,11 +1283,12 @@
     glob "^7.1.6"
     ioredis "^4.17.3"
     ioredis-mock "^5.6.0"
+    iso8601-duration "^1.3.0"
     joi "^17.3.0"
     joi-objectid "^3.0.1"
     jsonwebtoken "^8.5.1"
-    medusa-core-utils "1.1.20-dev-1631630701835"
+    medusa-core-utils "1.1.22-dev-1633030366783"
-    medusa-test-utils "1.1.23-dev-1631630701835"
+    medusa-test-utils "1.1.25-dev-1633030366783"
     morgan "^1.9.1"
     multer "^1.4.2"
     passport "^0.4.0"
@@ -1302,7 +1303,6 @@
     resolve-cwd "^3.0.0"
     scrypt-kdf "^2.0.1"
     sqlite3 "^5.0.2"
-    typeorm "^0.2.37"
     ulid "^2.3.0"
     uuid "^8.3.1"
     winston "^3.2.1"
@@ -1933,10 +1933,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.13-dev-1631630701835:
+babel-preset-medusa-package@1.1.15-dev-1633030366783:
-  version "1.1.13-dev-1631630701835"
+  version "1.1.15-dev-1633030366783"
-  resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.13-dev-1631630701835.tgz#5b66b3738e4904e31b2db30a6ea8e68eb0f8f641"
+  resolved "http://localhost:4873/babel-preset-medusa-package/-/babel-preset-medusa-package-1.1.15-dev-1633030366783.tgz#00f8aa5ebcb98c9a161a2c12dad55ffac53df88c"
-  integrity sha512-V7sXlktlvEON7FLhxe+Y3NVe8l8DQyB5oJTryG4Bhw8y1AaUFOiQ5Vat3XuoL3qRcUSVMGL4VHw0m0O78t0PuA==
+  integrity sha512-A/qfZNpIcYFMjAHYqVvavP9uY7ODtKGaQwZyx9quFydxebLSUstHTJ5s9ES1XjqhRYpEy//ixwNBkzggig0F9w==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.12.1"
     "@babel/plugin-proposal-decorators" "^7.12.1"
@@ -4275,6 +4275,11 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+iso8601-duration@^1.3.0:
+  version "1.3.0"
+  resolved "http://localhost:4873/iso8601-duration/-/iso8601-duration-1.3.0.tgz#29d7b69e0574e4acdee50c5e5e09adab4137ba5a"
+  integrity sha512-K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -5105,25 +5110,25 @@ 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-dev-1631630701835:
+medusa-core-utils@1.1.22-dev-1633030366783:
-  version "1.1.20-dev-1631630701835"
+  version "1.1.22-dev-1633030366783"
-  resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.20-dev-1631630701835.tgz#1fa7ccd2551b7891127d4f07f708029c585f4ea8"
+  resolved "http://localhost:4873/medusa-core-utils/-/medusa-core-utils-1.1.22-dev-1633030366783.tgz#988358df8d8c7350d4fea3c3c00ae9f2e4aaa434"
-  integrity sha512-KKBo6W1QI47Ig3KMV4UXQnQN5JilMfjR6Cx7hDNj4frJoNiWa/YKDYqUr6SmY2+iJtKetnLkrKaPsDyyhZrxcw==
+  integrity sha512-WYJ141mu6aYFGO9Vs9lXx+mJWXogrASxWJOIT29bZIFuaqI/LuiZysFn+Y6tzGBHLRdMKwHE+u/Zg1vh1NGfrw==
   dependencies:
     joi "^17.3.0"
     joi-objectid "^3.0.1"
 
-medusa-interfaces@1.1.21-dev-1631630701835:
+medusa-interfaces@1.1.23-dev-1633030366783:
-  version "1.1.21-dev-1631630701835"
+  version "1.1.23-dev-1633030366783"
-  resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.21-dev-1631630701835.tgz#af29b2ef0c987bded1b2d295ac6cf39880af551e"
+  resolved "http://localhost:4873/medusa-interfaces/-/medusa-interfaces-1.1.23-dev-1633030366783.tgz#d3cb82493e2bb53ff728e369d38183d964ac2cc9"
-  integrity sha512-rTASRjOdcS3J9fP95p9vJzCpatMpUhTum5ddfAA0s42pZx2gsPlf1f+rUSNz5QfeC5RdIEzRfOmAGfvMpAbYGw==
+  integrity sha512-7X3KnKUJHBye7ikmLouvYQCCINHb2DpBy9cOQKpUSwsaKlUMIvxJq2T+AieuwWhiTACwAwTLiWshSILUdbvKcQ==
   dependencies:
-    medusa-core-utils "1.1.20-dev-1631630701835"
+    medusa-core-utils "1.1.22-dev-1633030366783"
 
-medusa-telemetry@0.0.3-dev-1631630701835:
+medusa-telemetry@0.0.5-dev-1633030366783:
-  version "0.0.3-dev-1631630701835"
+  version "0.0.5-dev-1633030366783"
-  resolved "http://localhost:4873/medusa-telemetry/-/medusa-telemetry-0.0.3-dev-1631630701835.tgz#d56c01d261fa30ccedc6d9976971b9744b9d8c0f"
+  resolved "http://localhost:4873/medusa-telemetry/-/medusa-telemetry-0.0.5-dev-1633030366783.tgz#ee9368da672a5f46d323a98b521d49983f6f1e9d"
-  integrity sha512-FS1L1DOIOSdRZgeIQWaM5nhFG5NtbnC/Pntfac51vQxLkzFuHy7ZEtg11CXKE+x6NWlqT1rqqgxq0EabFzEZzw==
+  integrity sha512-BU1XyCWS2iX5lqfxcCRAxOCrtY55eLyH1XoLLPoO8dWKIDn3G0uh4N/WKBPn40cVLbeTRqOoVRYQP6jnuEjn6w==
   dependencies:
     axios "^0.21.1"
     axios-retry "^3.1.9"
@@ -5135,13 +5140,13 @@ medusa-telemetry@0.0.3-dev-1631630701835:
     remove-trailing-slash "^0.1.1"
     uuid "^8.3.2"
 
-medusa-test-utils@1.1.23-dev-1631630701835:
+medusa-test-utils@1.1.25-dev-1633030366783:
-  version "1.1.23-dev-1631630701835"
+  version "1.1.25-dev-1633030366783"
-  resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.23-dev-1631630701835.tgz#8995d636caf2dea9ebb184f1e15b0c364c4d1b93"
+  resolved "http://localhost:4873/medusa-test-utils/-/medusa-test-utils-1.1.25-dev-1633030366783.tgz#97b8235e4fbfd5cf16ed91444df1af44d4c45a60"
-  integrity sha512-A8xRL+sZS22qXZSHpVfdV8f/egZxXs4iExRO2xUkTP6I/OgMhFBSg6nEd/DXVdVfpsHZCDEv8PA3ewaeAkoYhQ==
+  integrity sha512-9cztZpuTMbn++Zg/06+vlOnAFa7jUAFf7o7i7kXQGXInlJngS0Tw9pq8H0vQ4vz7QRdiOiFPXb11gymLUT64uA==
   dependencies:
     "@babel/plugin-transform-classes" "^7.9.5"
-    medusa-core-utils "1.1.20-dev-1631630701835"
+    medusa-core-utils "1.1.22-dev-1633030366783"
     randomatic "^3.1.1"
 
 merge-descriptors@1.0.1:
@@ -7286,7 +7291,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeorm@^0.2.31, typeorm@^0.2.37:
+typeorm@^0.2.31:
   version "0.2.37"
   resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.37.tgz#1a5e59216077640694d27c04c99ed3f968d15dc8"
   integrity sha512-7rkW0yCgFC24I5T0f3S/twmLSuccPh1SQmxET/oDWn2sSDVzbyWdnItSdKy27CdJGTlKHYtUVeOcMYw5LRsXVw==

packages/medusa/package.json

@@ -88,4 +88,4 @@
     "winston": "^3.2.1"
   },
   "gitHead": "41a5425405aea5045a26def95c0dc00cf4a5a44d"
-}
+}

packages/medusa/src/api/routes/admin/orders/create-swap.js

@@ -81,12 +81,14 @@ export default async (req, res) => {
           .optional(),
       })
       .optional(),
-    rma_shipping_options: Validator.array().items({
+    rma_shipping_options: Validator.array()
-      option_id: Validator.string().optional(),
+      .items({
-      price: Validator.number()
+        option_id: Validator.string().optional(),
-        .integer()
+        price: Validator.number()
-        .optional(),
+          .integer()
-    }),
+          .optional(),
+      })
+      .default([]),
     additional_items: Validator.array().items({
       variant_id: Validator.string().required(),
       quantity: Validator.number().required(),

packages/medusa/src/api/routes/store/carts/add-shipping-method.js

@@ -1,7 +1,6 @@
 import _ from "lodash"
 import { Validator, MedusaError } from "medusa-core-utils"
 import { defaultFields, defaultRelations } from "./"
-import { CartType } from "../../../../models/cart"
 
 /**
  * @oas [post] /carts/{id}/shipping-methods

packages/medusa/src/api/routes/store/shipping-options/list-shipping-options.js

@@ -1,5 +1,4 @@
 import { Validator, MedusaError } from "medusa-core-utils"
-import { CartType } from "../../../../models/cart"
 
 /**
  * @oas [get] /shipping-options/{cart_id}
@@ -42,7 +41,7 @@ export default async (req, res) => {
     })
 
     let options
-    if (cart.type === CartType.SWAP || cart.type === CartType.CLAIM) {
+    if (cart.type === "swap" || cart.type === "claim") {
       options = await shippingProfileService.fetchRMAOptions(cart)
     } else {
       options = await shippingProfileService.fetchCartOptions(cart)

packages/medusa/src/api/routes/store/swaps/create-swap.js

@@ -108,7 +108,7 @@ export default async (req, res) => {
         case "started": {
           const { key, error } = await idempotencyKeyService.workStage(
             idempotencyKey.idempotency_key,
-            async (manager) => {
+            async manager => {
               const order = await orderService
                 .withTransaction(manager)
                 .retrieve(value.order_id, {
@@ -130,6 +130,7 @@ export default async (req, res) => {
                   value.return_items,
                   value.additional_items,
                   returnShipping,
+                  [],
                   {
                     idempotency_key: idempotencyKey.idempotency_key,
                     no_notification: true,
@@ -163,7 +164,7 @@ export default async (req, res) => {
         case "swap_created": {
           const { key, error } = await idempotencyKeyService.workStage(
             idempotencyKey.idempotency_key,
-            async (manager) => {
+            async manager => {
               const swaps = await swapService.list({
                 idempotency_key: idempotencyKey.idempotency_key,
               })

packages/medusa/src/services/cart.js

@@ -1327,7 +1327,7 @@ class CartService extends BaseService {
       })
       const { shipping_methods } = cart
 
-      const customPrice = data.price ? { price: data.price } : {}
+      const customPrice = data && data.price ? { price: data.price } : {}
       const newMethod = await this.shippingOptionService_
         .withTransaction(manager)
         .createShippingMethod(optionId, data, {

packages/medusa/src/services/shipping-profile.js

@@ -2,7 +2,6 @@ import _ from "lodash"
 import { MedusaError } from "medusa-core-utils"
 import { BaseService } from "medusa-interfaces"
 import { Any, In } from "typeorm"
-import { CartType } from "../models/cart"
 
 /**
  * Provides layer to manipulate profiles.
@@ -449,7 +448,7 @@ class ShippingProfileService extends BaseService {
    * @return {[RMAShippingOptions | ShippingOptions]} a list of the available rma or normal shipping options
    */
   async fetchRMAOptions(cart) {
-    if (cart.type === CartType.DEFAULT) {
+    if (cart.type === "default") {
       throw new MedusaError(MedusaError.Types.INVALID_DATA, "error")
     }
 
@@ -457,7 +456,7 @@ class ShippingProfileService extends BaseService {
       this.swapRepository_
     )
 
-    if (cart.type === CartType.SWAP) {
+    if (cart.type === "swap") {
       const swap = await swapRepo.findOne({
         where: { cart_id: cart.id },
         relations: ["rma_shipping_options"],