PR Review fixes

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

@@ -75,7 +75,7 @@ describe("/admin/draft-orders", () => {
 
       const payload = {
         email: "oli@test.dk",
-        shipping_address_id: "oli-shipping",
+        shipping_address: "oli-shipping",
         items: [
           {
             variant_id: "test-variant",
@@ -109,7 +109,7 @@ describe("/admin/draft-orders", () => {
 
       const payload = {
         email: "oli@test.dk",
-        shipping_address_id: "oli-shipping",
+        shipping_address: "oli-shipping",
         items: [
           {
             variant_id: "test-variant",
@@ -148,7 +148,7 @@ describe("/admin/draft-orders", () => {
 
       const payload = {
         email: "oli@test.dk",
-        shipping_address_id: "oli-shipping",
+        shipping_address: "oli-shipping",
         discounts: [{ code: "TEST" }],
         items: [
           {
@@ -302,6 +302,7 @@ describe("/admin/draft-orders", () => {
       );
       // expect draft order to be complete
       expect(updatedDraftOrder.data.draft_order.status).toEqual("completed");
+      expect(updatedDraftOrder.data.draft_order.completed_at).not.toEqual(null);
     });
   });
   describe("GET /admin/draft-orders", () => {

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

@@ -67,7 +67,7 @@ describe("/admin/orders", () => {
       await manager.query(`DELETE FROM "user"`);
     });
 
-    it("creates a cart", async () => {
+    it("gets orders", async () => {
       const api = useApi();
 
       const response = await api

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

@@ -20,6 +20,7 @@ describe("/store/carts", () => {
     await manager.query(`DELETE FROM "shipping_method"`);
     await manager.query(`DELETE FROM "shipping_option"`);
     await manager.query(`DELETE FROM "cart"`);
+    await manager.query(`DELETE FROM "address"`);
     await manager.query(`DELETE FROM "customer"`);
     await manager.query(
       `UPDATE "country" SET region_id=NULL WHERE iso_2 = 'us'`
@@ -143,6 +144,41 @@ describe("/store/carts", () => {
       expect(response.status).toEqual(200);
     });
 
+    it("updates address using string id", async () => {
+      const api = useApi();
+
+      const response = await api.post("/store/carts/test-cart", {
+        billing_address: "test-general-address",
+        shipping_address: "test-general-address",
+      });
+
+      expect(response.data.cart.shipping_address_id).toEqual(
+        "test-general-address"
+      );
+      expect(response.data.cart.billing_address_id).toEqual(
+        "test-general-address"
+      );
+      expect(response.status).toEqual(200);
+    });
+
+    it("updates address", async () => {
+      const api = useApi();
+
+      const response = await api.post("/store/carts/test-cart", {
+        shipping_address: {
+          first_name: "clark",
+          last_name: "kent",
+          address_1: "5th avenue",
+          city: "nyc",
+          country_code: "us",
+          postal_code: "something",
+        },
+      });
+
+      expect(response.data.cart.shipping_address.first_name).toEqual("clark");
+      expect(response.status).toEqual(200);
+    });
+
     it("adds free shipping to cart then removes it again", async () => {
       const api = useApi();
 

integration-tests/api/__tests__/store/draft-order.js

@@ -45,7 +45,9 @@ describe("/store/carts (draft-orders)", () => {
       await manager.query(`DELETE FROM "product"`);
       await manager.query(`DELETE FROM "shipping_method"`);
       await manager.query(`DELETE FROM "shipping_option"`);
+      await manager.query(`UPDATE "discount" SET rule_id=NULL`);
       await manager.query(`DELETE FROM "discount"`);
+      await manager.query(`DELETE FROM "discount_rule"`);
       await manager.query(`DELETE FROM "payment_provider"`);
       await manager.query(`DELETE FROM "payment_session"`);
       await manager.query(`UPDATE "payment" SET order_id=NULL`);
@@ -64,6 +66,7 @@ describe("/store/carts (draft-orders)", () => {
         `UPDATE "country" SET region_id=NULL WHERE iso_2 = 'de'`
       );
       await manager.query(`DELETE FROM "region"`);
+      await manager.query(`DELETE FROM "user"`);
     });
 
     it("completes a cart for a draft order thereby creating an order for the draft order", async () => {

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

@@ -7,6 +7,7 @@ const {
   ShippingProfile,
   ShippingOption,
   ShippingMethod,
+  Address,
 } = require("@medusajs/medusa");
 
 module.exports = async (connection, data = {}) => {
@@ -16,6 +17,12 @@ module.exports = async (connection, data = {}) => {
     type: "default",
   });
 
+  await manager.insert(Address, {
+    id: "test-general-address",
+    first_name: "superman",
+    country_code: "us",
+  });
+
   const r = manager.create(Region, {
     id: "test-region",
     name: "Test Region",

integration-tests/api/helpers/draft-order-seeder.js

@@ -12,6 +12,7 @@ const {
   DraftOrder,
   Discount,
   DiscountRule,
+  Payment,
 } = require("@medusajs/medusa");
 
 module.exports = async (connection, data = {}) => {
@@ -189,6 +190,19 @@ module.exports = async (connection, data = {}) => {
     metadata: { draft_order_id: "test-draft-order" },
   });
 
+  const pay = manager.create(Payment, {
+    id: "test-payment",
+    amount: 10000,
+    currency_code: "usd",
+    amount_refunded: 0,
+    provider_id: "test-pay",
+    data: {},
+  });
+
+  await manager.save(pay);
+
+  c.payment = pay;
+
   await manager.save(c);
 
   await manager.insert(PaymentSession, {
@@ -197,12 +211,12 @@ module.exports = async (connection, data = {}) => {
     provider_id: "test-pay",
     is_selected: true,
     data: {},
-    status: "pending",
+    status: "authorized",
   });
 
   const draftOrder = manager.create(DraftOrder, {
     id: "test-draft-order",
-    status: "awaiting",
+    status: "open",
     display_id: 4,
     cart_id: "test-cart",
     customer_id: "oli-test",