changes after session with claus peter

2025-12-13 07:45:54 +00:00 · 2022-07-01 17:20:26 +02:00 · 2022-07-01 17:20:26 +02:00 · d9034b1bdb
commit d9034b1bdb
parent 7f5995d2fa
4 changed files with 220 additions and 164 deletions
--- a/backend/src/event/EventProtocolEmitter.ts
+++ b/backend/src/event/EventProtocolEmitter.ts
@ -1,8 +1,8 @@
 import { EventEmitter } from 'events'
 import { backendLogger as logger } from '@/server/logger'
-import { EventProtocolType } from './EventProtocolType'
+// import { EventProtocolType } from './EventProtocolType'
 import { EventProtocol } from '@entity/EventProtocol'
-import { getConnection } from '@dbTools/typeorm'
+// import { getConnection } from '@dbTools/typeorm'
 import Decimal from 'decimal.js-light'
 import CONFIG from '@/config'

@ -18,34 +18,35 @@ eventProtocol.on('error', (err) => {
  logger.error(`ERROR in EventProtocol: ${err}`)
 })

-eventProtocol.on(EventProtocolType.BASIC, (createdAt: Date, userId: number) => {
+/*
+eventProtocol.on(EventProtocolType.BASIC, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.BASIC}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.BASIC, createdAt, userId, null, null, null, null, null)
+  await writeEvent(EventProtocolType.BASIC, createdAt, userId, null, null, null, null, null)
 })

-eventProtocol.on(EventProtocolType.VISIT_GRADIDO, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.VISIT_GRADIDO, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.VISIT_GRADIDO}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.VISIT_GRADIDO, createdAt, userId, null, null, null, null, null)
+  await writeEvent(EventProtocolType.VISIT_GRADIDO, createdAt, userId, null, null, null, null, null)
 })

-eventProtocol.on(EventProtocolType.REGISTER, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.REGISTER, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.REGISTER}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.REGISTER, createdAt, userId, null, null, null, null, null)
+  await writeEvent(EventProtocolType.REGISTER, createdAt, userId, null, null, null, null, null)
 })

 eventProtocol.on(
  EventProtocolType.REDEEM_REGISTER,
-  (createdAt: Date, userId: number, transactionId: number, contributionId: number) => {
+  async (createdAt: Date, userId: number, transactionId: number, contributionId: number) => {
    logger.info(
      `EventProtocol - ${EventProtocolType.REDEEM_REGISTER}: createdAt=${createdAt}, userId=${userId}, transactionId=${transactionId}, contributionId=${contributionId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.REDEEM_REGISTER,
      createdAt,
      userId,
@ -58,19 +59,12 @@ eventProtocol.on(
  },
 )

-eventProtocol.on(EventProtocolType.INACTIVE_ACCOUNT, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.INACTIVE_ACCOUNT, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.INACTIVE_ACCOUNT}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.INACTIVE_ACCOUNT, createdAt, userId, null, null, null, null, null)
-})
-
-eventProtocol.on(EventProtocolType.SEND_CONFIRMATION_EMAIL, (createdAt: Date, userId: number) => {
-  logger.info(
-    `EventProtocol - ${EventProtocolType.SEND_CONFIRMATION_EMAIL}: createdAt=${createdAt}, userId=${userId}`,
-  )
-  writeEvent(
-    EventProtocolType.SEND_CONFIRMATION_EMAIL,
+  await writeEvent(
+    EventProtocolType.INACTIVE_ACCOUNT,
    createdAt,
    userId,
    null,
@ -81,43 +75,65 @@ eventProtocol.on(EventProtocolType.SEND_CONFIRMATION_EMAIL, (createdAt: Date, us
  )
 })

-eventProtocol.on(EventProtocolType.CONFIRM_EMAIL, (createdAt: Date, userId: number) => {
+eventProtocol.on(
+  EventProtocolType.SEND_CONFIRMATION_EMAIL,
+  async (createdAt: Date, userId: number) => {
+    logger.info(
+      `EventProtocol - ${EventProtocolType.SEND_CONFIRMATION_EMAIL}: createdAt=${createdAt}, userId=${userId}`,
+    )
+    await writeEvent(
+      EventProtocolType.SEND_CONFIRMATION_EMAIL,
+      createdAt,
+      userId,
+      null,
+      null,
+      null,
+      null,
+      null,
+    )
+  },
+)
+
+eventProtocol.on(EventProtocolType.CONFIRM_EMAIL, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.CONFIRM_EMAIL}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.CONFIRM_EMAIL, createdAt, userId, null, null, null, null, null)
+  await writeEvent(EventProtocolType.CONFIRM_EMAIL, createdAt, userId, null, null, null, null, null)
 })

-eventProtocol.on(EventProtocolType.REGISTER_EMAIL_KLICKTIPP, (createdAt: Date, userId: number) => {
-  logger.info(
-    `EventProtocol - ${EventProtocolType.REGISTER_EMAIL_KLICKTIPP}: createdAt=${createdAt}, userId=${userId}`,
-  )
-  writeEvent(
-    EventProtocolType.REGISTER_EMAIL_KLICKTIPP,
-    createdAt,
-    userId,
-    null,
-    null,
-    null,
-    null,
-    null,
-  )
-})
+eventProtocol.on(
+  EventProtocolType.REGISTER_EMAIL_KLICKTIPP,
+  async (createdAt: Date, userId: number) => {
+    logger.info(
+      `EventProtocol - ${EventProtocolType.REGISTER_EMAIL_KLICKTIPP}: createdAt=${createdAt}, userId=${userId}`,
+    )
+    await writeEvent(
+      EventProtocolType.REGISTER_EMAIL_KLICKTIPP,
+      createdAt,
+      userId,
+      null,
+      null,
+      null,
+      null,
+      null,
+    )
+  },
+)

-eventProtocol.on(EventProtocolType.LOGIN, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.LOGIN, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.LOGIN}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.LOGIN, createdAt, userId, null, null, null, null, null)
+  await writeEvent(EventProtocolType.LOGIN, createdAt, userId, null, null, null, null, null)
 })

 eventProtocol.on(
  EventProtocolType.REDEEM_LOGIN,
-  (createdAt: Date, userId: number, transactionId: number, contributionId: number) => {
+  async (createdAt: Date, userId: number, transactionId: number, contributionId: number) => {
    logger.info(
      `EventProtocol - ${EventProtocolType.REDEEM_LOGIN}: createdAt=${createdAt}, userId=${userId}, transactionId=${transactionId}, contributionId=${contributionId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.REDEEM_LOGIN,
      createdAt,
      userId,
@ -130,33 +146,44 @@ eventProtocol.on(
  },
 )

-eventProtocol.on(EventProtocolType.ACTIVATE_ACCOUNT, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.ACTIVATE_ACCOUNT, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.ACTIVATE_ACCOUNT}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.ACTIVATE_ACCOUNT, createdAt, userId, null, null, null, null, null)
+  await writeEvent(
+    EventProtocolType.ACTIVATE_ACCOUNT,
+    createdAt,
+    userId,
+    null,
+    null,
+    null,
+    null,
+    null,
+  )
 })

-eventProtocol.on(EventProtocolType.PASSWORD_CHANGE, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.PASSWORD_CHANGE, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.PASSWORD_CHANGE}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.PASSWORD_CHANGE, createdAt, userId, null, null, null, null, null)
+  await writeEvent(
+    EventProtocolType.PASSWORD_CHANGE,
+    createdAt,
+    userId,
+    null,
+    null,
+    null,
+    null,
+    null,
+  )
 })

-eventProtocol.on(EventProtocolType.TRANSACTION_SEND, (createdAt: Date, userId: number) => {
+eventProtocol.on(EventProtocolType.TRANSACTION_SEND, async (createdAt: Date, userId: number) => {
  logger.info(
    `EventProtocol - ${EventProtocolType.TRANSACTION_SEND}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(EventProtocolType.TRANSACTION_SEND, createdAt, userId, null, null, null, null, null)
-})
-
-eventProtocol.on(EventProtocolType.TRANSACTION_SEND_REDEEM, (createdAt: Date, userId: number) => {
-  logger.info(
-    `EventProtocol - ${EventProtocolType.TRANSACTION_SEND_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
-  )
-  writeEvent(
-    EventProtocolType.TRANSACTION_SEND_REDEEM,
+  await writeEvent(
+    EventProtocolType.TRANSACTION_SEND,
    createdAt,
    userId,
    null,
@ -167,13 +194,32 @@ eventProtocol.on(EventProtocolType.TRANSACTION_SEND_REDEEM, (createdAt: Date, us
  )
 })

+eventProtocol.on(
+  EventProtocolType.TRANSACTION_SEND_REDEEM,
+  async (createdAt: Date, userId: number) => {
+    logger.info(
+      `EventProtocol - ${EventProtocolType.TRANSACTION_SEND_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
+    )
+    await writeEvent(
+      EventProtocolType.TRANSACTION_SEND_REDEEM,
+      createdAt,
+      userId,
+      null,
+      null,
+      null,
+      null,
+      null,
+    )
+  },
+)
+
 eventProtocol.on(
  EventProtocolType.TRANSACTION_REPEATE_REDEEM,
-  (createdAt: Date, userId: number) => {
+  async (createdAt: Date, userId: number) => {
    logger.info(
      `EventProtocol - ${EventProtocolType.TRANSACTION_REPEATE_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.TRANSACTION_REPEATE_REDEEM,
      createdAt,
      userId,
@ -186,12 +232,31 @@ eventProtocol.on(
  },
 )

-eventProtocol.on(EventProtocolType.TRANSACTION_CREATION, (createdAt: Date, userId: number) => {
+eventProtocol.on(
+  EventProtocolType.TRANSACTION_CREATION,
+  async (createdAt: Date, userId: number) => {
+    logger.info(
+      `EventProtocol - ${EventProtocolType.TRANSACTION_CREATION}: createdAt=${createdAt}, userId=${userId}`,
+    )
+    await writeEvent(
+      EventProtocolType.TRANSACTION_CREATION,
+      createdAt,
+      userId,
+      null,
+      null,
+      null,
+      null,
+      null,
+    )
+  },
+)
+
+eventProtocol.on(EventProtocolType.TRANSACTION_RECEIVE, async (createdAt: Date, userId: number) => {
  logger.info(
-    `EventProtocol - ${EventProtocolType.TRANSACTION_CREATION}: createdAt=${createdAt}, userId=${userId}`,
+    `EventProtocol - ${EventProtocolType.TRANSACTION_RECEIVE}: createdAt=${createdAt}, userId=${userId}`,
  )
-  writeEvent(
-    EventProtocolType.TRANSACTION_CREATION,
+  await writeEvent(
+    EventProtocolType.TRANSACTION_RECEIVE,
    createdAt,
    userId,
    null,
@ -202,20 +267,13 @@ eventProtocol.on(EventProtocolType.TRANSACTION_CREATION, (createdAt: Date, userI
  )
 })

-eventProtocol.on(EventProtocolType.TRANSACTION_RECEIVE, (createdAt: Date, userId: number) => {
-  logger.info(
-    `EventProtocol - ${EventProtocolType.TRANSACTION_RECEIVE}: createdAt=${createdAt}, userId=${userId}`,
-  )
-  writeEvent(EventProtocolType.TRANSACTION_RECEIVE, createdAt, userId, null, null, null, null, null)
-})
-
 eventProtocol.on(
  EventProtocolType.TRANSACTION_RECEIVE_REDEEM,
-  (createdAt: Date, userId: number) => {
+  async (createdAt: Date, userId: number) => {
    logger.info(
      `EventProtocol - ${EventProtocolType.TRANSACTION_RECEIVE_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.TRANSACTION_RECEIVE_REDEEM,
      createdAt,
      userId,
@ -230,11 +288,11 @@ eventProtocol.on(

 eventProtocol.on(
  EventProtocolType.CONTRIBUTION_CREATE,
-  (createdAt: Date, userId: number, contributionId: number) => {
+  async (createdAt: Date, userId: number, contributionId: number) => {
    logger.info(
      `EventProtocol - ${EventProtocolType.CONTRIBUTION_CREATE}: createdAt=${createdAt}, userId=${userId}, contributionId=${contributionId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.CONTRIBUTION_CREATE,
      createdAt,
      userId,
@ -249,7 +307,7 @@ eventProtocol.on(

 eventProtocol.on(
  EventProtocolType.CONTRIBUTION_CONFIRM,
-  (
+  async (
    createdAt: Date,
    userId: number,
    xUserId: number,
@ -259,7 +317,7 @@ eventProtocol.on(
    logger.info(
      `EventProtocol - ${EventProtocolType.CONTRIBUTION_CONFIRM}: createdAt=${createdAt}, userId=${userId}, xUserId=${xUserId}, xCommunityId=${xCommunityId}, contributionId=${contributionId}`,
    )
-    writeEvent(
+    await writeEvent(
      EventProtocolType.CONTRIBUTION_CONFIRM,
      createdAt,
      userId,
@ -272,30 +330,14 @@ eventProtocol.on(
  },
 )

-eventProtocol.on(EventProtocolType.CONTRIBUTION_LINK_DEFINE, (createdAt: Date, userId: number) => {
-  logger.info(
-    `EventProtocol - ${EventProtocolType.CONTRIBUTION_LINK_DEFINE}: createdAt=${createdAt}, userId=${userId}`,
-  )
-  writeEvent(
-    EventProtocolType.CONTRIBUTION_LINK_DEFINE,
-    createdAt,
-    userId,
-    null,
-    null,
-    null,
-    null,
-    null,
-  )
-})
-
 eventProtocol.on(
-  EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM,
-  (createdAt: Date, userId: number) => {
+  EventProtocolType.CONTRIBUTION_LINK_DEFINE,
+  async (createdAt: Date, userId: number) => {
    logger.info(
-      `EventProtocol - ${EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
+      `EventProtocol - ${EventProtocolType.CONTRIBUTION_LINK_DEFINE}: createdAt=${createdAt}, userId=${userId}`,
    )
-    writeEvent(
-      EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM,
+    await writeEvent(
+      EventProtocolType.CONTRIBUTION_LINK_DEFINE,
      createdAt,
      userId,
      null,
@ -307,50 +349,58 @@ eventProtocol.on(
  },
 )

-async function writeEvent(
-  type: string,
-  createdAt: Date,
-  userId: number,
-  xUserId: number | null,
-  xCommunityId: number | null,
-  transactionId: number | null,
-  contributionId: number | null,
-  amount: Decimal | null,
-) {
-  logger.info(
-    `writeEvent(type=${type}, createdAt=${createdAt}, userId=${userId}, xUserId=${xUserId}, xCommunityId=${xCommunityId}, contributionId=${contributionId}, transactionId=${transactionId}, amount=${amount})`,
-  )
-  const dbEvent = new EventProtocol()
-  dbEvent.type = type
-  dbEvent.createdAt = createdAt
-  dbEvent.userId = userId
-  // eslint-disable-next-line no-unused-expressions
-  xUserId ? (dbEvent.xUserId = xUserId) : null
-  // eslint-disable-next-line no-unused-expressions
-  xCommunityId ? (dbEvent.xCommunityId = xCommunityId) : null
-  // eslint-disable-next-line no-unused-expressions
-  contributionId ? (dbEvent.contributionId = contributionId) : null
-  // eslint-disable-next-line no-unused-expressions
-  transactionId ? (dbEvent.transactionId = transactionId) : null
-  // eslint-disable-next-line no-unused-expressions
-  amount ? (dbEvent.amount = amount) : null
-  // set event values here when having the result ...
-  // dbEvent.save()
+eventProtocol.on(
+  EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM,
+  async (createdAt: Date, userId: number) => {
+    logger.info(
+      `EventProtocol - ${EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM}: createdAt=${createdAt}, userId=${userId}`,
+    )
+    await writeEvent(
+      EventProtocolType.CONTRIBUTION_LINK_ACTIVATE_REDEEM,
+      createdAt,
+      userId,
+      null,
+      null,
+      null,
+      null,
+      null,
+    )
+  },
+)
+*/

-  const queryRunner = getConnection().createQueryRunner('master')
-  await queryRunner.connect()
-  await queryRunner.startTransaction('REPEATABLE READ')
-  try {
-    await queryRunner.manager.save(dbEvent).catch((error) => {
-      logger.error('Error while saving dbEvent', error)
-      throw new Error('error saving eventProtocol entry')
-    })
-    await queryRunner.commitTransaction()
-  } catch (e) {
-    logger.error(`error during write event with ${e}`)
-    await queryRunner.rollbackTransaction()
-    throw e
-  } finally {
-    await queryRunner.release()
-  }
+export interface EventInterface {
+  type: string
+  createdAt: Date
+  userId: number
+  xUserId?: number
+  xCommunityId?: number
+  transactionId?: number
+  contributionId?: number
+  amount?: Decimal
+}
+
+eventProtocol.on('writeEvents', async (events: EventInterface[]) => {
+  for (let i = 0; i < events.length; i++) {
+    await writeEvent(events[i])
+  }
+})
+
+eventProtocol.on('writeEvent', async (event: EventInterface) => {
+  await writeEvent(event)
+})
+
+const writeEvent = async (event: EventInterface): Promise<void> => {
+  // if (!eventProtocol.isEnabled()) return
+  logger.info(`writeEvent(${JSON.stringify(event)})`)
+  const dbEvent = new EventProtocol()
+  dbEvent.type = event.type
+  dbEvent.createdAt = event.createdAt
+  dbEvent.userId = event.userId
+  if (event.xUserId) dbEvent.xUserId = event.xUserId
+  if (event.xCommunityId) dbEvent.xCommunityId = event.xCommunityId
+  if (event.contributionId) dbEvent.contributionId = event.contributionId
+  if (event.transactionId) dbEvent.transactionId = event.transactionId
+  if (event.amount) dbEvent.amount = event.amount
+  await dbEvent.save()
 }
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@ -292,7 +292,11 @@ export class UserResolver {
      key: 'token',
      value: encode(dbUser.pubKey),
    })
-    eventProtocol.emit(EventProtocolType.LOGIN, new Date(Date.now()), user.id)
+    eventProtocol.emit('writeEvent', {
+      type: EventProtocolType.LOGIN,
+      createdAt: new Date(),
+      userId: user.id,
+    })
    logger.info('successful Login:' + user)
    return user
  }
@ -387,30 +391,26 @@ export class UserResolver {
        logger.info('redeemCode found contributionLink=' + contributionLink)
        if (contributionLink) {
          dbUser.contributionLinkId = contributionLink.id
-          if (eventProtocol.isEnabled()) {
-            eventProtocol.emit(
-              EventProtocolType.REDEEM_REGISTER,
-              new Date(Date.now()),
-              dbUser.id,
-              null,
-              contributionLink.id,
-            )
-          }
+          /* eventProtocol.emit(
+            EventProtocolType.REDEEM_REGISTER,
+            new Date(Date.now()),
+            dbUser.id,
+            null,
+            contributionLink.id,
+          ) */
        }
      } else {
        const transactionLink = await dbTransactionLink.findOne({ code: redeemCode })
        logger.info('redeemCode found transactionLink=' + transactionLink)
        if (transactionLink) {
          dbUser.referrerId = transactionLink.userId
-          if (eventProtocol.isEnabled()) {
-            eventProtocol.emit(
-              EventProtocolType.REDEEM_REGISTER,
-              new Date(Date.now()),
-              dbUser.id,
-              transactionLink.id,
-              null,
-            )
-          }
+          /* eventProtocol.emit(
+            EventProtocolType.REDEEM_REGISTER,
+            new Date(Date.now()),
+            dbUser.id,
+            transactionLink.id,
+            null,
+          ) */
        }
      }
    }
@ -466,9 +466,12 @@ export class UserResolver {
    }
    logger.info('createUser() successful...')

-    if (eventProtocol.isEnabled()) {
-      eventProtocol.emit(EventProtocolType.REGISTER, new Date(Date.now()), dbUser.id)
-    }
+    eventProtocol.emit('writeEvent', {
+      type: EventProtocolType.REGISTER,
+      createdAt: new Date(),
+      userId: dbUser.id,
+    })
+
    return new User(dbUser)
  }

--- a/backend/src/graphql/schema.ts
+++ b/backend/src/graphql/schema.ts
@ -1,7 +1,7 @@
 import { GraphQLSchema } from 'graphql'
 import { buildSchema } from 'type-graphql'
 import path from 'path'
-import { EventHandler } from '@/middleware/EventHandler'
+// import { EventHandler } from '@/middleware/EventHandler'

 import isAuthorized from './directive/isAuthorized'
 import DecimalScalar from './scalar/Decimal'
@ -12,7 +12,7 @@ const schema = async (): Promise<GraphQLSchema> => {
    resolvers: [path.join(__dirname, 'resolver', `!(*.test).{js,ts}`)],
    authChecker: isAuthorized,
    scalarsMap: [{ type: Decimal, scalar: DecimalScalar }],
-    globalMiddlewares: [EventHandler],
+    //    globalMiddlewares: [EventHandler],
  })
 }

--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@ -230,6 +230,8 @@ export const deleteContributionLink = gql`
    deleteContributionLink(id: $id)
  }
 `
+
+/*
 export const createEventProtocol = gql`
  mutation (
    $type: String!
@ -261,3 +263,4 @@ export const createEventProtocol = gql`
    }
  }
 `
+*/