Merge pull request #2799 from gradido/events-unify-names

refactor(backend): unify event names

backend/src/config/index.ts

@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0063-event_link_fields',
+  DB_VERSION: '0064-event_rename',
   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

backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts

@@ -0,0 +1,6 @@
+import { User as DbUser } from '@entity/User'
+import { Event as DbEvent } from '@entity/Event'
+import { Event, EventType } from './Event'
+
+export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventType.EMAIL_ACCOUNT_MULTIREGISTRATION, user, { id: 0 } as DbUser).save()

backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts

@@ -2,7 +2,7 @@ import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
 import { Event, EventType } from './Event'
 
-export const EVENT_ADMIN_SEND_CONFIRMATION_EMAIL = async (
+export const EVENT_EMAIL_ADMIN_CONFIRMATION = async (
   user: DbUser,
   moderator: DbUser,
-): Promise<DbEvent> => Event(EventType.ADMIN_SEND_CONFIRMATION_EMAIL, user, moderator).save()
+): Promise<DbEvent> => Event(EventType.EMAIL_ADMIN_CONFIRMATION, user, moderator).save()

backend/src/event/EVENT_EMAIL_CONFIRMATION.ts

@@ -2,5 +2,5 @@ import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
 import { Event, EventType } from './Event'
 
-export const EVENT_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
+export const EVENT_EMAIL_CONFIRMATION = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.ACTIVATE_ACCOUNT, user, user).save()
+  Event(EventType.EMAIL_CONFIRMATION, user, user).save()

backend/src/event/EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL.ts

@@ -1,6 +0,0 @@
-import { User as DbUser } from '@entity/User'
-import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
-
-export const EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.SEND_ACCOUNT_MULTIREGISTRATION_EMAIL, user, { id: 0 } as DbUser).save()

backend/src/event/EVENT_SEND_CONFIRMATION_EMAIL.ts

@@ -1,6 +0,0 @@
-import { User as DbUser } from '@entity/User'
-import { Event as DbEvent } from '@entity/Event'
-import { Event, EventType } from './Event'
-
-export const EVENT_SEND_CONFIRMATION_EMAIL = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.SEND_CONFIRMATION_EMAIL, user, user).save()

backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts

@@ -0,0 +1,6 @@
+import { User as DbUser } from '@entity/User'
+import { Event as DbEvent } from '@entity/Event'
+import { Event, EventType } from './Event'
+
+export const EVENT_USER_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>
+  Event(EventType.USER_ACTIVATE_ACCOUNT, user, user).save()

backend/src/event/EVENT_USER_LOGIN.ts

@@ -2,5 +2,5 @@ import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
 import { Event, EventType } from './Event'
 
-export const EVENT_REGISTER = async (user: DbUser): Promise<DbEvent> =>
+export const EVENT_USER_LOGIN = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.REGISTER, user, user).save()
+  Event(EventType.USER_LOGIN, user, user).save()

backend/src/event/EVENT_USER_LOGOUT.ts

@@ -2,5 +2,5 @@ import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
 import { Event, EventType } from './Event'
 
-export const EVENT_LOGIN = async (user: DbUser): Promise<DbEvent> =>
+export const EVENT_USER_LOGOUT = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.LOGIN, user, user).save()
+  Event(EventType.USER_LOGOUT, user, user).save()

backend/src/event/EVENT_USER_REGISTER.ts

@@ -2,5 +2,5 @@ import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
 import { Event, EventType } from './Event'
 
-export const EVENT_LOGOUT = async (user: DbUser): Promise<DbEvent> =>
+export const EVENT_USER_REGISTER = async (user: DbUser): Promise<DbEvent> =>
-  Event(EventType.LOGOUT, user, user).save()
+  Event(EventType.USER_REGISTER, user, user).save()

backend/src/event/Event.ts

@@ -36,7 +36,6 @@ export const Event = (
 
 export { EventType } from './EventType'
 
-export { EVENT_ACTIVATE_ACCOUNT } from './EVENT_ACTIVATE_ACCOUNT'
 export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
 export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
 export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
@@ -46,7 +45,6 @@ export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION
 export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
 export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
 export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_ADMIN_SEND_CONFIRMATION_EMAIL } from './EVENT_ADMIN_SEND_CONFIRMATION_EMAIL'
 export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
 export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
 export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
@@ -55,15 +53,17 @@ export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
 export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
 export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
 export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
+export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
+export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
+export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
 export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
-export { EVENT_LOGIN } from './EVENT_LOGIN'
-export { EVENT_LOGOUT } from './EVENT_LOGOUT'
-export { EVENT_REGISTER } from './EVENT_REGISTER'
-export { EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL } from './EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL'
-export { EVENT_SEND_CONFIRMATION_EMAIL } from './EVENT_SEND_CONFIRMATION_EMAIL'
 export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
 export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
 export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
 export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
 export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
+export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
 export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
+export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
+export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
+export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'

backend/src/event/EventType.ts

@@ -1,5 +1,4 @@
 export enum EventType {
-  ACTIVATE_ACCOUNT = 'ACTIVATE_ACCOUNT',
   // TODO CONTRIBUTION_CONFIRM = 'CONTRIBUTION_CONFIRM',
   ADMIN_CONTRIBUTION_CONFIRM = 'ADMIN_CONTRIBUTION_CONFIRM',
   ADMIN_CONTRIBUTION_CREATE = 'ADMIN_CONTRIBUTION_CREATE',
@@ -10,7 +9,6 @@ export enum EventType {
   ADMIN_CONTRIBUTION_LINK_DELETE = 'ADMIN_CONTRIBUTION_LINK_DELETE',
   ADMIN_CONTRIBUTION_LINK_UPDATE = 'ADMIN_CONTRIBUTION_LINK_UPDATE',
   ADMIN_CONTRIBUTION_MESSAGE_CREATE = 'ADMIN_CONTRIBUTION_MESSAGE_CREATE',
-  ADMIN_SEND_CONFIRMATION_EMAIL = 'ADMIN_SEND_CONFIRMATION_EMAIL',
   ADMIN_USER_DELETE = 'ADMIN_USER_DELETE',
   ADMIN_USER_UNDELETE = 'ADMIN_USER_UNDELETE',
   ADMIN_USER_ROLE_SET = 'ADMIN_USER_ROLE_SET',
@@ -19,25 +17,26 @@ export enum EventType {
   CONTRIBUTION_UPDATE = 'CONTRIBUTION_UPDATE',
   CONTRIBUTION_MESSAGE_CREATE = 'CONTRIBUTION_MESSAGE_CREATE',
   CONTRIBUTION_LINK_REDEEM = 'CONTRIBUTION_LINK_REDEEM',
+  EMAIL_ACCOUNT_MULTIREGISTRATION = 'EMAIL_ACCOUNT_MULTIREGISTRATION',
+  EMAIL_ADMIN_CONFIRMATION = 'EMAIL_ADMIN_CONFIRMATION',
+  EMAIL_CONFIRMATION = 'EMAIL_CONFIRMATION',
   EMAIL_FORGOT_PASSWORD = 'EMAIL_FORGOT_PASSWORD',
-  LOGIN = 'LOGIN',
-  LOGOUT = 'LOGOUT',
-  REGISTER = 'REGISTER',
-  REDEEM_REGISTER = 'REDEEM_REGISTER',
-  SEND_ACCOUNT_MULTIREGISTRATION_EMAIL = 'SEND_ACCOUNT_MULTIREGISTRATION_EMAIL',
-  SEND_CONFIRMATION_EMAIL = 'SEND_CONFIRMATION_EMAIL',
   TRANSACTION_SEND = 'TRANSACTION_SEND',
   TRANSACTION_RECEIVE = 'TRANSACTION_RECEIVE',
   TRANSACTION_LINK_CREATE = 'TRANSACTION_LINK_CREATE',
   TRANSACTION_LINK_DELETE = 'TRANSACTION_LINK_DELETE',
   TRANSACTION_LINK_REDEEM = 'TRANSACTION_LINK_REDEEM',
+  USER_ACTIVATE_ACCOUNT = 'ACTIVATE_ACCOUNT',
   USER_INFO_UPDATE = 'USER_INFO_UPDATE',
+  USER_LOGIN = 'USER_LOGIN',
+  USER_LOGOUT = 'USER_LOGOUT',
+  USER_REGISTER = 'USER_REGISTER',
+  USER_REGISTER_REDEEM = 'USER_REGISTER_REDEEM',
   // VISIT_GRADIDO = 'VISIT_GRADIDO',
   // VERIFY_REDEEM = 'VERIFY_REDEEM',
   // INACTIVE_ACCOUNT = 'INACTIVE_ACCOUNT',
   // CONFIRM_EMAIL = 'CONFIRM_EMAIL',
   // REGISTER_EMAIL_KLICKTIPP = 'REGISTER_EMAIL_KLICKTIPP',
-  // LOGOUT = 'LOGOUT',
   // REDEEM_LOGIN = 'REDEEM_LOGIN',
   // SEND_FORGOT_PASSWORD_EMAIL = 'SEND_FORGOT_PASSWORD_EMAIL',
   // PASSWORD_CHANGE = 'PASSWORD_CHANGE',

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -2578,10 +2578,10 @@ describe('ContributionResolver', () => {
               })
             })
 
-            it('stores the SEND_CONFIRMATION_EMAIL event in the database', async () => {
+            it('stores the EMAIL_CONFIRMATION event in the database', async () => {
               await expect(DbEvent.find()).resolves.toContainEqual(
                 expect.objectContaining({
-                  type: EventType.SEND_CONFIRMATION_EMAIL,
+                  type: EventType.EMAIL_CONFIRMATION,
                 }),
               )
             })

backend/src/graphql/resolver/UserResolver.test.ts

@@ -182,14 +182,14 @@ describe('UserResolver', () => {
         })
       })
 
-      it('stores the REGISTER event in the database', async () => {
+      it('stores the USER_REGISTER event in the database', async () => {
         const userConatct = await UserContact.findOneOrFail(
           { email: 'peter@lustig.de' },
           { relations: ['user'] },
         )
         await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
-            type: EventType.REGISTER,
+            type: EventType.USER_REGISTER,
             affectedUserId: userConatct.user.id,
             actingUserId: userConatct.user.id,
           }),
@@ -216,10 +216,10 @@ describe('UserResolver', () => {
         })
       })
 
-      it('stores the SEND_CONFIRMATION_EMAIL event in the database', async () => {
+      it('stores the EMAIL_CONFIRMATION event in the database', async () => {
         await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
-            type: EventType.SEND_CONFIRMATION_EMAIL,
+            type: EventType.EMAIL_CONFIRMATION,
             affectedUserId: user[0].id,
             actingUserId: user[0].id,
           }),
@@ -258,14 +258,14 @@ describe('UserResolver', () => {
         )
       })
 
-      it('stores the SEND_ACCOUNT_MULTIREGISTRATION_EMAIL event in the database', async () => {
+      it('stores the EMAIL_ACCOUNT_MULTIREGISTRATION event in the database', async () => {
         const userConatct = await UserContact.findOneOrFail(
           { email: 'peter@lustig.de' },
           { relations: ['user'] },
         )
         await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
-            type: EventType.SEND_ACCOUNT_MULTIREGISTRATION_EMAIL,
+            type: EventType.EMAIL_ACCOUNT_MULTIREGISTRATION,
             affectedUserId: userConatct.user.id,
             actingUserId: 0,
           }),
@@ -363,20 +363,20 @@ describe('UserResolver', () => {
           )
         })
 
-        it('stores the ACTIVATE_ACCOUNT event in the database', async () => {
+        it('stores the USER_ACTIVATE_ACCOUNT event in the database', async () => {
           await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
-              type: EventType.ACTIVATE_ACCOUNT,
+              type: EventType.USER_ACTIVATE_ACCOUNT,
               affectedUserId: user[0].id,
               actingUserId: user[0].id,
             }),
           )
         })
 
-        it('stores the REDEEM_REGISTER event in the database', async () => {
+        it('stores the USER_REGISTER_REDEEM event in the database', async () => {
           await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
-              type: EventType.REDEEM_REGISTER,
+              type: EventType.USER_REGISTER_REDEEM,
               affectedUserId: result.data.createUser.id,
               actingUserId: result.data.createUser.id,
               involvedContributionLinkId: link.id,
@@ -458,10 +458,10 @@ describe('UserResolver', () => {
           )
         })
 
-        it('stores the REDEEM_REGISTER event in the database', async () => {
+        it('stores the USER_REGISTER_REDEEM event in the database', async () => {
           await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
-              type: EventType.REDEEM_REGISTER,
+              type: EventType.USER_REGISTER_REDEEM,
               affectedUserId: newUser.data.createUser.id,
               actingUserId: newUser.data.createUser.id,
               involvedTransactionLinkId: transactionLink.id,
@@ -687,14 +687,14 @@ describe('UserResolver', () => {
         expect(headerPushMock).toBeCalledWith({ key: 'token', value: expect.any(String) })
       })
 
-      it('stores the LOGIN event in the database', async () => {
+      it('stores the USER_LOGIN event in the database', async () => {
         const userConatct = await UserContact.findOneOrFail(
           { email: 'bibi@bloxberg.de' },
           { relations: ['user'] },
         )
         await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
-            type: EventType.LOGIN,
+            type: EventType.USER_LOGIN,
             affectedUserId: userConatct.user.id,
             actingUserId: userConatct.user.id,
           }),
@@ -869,14 +869,14 @@ describe('UserResolver', () => {
         )
       })
 
-      it('stores the LOGOUT event in the database', async () => {
+      it('stores the USER_LOGOUT event in the database', async () => {
         const userConatct = await UserContact.findOneOrFail(
           { email: 'bibi@bloxberg.de' },
           { relations: ['user'] },
         )
         await expect(DbEvent.find()).resolves.toContainEqual(
           expect.objectContaining({
-            type: EventType.LOGOUT,
+            type: EventType.USER_LOGOUT,
             affectedUserId: userConatct.user.id,
             actingUserId: userConatct.user.id,
           }),
@@ -955,10 +955,10 @@ describe('UserResolver', () => {
           )
         })
 
-        it('stores the LOGIN event in the database', async () => {
+        it('stores the USER_LOGIN event in the database', async () => {
           await expect(DbEvent.find()).resolves.toContainEqual(
             expect.objectContaining({
-              type: EventType.LOGIN,
+              type: EventType.USER_LOGIN,
               affectedUserId: user[0].id,
               actingUserId: user[0].id,
             }),
@@ -1935,14 +1935,14 @@ describe('UserResolver', () => {
             })
           })
 
-          it('stores the ADMIN_SEND_CONFIRMATION_EMAIL event in the database', async () => {
+          it('stores the EMAIL_ADMIN_CONFIRMATION event in the database', async () => {
             const userConatct = await UserContact.findOneOrFail(
               { email: 'bibi@bloxberg.de' },
               { relations: ['user'] },
             )
             await expect(DbEvent.find()).resolves.toContainEqual(
               expect.objectContaining({
-                type: EventType.ADMIN_SEND_CONFIRMATION_EMAIL,
+                type: EventType.EMAIL_ADMIN_CONFIRMATION,
                 affectedUserId: userConatct.user.id,
                 actingUserId: admin.id,
               }),

backend/src/graphql/resolver/UserResolver.ts

@@ -55,13 +55,13 @@ import { hasElopageBuys } from '@/util/hasElopageBuys'
 import {
   Event,
   EventType,
-  EVENT_LOGIN,
+  EVENT_USER_LOGIN,
-  EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL,
+  EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION,
-  EVENT_SEND_CONFIRMATION_EMAIL,
+  EVENT_EMAIL_CONFIRMATION,
-  EVENT_REGISTER,
+  EVENT_USER_REGISTER,
-  EVENT_ACTIVATE_ACCOUNT,
+  EVENT_USER_ACTIVATE_ACCOUNT,
-  EVENT_ADMIN_SEND_CONFIRMATION_EMAIL,
+  EVENT_EMAIL_ADMIN_CONFIRMATION,
-  EVENT_LOGOUT,
+  EVENT_USER_LOGOUT,
   EVENT_EMAIL_FORGOT_PASSWORD,
   EVENT_USER_INFO_UPDATE,
   EVENT_ADMIN_USER_ROLE_SET,
@@ -188,7 +188,7 @@ export class UserResolver {
       value: encode(dbUser.gradidoID),
     })
 
-    await EVENT_LOGIN(dbUser)
+    await EVENT_USER_LOGIN(dbUser)
     logger.info(`successful Login: ${JSON.stringify(user, null, 2)}`)
     return user
   }
@@ -196,7 +196,7 @@ export class UserResolver {
   @Authorized([RIGHTS.LOGOUT])
   @Mutation(() => Boolean)
   async logout(@Ctx() context: Context): Promise<boolean> {
-    await EVENT_LOGOUT(getUser(context))
+    await EVENT_USER_LOGOUT(getUser(context))
     // remove user from logger context
     logger.addContext('user', 'unknown')
     return true
@@ -251,8 +251,7 @@ export class UserResolver {
           email,
           language: foundUser.language, // use language of the emails owner for sending
         })
-
+        await EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION(foundUser)
-        await EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL(foundUser)
 
         logger.info(
           `sendAccountMultiRegistrationEmail by ${firstName} ${lastName} to ${foundUser.firstName} ${foundUser.lastName} <${email}>`,
@@ -271,7 +270,7 @@ export class UserResolver {
     const gradidoID = await newGradidoID()
 
     const eventRegisterRedeem = Event(
-      EventType.REDEEM_REGISTER,
+      EventType.USER_REGISTER_REDEEM,
       { id: 0 } as DbUser,
       { id: 0 } as DbUser,
     )
@@ -337,7 +336,7 @@ export class UserResolver {
       })
       logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`)
 
-      await EVENT_SEND_CONFIRMATION_EMAIL(dbUser)
+      await EVENT_EMAIL_CONFIRMATION(dbUser)
 
       if (!emailSent) {
         logger.debug(`Account confirmation link: ${activationLink}`)
@@ -358,7 +357,7 @@ export class UserResolver {
       eventRegisterRedeem.actingUser = dbUser
       await eventRegisterRedeem.save()
     } else {
-      await EVENT_REGISTER(dbUser)
+      await EVENT_USER_REGISTER(dbUser)
     }
 
     return new User(dbUser)
@@ -493,7 +492,7 @@ export class UserResolver {
         logger.error('Error subscribing to klicktipp', e)
       }
     }
-    await EVENT_ACTIVATE_ACCOUNT(user)
+    await EVENT_USER_ACTIVATE_ACCOUNT(user)
 
     return true
   }
@@ -818,7 +817,7 @@ export class UserResolver {
     if (!emailSent) {
       logger.info(`Account confirmation link: ${activationLink}`)
     }
-    await EVENT_ADMIN_SEND_CONFIRMATION_EMAIL(user, getUser(context))
+    await EVENT_EMAIL_ADMIN_CONFIRMATION(user, getUser(context))
 
     return true
   }

database/migrations/0064-event_rename.ts

@@ -0,0 +1,50 @@
+/* MIGRATION TO CHANGE EVENT NAMES
+ *
+ * This migration renames several events to ensure consistent
+ * naming conventions.
+ */
+
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'UPDATE `events` SET `type` = "USER_ACTIVATE_ACCOUNT" WHERE `type` = "ACTIVATE_ACCOUNT";',
+  )
+  await queryFn('UPDATE `events` SET `type` = "USER_LOGIN" WHERE `type` = "LOGIN";')
+  await queryFn('UPDATE `events` SET `type` = "USER_LOGOUT" WHERE `type` = "LOGOUT";')
+  await queryFn('UPDATE `events` SET `type` = "USER_REGISTER" WHERE `type` = "REGISTER";')
+  await queryFn(
+    'UPDATE `events` SET `type` = "EMAIL_ACCOUNT_MULTIREGISTRATION" WHERE `type` = "SEND_ACCOUNT_MULTIREGISTRATION_EMAIL";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "EMAIL_CONFIRMATION" WHERE `type` = "SEND_CONFIRMATION_EMAIL";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "EMAIL_ADMIN_CONFIRMATION" WHERE `type` = "ADMIN_SEND_CONFIRMATION_EMAIL";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "USER_REGISTER_REDEEM" WHERE `type` = "REDEEM_REGISTER";',
+  )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'UPDATE `events` SET `type` = "REDEEM_REGISTER" WHERE `type` = "USER_REGISTER_REDEEM";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "ADMIN_SEND_CONFIRMATION_EMAIL" WHERE `type` = "EMAIL_ADMIN_CONFIRMATION";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "SEND_CONFIRMATION_EMAIL" WHERE `type` = "EMAIL_CONFIRMATION";',
+  )
+  await queryFn(
+    'UPDATE `events` SET `type` = "SEND_ACCOUNT_MULTIREGISTRATION_EMAIL" WHERE `type` = "EMAIL_ACCOUNT_MULTIREGISTRATION";',
+  )
+  await queryFn('UPDATE `events` SET `type` = "REGISTER" WHERE `type` = "USER_REGISTER";')
+  await queryFn('UPDATE `events` SET `type` = "LOGOUT" WHERE `type` = "USER_LOGOUT";')
+  await queryFn('UPDATE `events` SET `type` = "LOGIN" WHERE `type` = "USER_LOGIN";')
+  await queryFn(
+    'UPDATE `events` SET `type` = "ACTIVATE_ACCOUNT" WHERE `type` = "USER_ACTIVATE_ACCOUNT";',
+  )
+}

dht-node/src/config/index.ts

@@ -3,7 +3,7 @@ import dotenv from 'dotenv'
 dotenv.config()
 
 const constants = {
-  DB_VERSION: '0063-event_link_fields',
+  DB_VERSION: '0064-event_rename',
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',

federation/src/config/index.ts

@@ -11,7 +11,7 @@ Decimal.set({
 */
 
 const constants = {
-  DB_VERSION: '0063-event_link_fields',
+  DB_VERSION: '0064-event_rename',
   // 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