From fde236aa43104616635db94b2e22d2aca26e1b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Thu, 25 Aug 2022 01:06:25 +0200 Subject: [PATCH] add migration of users, user_contacts and email_opt_in --- backend/src/config/index.ts | 2 +- .../User.ts | 0 .../UserContact.ts | 0 database/entity/User.ts | 2 +- database/entity/UserContact.ts | 2 +- ...user_contacts_table.ts => 0048-add_user_contacts_table.ts} | 4 +++- 6 files changed, 6 insertions(+), 4 deletions(-) rename database/entity/{0047-add_user_contacts_table => 0048-add_user_contacts_table}/User.ts (100%) rename database/entity/{0047-add_user_contacts_table => 0048-add_user_contacts_table}/UserContact.ts (100%) rename database/migrations/{0047-add_user_contacts_table.ts => 0048-add_user_contacts_table.ts} (98%) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index ae73fa8ac..62b09c93d 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -10,7 +10,7 @@ Decimal.set({ }) const constants = { - DB_VERSION: '0047-messages_tables', + DB_VERSION: '0048-add_user_contacts_table', DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0 LOG4JS_CONFIG: 'log4js-config.json', // default log level on production should be info diff --git a/database/entity/0047-add_user_contacts_table/User.ts b/database/entity/0048-add_user_contacts_table/User.ts similarity index 100% rename from database/entity/0047-add_user_contacts_table/User.ts rename to database/entity/0048-add_user_contacts_table/User.ts diff --git a/database/entity/0047-add_user_contacts_table/UserContact.ts b/database/entity/0048-add_user_contacts_table/UserContact.ts similarity index 100% rename from database/entity/0047-add_user_contacts_table/UserContact.ts rename to database/entity/0048-add_user_contacts_table/UserContact.ts diff --git a/database/entity/User.ts b/database/entity/User.ts index 1e0017b72..3191148ee 100644 --- a/database/entity/User.ts +++ b/database/entity/User.ts @@ -1 +1 @@ -export { User } from './0047-add_user_contacts_table/User' +export { User } from './0048-add_user_contacts_table/User' diff --git a/database/entity/UserContact.ts b/database/entity/UserContact.ts index e596489da..dfa1ab4a1 100644 --- a/database/entity/UserContact.ts +++ b/database/entity/UserContact.ts @@ -1 +1 @@ -export { UserContact } from './0047-add_user_contacts_table/UserContact' +export { UserContact } from './0048-add_user_contacts_table/UserContact' diff --git a/database/migrations/0047-add_user_contacts_table.ts b/database/migrations/0048-add_user_contacts_table.ts similarity index 98% rename from database/migrations/0047-add_user_contacts_table.ts rename to database/migrations/0048-add_user_contacts_table.ts index b3c6be03e..49f647e39 100644 --- a/database/migrations/0047-add_user_contacts_table.ts +++ b/database/migrations/0048-add_user_contacts_table.ts @@ -63,8 +63,10 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis } export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { - // reconstruct the previous email back from contacts to users table + // this step comes after verification and test await queryFn('ALTER TABLE users ADD COLUMN email varchar(255) NULL AFTER privkey;') + + // reconstruct the previous email back from contacts to users table const contacts = await queryFn(`SELECT c.id, c.email, c.user_id FROM user_contacts as c`) for (const id in contacts) { const contact = contacts[id]