From 3ac71e4a4c6e98ca61c1422e50ed78805a6fde81 Mon Sep 17 00:00:00 2001
From: olivermrbl <oliver@mrbltech.com>
Date: Thu, 18 Feb 2021 15:46:40 +0100
Subject: [PATCH] draft order func. complete

---
 .../api/__tests__/admin/draft-order.js        |  4 ++--
 .../api/src/services/test-not.js              | 19 +++++++++++++++++++
 .../1613634008478-payment_link_template.ts    | 14 --------------
 packages/medusa/src/services/draft-order.js   |  8 +++++---
 4 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 integration-tests/api/src/services/test-not.js
 delete mode 100644 packages/medusa/src/migrations/1613634008478-payment_link_template.ts

diff --git a/integration-tests/api/__tests__/admin/draft-order.js b/integration-tests/api/__tests__/admin/draft-order.js
index 5dd774482f..ba2e9fb0b5 100644
--- a/integration-tests/api/__tests__/admin/draft-order.js
+++ b/integration-tests/api/__tests__/admin/draft-order.js
@@ -50,8 +50,8 @@ describe("/admin/draft-orders", () => {
       await manager.query(`DELETE FROM "payment_provider"`);
       await manager.query(`DELETE FROM "payment_session"`);
       await manager.query(`UPDATE "payment" SET order_id=NULL`);
-      await manager.query(`DELETE FROM "order"`);
       await manager.query(`UPDATE "draft_order" SET order_id=NULL`);
+      await manager.query(`DELETE FROM "order"`);
       await manager.query(`DELETE FROM "draft_order"`);
       await manager.query(`DELETE FROM "cart"`);
       await manager.query(`DELETE FROM "payment"`);
@@ -256,8 +256,8 @@ describe("/admin/draft-orders", () => {
       await manager.query(`DELETE FROM "payment_provider"`);
       await manager.query(`DELETE FROM "payment_session"`);
       await manager.query(`UPDATE "payment" SET order_id=NULL`);
-      await manager.query(`DELETE FROM "order"`);
       await manager.query(`UPDATE "draft_order" SET order_id=NULL`);
+      await manager.query(`DELETE FROM "order"`);
       await manager.query(`DELETE FROM "draft_order"`);
       await manager.query(`DELETE FROM "cart"`);
       await manager.query(`DELETE FROM "payment"`);
diff --git a/integration-tests/api/src/services/test-not.js b/integration-tests/api/src/services/test-not.js
new file mode 100644
index 0000000000..9e175477a8
--- /dev/null
+++ b/integration-tests/api/src/services/test-not.js
@@ -0,0 +1,19 @@
+import { NotificationService } from "medusa-interfaces";
+
+class TestNotiService extends NotificationService {
+  static identifier = "test-not";
+
+  constructor() {
+    super();
+  }
+
+  async sendNotification() {
+    return Promise.resolve();
+  }
+
+  async reSendNotification() {
+    return Promise.resolve();
+  }
+}
+
+export default TestNotiService;
diff --git a/packages/medusa/src/migrations/1613634008478-payment_link_template.ts b/packages/medusa/src/migrations/1613634008478-payment_link_template.ts
deleted file mode 100644
index 60858cc3fd..0000000000
--- a/packages/medusa/src/migrations/1613634008478-payment_link_template.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class paymentLinkTemplate1613634008478 implements MigrationInterface {
-    name = 'paymentLinkTemplate1613634008478'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "store" ADD "payment_link_template" character varying`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "store" DROP COLUMN "payment_link_template"`);
-    }
-
-}
diff --git a/packages/medusa/src/services/draft-order.js b/packages/medusa/src/services/draft-order.js
index 55245b2280..5dda8ad076 100644
--- a/packages/medusa/src/services/draft-order.js
+++ b/packages/medusa/src/services/draft-order.js
@@ -274,9 +274,9 @@ class DraftOrderService extends BaseService {
       delete where.display_id
 
       query.join = {
-        alias: "draftOrder",
+        alias: "draft_order",
         innerJoin: {
-          cart: "draftOrder.cart",
+          cart: "draft_order.cart",
         },
       }
 
@@ -287,7 +287,9 @@ class DraftOrderService extends BaseService {
           new Brackets(qb => {
             qb.where(`cart.email ILIKE :q`, {
               q: `%${q}%`,
-            }).orWhere(`display_id::varchar(255) ILIKE :dId`, { dId: `${q}` })
+            }).orWhere(`draft_order.display_id::varchar(255) ILIKE :dId`, {
+              dId: `${q}`,
+            })
           })
         )
       }