Merge branch 'develop' into feat/draft-orders

integration-tests/api/__tests__/admin/gift-cards.js

@@ -0,0 +1,79 @@
+const { dropDatabase } = require("pg-god");
+const path = require("path");
+const { Region } = require("@medusajs/medusa");
+
+const setupServer = require("../../../helpers/setup-server");
+const { useApi } = require("../../../helpers/use-api");
+const { initDb } = require("../../../helpers/use-db");
+const adminSeeder = require("../../helpers/admin-seeder");
+
+jest.setTimeout(30000);
+
+describe("/admin/gift-cards", () => {
+  let medusaProcess;
+  let dbConnection;
+
+  beforeAll(async () => {
+    const cwd = path.resolve(path.join(__dirname, "..", ".."));
+    dbConnection = await initDb({ cwd });
+    medusaProcess = await setupServer({ cwd });
+  });
+
+  afterAll(async () => {
+    await dbConnection.close();
+    await dropDatabase({ databaseName: "medusa-integration" });
+
+    medusaProcess.kill();
+  });
+
+  describe("POST /admin/gift-cards", () => {
+    beforeEach(async () => {
+      const manager = dbConnection.manager;
+      try {
+        await adminSeeder(dbConnection);
+        await manager.insert(Region, {
+          id: "region",
+          name: "Test Region",
+          currency_code: "usd",
+          tax_rate: 0,
+        });
+      } catch (err) {
+        console.log(err);
+        throw err;
+      }
+    });
+
+    afterEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.query(`DELETE FROM "gift_card"`);
+      await manager.query(`DELETE FROM "region"`);
+      await manager.query(`DELETE FROM "user"`);
+    });
+
+    it("creates a gift card", async () => {
+      const api = useApi();
+
+      const response = await api
+        .post(
+          "/admin/gift-cards",
+          {
+            value: 1000,
+            region_id: "region",
+          },
+          {
+            headers: {
+              Authorization: "Bearer test_token",
+            },
+          }
+        )
+        .catch((err) => {
+          console.log(err);
+        });
+
+      expect(response.status).toEqual(200);
+      expect(response.data.gift_card.value).toEqual(1000);
+      expect(response.data.gift_card.balance).toEqual(1000);
+      expect(response.data.gift_card.region_id).toEqual("region");
+    });
+  });
+});

integration-tests/api/__tests__/admin/order.js

@@ -151,30 +151,29 @@ describe("/admin/orders", () => {
       );
       expect(response.status).toEqual(200);
 
-      expect(response.data.order.claims[0].claim_items).toEqual([
-        expect.objectContaining({
-          item_id: "test-item",
-          quantity: 1,
-          reason: "production_failure",
-          images: [
-            expect.objectContaining({
-              url: "https://test.image.com",
-            }),
-          ],
-          tags: [
-            expect.objectContaining({
-              value: "fluff",
-            }),
-          ],
-        }),
-      ]);
+      expect(response.data.order.claims[0].claim_items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            item_id: "test-item",
+            quantity: 1,
+            reason: "production_failure",
+            images: expect.arrayContaining([
+              expect.objectContaining({
+                url: "https://test.image.com",
+              }),
+            ]),
+          }),
+        ])
+      );
 
-      expect(response.data.order.claims[0].additional_items).toEqual([
-        expect.objectContaining({
-          variant_id: "test-variant",
-          quantity: 1,
-        }),
-      ]);
+      expect(response.data.order.claims[0].additional_items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            variant_id: "test-variant",
+            quantity: 1,
+          }),
+        ])
+      );
     });
 
     it("updates a claim", async () => {
@@ -296,26 +295,28 @@ describe("/admin/orders", () => {
       claim = updateData.order.claims[0];
 
       expect(claim.claim_items.length).toEqual(1);
-      expect(claim.claim_items).toEqual([
-        expect.objectContaining({
-          id: claim.claim_items[0].id,
-          reason: "production_failure",
-          note: "Something new",
-          images: expect.arrayContaining([
-            expect.objectContaining({
-              url: "https://test.image.com",
-            }),
-            expect.objectContaining({
-              url: "https://new.com/image",
-            }),
-          ]),
-          tags: expect.arrayContaining([
-            expect.objectContaining({ value: "completely" }),
-            expect.objectContaining({ value: "new" }),
-            expect.objectContaining({ value: "tags" }),
-          ]),
-        }),
-      ]);
+      expect(claim.claim_items).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            id: claim.claim_items[0].id,
+            reason: "production_failure",
+            note: "Something new",
+            images: expect.arrayContaining([
+              expect.objectContaining({
+                url: "https://test.image.com",
+              }),
+              expect.objectContaining({
+                url: "https://new.com/image",
+              }),
+            ]),
+            // tags: expect.arrayContaining([
+            //   expect.objectContaining({ value: "completely" }),
+            //   expect.objectContaining({ value: "new" }),
+            //   expect.objectContaining({ value: "tags" }),
+            // ]),
+          }),
+        ])
+      );
     });
 
     it("updates claim items - removes image", async () => {
@@ -384,11 +385,11 @@ describe("/admin/orders", () => {
           reason: "production_failure",
           note: "Something new",
           images: [],
-          tags: expect.arrayContaining([
-            expect.objectContaining({ value: "completely" }),
-            expect.objectContaining({ value: "new" }),
-            expect.objectContaining({ value: "tags" }),
-          ]),
+          // tags: expect.arrayContaining([
+          //   expect.objectContaining({ value: "completely" }),
+          //   expect.objectContaining({ value: "new" }),
+          //   expect.objectContaining({ value: "tags" }),
+          // ]),
         }),
       ]);
     });
@@ -466,4 +467,157 @@ describe("/admin/orders", () => {
       ]);
     });
   });
+
+  describe("GET /admin/orders", () => {
+    beforeEach(async () => {
+      try {
+        await adminSeeder(dbConnection);
+        // Manually insert date for filtering
+        const createdAt = new Date("26 January 1997 12:00 UTC");
+        await orderSeeder(dbConnection, {
+          created_at: createdAt.toISOString(),
+        });
+      } catch (err) {
+        console.log(err);
+        throw err;
+      }
+    });
+
+    afterEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.query(`DELETE FROM "cart"`);
+      await manager.query(`DELETE FROM "fulfillment_item"`);
+      await manager.query(`DELETE FROM "fulfillment"`);
+      await manager.query(`DELETE FROM "swap"`);
+      await manager.query(`DELETE FROM "return"`);
+      await manager.query(`DELETE FROM "claim_image"`);
+      await manager.query(`DELETE FROM "claim_tag"`);
+      await manager.query(`DELETE FROM "claim_item"`);
+      await manager.query(`DELETE FROM "shipping_method"`);
+      await manager.query(`DELETE FROM "line_item"`);
+      await manager.query(`DELETE FROM "claim_order"`);
+      await manager.query(`DELETE FROM "money_amount"`);
+      await manager.query(`DELETE FROM "product_variant"`);
+      await manager.query(`DELETE FROM "product"`);
+      await manager.query(`DELETE FROM "shipping_option"`);
+      await manager.query(`DELETE FROM "discount"`);
+      await manager.query(`DELETE FROM "payment"`);
+      await manager.query(`DELETE FROM "order"`);
+      await manager.query(`DELETE FROM "customer"`);
+      await manager.query(
+        `UPDATE "country" SET region_id=NULL WHERE iso_2 = 'us'`
+      );
+      await manager.query(`DELETE FROM "region"`);
+      await manager.query(`DELETE FROM "user"`);
+    });
+
+    it("lists all orders", async () => {
+      const api = useApi();
+
+      const response = await api.get("/admin/orders?fields=id", {
+        headers: {
+          authorization: "Bearer test_token",
+        },
+      });
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([
+        expect.objectContaining({
+          id: "test-order",
+        }),
+      ]);
+    });
+
+    it("successfully lists orders with greater than", async () => {
+      const api = useApi();
+
+      const response = await api.get(
+        "/admin/orders?fields=id&created_at[gt]=01-26-1990",
+        {
+          headers: {
+            authorization: "Bearer test_token",
+          },
+        }
+      );
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([
+        expect.objectContaining({
+          id: "test-order",
+        }),
+      ]);
+    });
+
+    it("successfully lists no orders with greater than", async () => {
+      const api = useApi();
+
+      const response = await api.get(
+        "/admin/orders?fields=id&created_at[gt]=01-26-2000",
+        {
+          headers: {
+            authorization: "Bearer test_token",
+          },
+        }
+      );
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([]);
+    });
+
+    it("successfully lists orders with less than", async () => {
+      const api = useApi();
+
+      const response = await api.get(
+        "/admin/orders?fields=id&created_at[lt]=01-26-2000",
+        {
+          headers: {
+            authorization: "Bearer test_token",
+          },
+        }
+      );
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([
+        expect.objectContaining({
+          id: "test-order",
+        }),
+      ]);
+    });
+
+    it("successfully lists no orders with less than", async () => {
+      const api = useApi();
+
+      const response = await api.get(
+        "/admin/orders?fields=id&created_at[lt]=01-26-1990",
+        {
+          headers: {
+            authorization: "Bearer test_token",
+          },
+        }
+      );
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([]);
+    });
+
+    it("successfully lists orders using unix (greater than)", async () => {
+      const api = useApi();
+
+      const response = await api.get(
+        "/admin/orders?fields=id&created_at[gt]=633351600",
+        {
+          headers: {
+            authorization: "Bearer test_token",
+          },
+        }
+      );
+
+      expect(response.status).toEqual(200);
+      expect(response.data.orders).toEqual([
+        expect.objectContaining({
+          id: "test-order",
+        }),
+      ]);
+    });
+  });
 });

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

@@ -22,7 +22,7 @@ describe("/store/carts", () => {
 
   afterAll(async () => {
     dbConnection.close();
-    dropDatabase({ databaseName: "medusa-integration" });
+    await dropDatabase({ databaseName: "medusa-integration" });
 
     medusaProcess.kill();
   });

integration-tests/api/__tests__/store/gift-cards.js

@@ -0,0 +1,65 @@
+const { dropDatabase } = require("pg-god");
+const path = require("path");
+const { Region, GiftCard } = 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/gift-cards", () => {
+  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("GET /store/gift-cards/:code", () => {
+    beforeEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.insert(Region, {
+        id: "region",
+        name: "Test Region",
+        currency_code: "usd",
+        tax_rate: 0,
+      });
+      await manager.insert(GiftCard, {
+        id: "gift_test",
+        code: "GC_TEST",
+        value: 200,
+        balance: 120,
+        region_id: "region",
+      });
+    });
+
+    afterEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.query(`DELETE FROM "gift_card"`);
+      await manager.query(`DELETE FROM "region"`);
+    });
+
+    it("retrieves a gift card", async () => {
+      const api = useApi();
+
+      const response = await api.get("/store/gift-cards/GC_TEST");
+      expect(response.status).toEqual(200);
+      expect(response.data.gift_card).toEqual({
+        id: "gift_test",
+        code: "GC_TEST",
+        value: 200,
+        balance: 120,
+      });
+    });
+  });
+});

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

@@ -0,0 +1,160 @@
+const { dropDatabase } = require("pg-god");
+const path = require("path");
+const {
+  Region,
+  Order,
+  Customer,
+  ShippingProfile,
+  Product,
+  ProductVariant,
+  MoneyAmount,
+  LineItem,
+} = 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/carts", () => {
+  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("GET /store/orders", () => {
+    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(Customer, {
+        id: "cus_1234",
+        email: "test@email.com",
+      });
+      await manager.insert(Order, {
+        id: "order_test",
+        email: "test@email.com",
+        display_id: 111,
+        customer_id: "cus_1234",
+        region_id: "region",
+        tax_rate: 0,
+        currency_code: "usd",
+      });
+
+      const defaultProfile = await manager.findOne(ShippingProfile, {
+        type: "default",
+      });
+      await manager.insert(Product, {
+        id: "test-product",
+        title: "test product",
+        profile_id: defaultProfile.id,
+        options: [{ id: "test-option", title: "Size" }],
+      });
+
+      await manager.insert(ProductVariant, {
+        id: "test-variant",
+        title: "test variant",
+        product_id: "test-product",
+        inventory_quantity: 1,
+        options: [
+          {
+            option_id: "test-option",
+            value: "Size",
+          },
+        ],
+      });
+
+      await manager.insert(LineItem, {
+        id: "test-item",
+        fulfilled_quantity: 1,
+        title: "Line Item",
+        description: "Line Item Desc",
+        thumbnail: "https://test.js/1234",
+        unit_price: 8000,
+        quantity: 1,
+        variant_id: "test-variant",
+      });
+    });
+
+    afterEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.query(`DELETE FROM "line_item"`);
+
+      await manager.query(`DELETE FROM "order"`);
+      await manager.query(`DELETE FROM "customer"`);
+      await manager.query(`DELETE FROM "region"`);
+
+      await manager.query(`DELETE FROM "product_option_value"`);
+      await manager.query(`DELETE FROM "product_option"`);
+      await manager.query(`DELETE FROM "money_amount"`);
+      await manager.query(`DELETE FROM "product_variant"`);
+      await manager.query(`DELETE FROM "product"`);
+    });
+
+    it("looks up order", async () => {
+      const api = useApi();
+
+      const response = await api
+        .get("/store/orders?display_id=111&email=test@email.com")
+        .catch((err) => {
+          return err.response;
+        });
+      expect(response.status).toEqual(200);
+      expect(response.data.order.display_id).toEqual(111);
+      expect(response.data.order.email).toEqual("test@email.com");
+    });
+
+    it("fails if display_id + email not provided", async () => {
+      const api = useApi();
+
+      const response = await api
+        .get("/store/orders?display_id=111")
+        .catch((err) => {
+          return err.response;
+        });
+      expect(response.status).toEqual(400);
+    });
+
+    it("fails if display_id + email not provided", async () => {
+      const api = useApi();
+
+      const response = await api
+        .get("/store/orders?email=test@email.com")
+        .catch((err) => {
+          return err.response;
+        });
+      expect(response.status).toEqual(400);
+    });
+
+    it("fails if email not correct", async () => {
+      const api = useApi();
+
+      const response = await api
+        .get("/store/orders?display_id=111&email=test1@email.com")
+        .catch((err) => {
+          return err.response;
+        });
+
+      expect(response.status).toEqual(404);
+    });
+  });
+});

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

@@ -0,0 +1,178 @@
+const { dropDatabase } = require("pg-god");
+const path = require("path");
+const {
+  Region,
+  Order,
+  Customer,
+  ShippingProfile,
+  Product,
+  ProductVariant,
+  ShippingOption,
+  LineItem,
+} = 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/carts", () => {
+  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/returns", () => {
+    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(Customer, {
+        id: "cus_1234",
+        email: "test@email.com",
+      });
+
+      await manager.insert(Order, {
+        id: "order_test",
+        email: "test@email.com",
+        display_id: 111,
+        customer_id: "cus_1234",
+        region_id: "region",
+        tax_rate: 0,
+        currency_code: "usd",
+      });
+
+      const defaultProfile = await manager.findOne(ShippingProfile, {
+        type: "default",
+      });
+
+      await manager.insert(Product, {
+        id: "test-product",
+        title: "test product",
+        profile_id: defaultProfile.id,
+        options: [{ id: "test-option", title: "Size" }],
+      });
+
+      await manager.insert(ProductVariant, {
+        id: "test-variant",
+        title: "test variant",
+        product_id: "test-product",
+        inventory_quantity: 1,
+        options: [
+          {
+            option_id: "test-option",
+            value: "Size",
+          },
+        ],
+      });
+
+      await manager.insert(LineItem, {
+        id: "test-item",
+        order_id: "order_test",
+        fulfilled_quantity: 1,
+        title: "Line Item",
+        description: "Line Item Desc",
+        thumbnail: "https://test.js/1234",
+        unit_price: 8000,
+        quantity: 1,
+        variant_id: "test-variant",
+      });
+
+      await manager.insert(ShippingOption, {
+        id: "test-option",
+        name: "Test ret",
+        profile_id: defaultProfile.id,
+        region_id: "region",
+        provider_id: "test-ful",
+        data: {},
+        price_type: "flat_rate",
+        amount: 1000,
+        is_return: true,
+      });
+    });
+
+    afterEach(async () => {
+      const manager = dbConnection.manager;
+      await manager.query(`DELETE FROM "shipping_method"`);
+      await manager.query(`DELETE FROM "shipping_option"`);
+      await manager.query(`DELETE FROM "return_item"`);
+      await manager.query(`DELETE FROM "return"`);
+      await manager.query(`DELETE FROM "line_item"`);
+      await manager.query(`DELETE FROM "order"`);
+      await manager.query(`DELETE FROM "customer"`);
+      await manager.query(`DELETE FROM "region"`);
+
+      await manager.query(`DELETE FROM "product_option_value"`);
+      await manager.query(`DELETE FROM "product_option"`);
+      await manager.query(`DELETE FROM "money_amount"`);
+      await manager.query(`DELETE FROM "product_variant"`);
+      await manager.query(`DELETE FROM "product"`);
+    });
+
+    it("creates a return", async () => {
+      const api = useApi();
+
+      const response = await api
+        .post("/store/returns", {
+          order_id: "order_test",
+          items: [
+            {
+              item_id: "test-item",
+              quantity: 1,
+            },
+          ],
+        })
+        .catch((err) => {
+          return err.response;
+        });
+      expect(response.status).toEqual(200);
+
+      expect(response.data.return.refund_amount).toEqual(8000);
+    });
+
+    it("creates a return with shipping method", async () => {
+      const api = useApi();
+
+      const response = await api
+        .post("/store/returns", {
+          order_id: "order_test",
+          return_shipping: {
+            option_id: "test-option",
+          },
+          items: [
+            {
+              item_id: "test-item",
+              quantity: 1,
+            },
+          ],
+        })
+        .catch((err) => {
+          return err.response;
+        });
+      expect(response.status).toEqual(200);
+
+      expect(response.data.return.refund_amount).toEqual(7000);
+    });
+  });
+});

integration-tests/api/package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@medusajs/medusa": "^1.1.3",
-    "medusa-interfaces": "^1.1.0"
+    "medusa-interfaces": "^1.1.0",
+    "typeorm": "^0.2.31"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",
@@ -16,4 +17,4 @@
     "@babel/node": "^7.12.10",
     "babel-preset-medusa-package": "^1.1.0"
   }
-}
+}

integration-tests/api/src/services/test-ful.js

@@ -36,6 +36,10 @@ class TestFulService extends FulfillmentService {
     return Promise.resolve({});
   }
 
+  createReturn() {
+    return Promise.resolve({});
+  }
+
   createFulfillment() {
     // No data is being sent anywhere
     return Promise.resolve({});

integration-tests/api/yarn.lock

@@ -4064,6 +4064,28 @@ typeorm@^0.2.29:
     yargonaut "^1.1.2"
     yargs "^16.0.3"
 
+typeorm@^0.2.31:
+  version "0.2.31"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.31.tgz#82b8a1b233224f81c738f53b0380386ccf360917"
+  integrity sha512-dVvCEVHH48DG0QPXAKfo0l6ecQrl3A8ucGP4Yw4myz4YEDMProebTQo8as83uyES+nrwCbu3qdkL4ncC2+qcMA==
+  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"