From 0357e7c80e8d9ae942a37a0cae4c01d838019d19 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Mon, 6 May 2024 19:58:58 -0700
Subject: [PATCH] Put email-confirmation migration into
 trusted-saml-ldap-emails file

---
 .../20240419200953_email-confirmation.ts          | 15 ---------------
 .../20240506163405_trusted-saml-ldap-emails.ts    | 13 +++++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 backend/src/db/migrations/20240419200953_email-confirmation.ts

diff --git a/backend/src/db/migrations/20240419200953_email-confirmation.ts b/backend/src/db/migrations/20240419200953_email-confirmation.ts
deleted file mode 100644
index 59d7b3d41..000000000
--- a/backend/src/db/migrations/20240419200953_email-confirmation.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  await knex.schema.alterTable(TableName.Users, (t) => {
-    t.boolean("isEmailVerified");
-  });
-}
-
-export async function down(knex: Knex): Promise<void> {
-  await knex.schema.alterTable(TableName.Users, (t) => {
-    t.dropColumn("isEmailVerified");
-  });
-}
diff --git a/backend/src/db/migrations/20240506163405_trusted-saml-ldap-emails.ts b/backend/src/db/migrations/20240506163405_trusted-saml-ldap-emails.ts
index 950f78e58..63aa75ad8 100644
--- a/backend/src/db/migrations/20240506163405_trusted-saml-ldap-emails.ts
+++ b/backend/src/db/migrations/20240506163405_trusted-saml-ldap-emails.ts
@@ -3,6 +3,13 @@ import { Knex } from "knex";
 import { TableName } from "../schemas";
 
 export async function up(knex: Knex): Promise<void> {
+  const isUsersTablePresent = await knex.schema.hasTable(TableName.Users);
+  if (isUsersTablePresent) {
+    await knex.schema.alterTable(TableName.Users, (t) => {
+      t.boolean("isEmailVerified");
+    });
+  }
+
   const isUserAliasTablePresent = await knex.schema.hasTable(TableName.UserAliases);
   if (isUserAliasTablePresent) {
     await knex.schema.alterTable(TableName.UserAliases, (t) => {
@@ -20,6 +27,12 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(knex: Knex): Promise<void> {
+  if (await knex.schema.hasColumn(TableName.Users, "isEmailVerified")) {
+    await knex.schema.alterTable(TableName.Users, (t) => {
+      t.dropColumn("isEmailVerified");
+    });
+  }
+
   if (await knex.schema.hasColumn(TableName.SuperAdmin, "trustSamlEmails")) {
     await knex.schema.alterTable(TableName.SuperAdmin, (t) => {
       t.dropColumn("trustSamlEmails");