Merge branch 'master' into 2594-contributions-list-frontend

backend/.env.dist

@@ -55,9 +55,6 @@ EMAIL_CODE_REQUEST_TIME=10
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=secret
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
 # SET LOG LEVEL AS NEEDED IN YOUR .ENV
 # POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal
 # LOG_LEVEL=info

backend/.env.template

@@ -54,9 +54,6 @@ EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
-
 # Federation
 FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
 FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED

backend/src/config/index.ts

@@ -17,7 +17,7 @@ const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v14.2022-12-22',
+    EXPECTED: 'v15.2023-02-07',
     CURRENT: '',
   },
 }
@@ -99,11 +99,6 @@ const webhook = {
   WEBHOOK_ELOPAGE_SECRET: process.env.WEBHOOK_ELOPAGE_SECRET || 'secret',
 }
 
-const eventProtocol = {
-  // global switch to enable writing of EventProtocol-Entries
-  EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-}
-
 // This is needed by graphql-directive-auth
 process.env.APP_SECRET = server.JWT_SECRET
 
@@ -139,7 +134,6 @@ const CONFIG = {
   ...email,
   ...loginServer,
   ...webhook,
-  ...eventProtocol,
   ...federation,
 }
 

backend/src/event/Event.ts

@@ -1,4 +1,3 @@
-import { EventProtocol } from '@entity/EventProtocol'
 import decimal from 'decimal.js-light'
 import { EventProtocolType } from './EventProtocolType'
 
@@ -87,21 +86,6 @@ export class EventDeleteContributionLink extends EventBasicCt {}
 export class EventUpdateContributionLink extends EventBasicCt {}
 
 export class Event {
-  constructor()
-  constructor(event?: EventProtocol) {
-    if (event) {
-      this.id = event.id
-      this.type = event.type
-      this.createdAt = event.createdAt
-      this.userId = event.userId
-      this.xUserId = event.xUserId
-      this.xCommunityId = event.xCommunityId
-      this.transactionId = event.transactionId
-      this.contributionId = event.contributionId
-      this.amount = event.amount
-    }
-  }
-
   public setEventBasic(): Event {
     this.type = EventProtocolType.BASIC
     this.createdAt = new Date()

backend/src/event/EventProtocolEmitter.ts

@@ -1,41 +1,17 @@
 import { Event } from '@/event/Event'
 import { backendLogger as logger } from '@/server/logger'
 import { EventProtocol } from '@entity/EventProtocol'
-import CONFIG from '@/config'
 
-class EventProtocolEmitter {
-  /* }extends EventEmitter { */
-  private events: Event[]
-
-  /*
-  public addEvent(event: Event) {
-    this.events.push(event)
-  }
-
-  public getEvents(): Event[] {
-    return this.events
-  }
-  */
-
-  public isDisabled() {
-    logger.info(`EventProtocol - isDisabled=${CONFIG.EVENT_PROTOCOL_DISABLED}`)
-    return CONFIG.EVENT_PROTOCOL_DISABLED === true
-  }
-
-  public async writeEvent(event: Event): Promise<void> {
-    if (!eventProtocol.isDisabled()) {
-      logger.info(`writeEvent(${JSON.stringify(event)})`)
+export const writeEvent = async (event: Event): Promise<EventProtocol | null> => {
+  logger.info('writeEvent', 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()
+  dbEvent.xUserId = event.xUserId || null
+  dbEvent.xCommunityId = event.xCommunityId || null
+  dbEvent.contributionId = event.contributionId || null
+  dbEvent.transactionId = event.transactionId || null
+  dbEvent.amount = event.amount || null
+  return dbEvent.save()
 }
-  }
-}
-export const eventProtocol = new EventProtocolEmitter()

backend/src/graphql/resolver/ContributionResolver.ts

@@ -46,7 +46,7 @@ import {
   EventAdminContributionDelete,
   EventAdminContributionUpdate,
 } from '@/event/Event'
-import { eventProtocol } from '@/event/EventProtocolEmitter'
+import { writeEvent } from '@/event/EventProtocolEmitter'
 import { calculateDecay } from '@/util/decay'
 import {
   sendContributionConfirmedEmail,
@@ -97,7 +97,7 @@ export class ContributionResolver {
     eventCreateContribution.userId = user.id
     eventCreateContribution.amount = amount
     eventCreateContribution.contributionId = contribution.id
-    await eventProtocol.writeEvent(event.setEventContributionCreate(eventCreateContribution))
+    await writeEvent(event.setEventContributionCreate(eventCreateContribution))
 
     return new UnconfirmedContribution(contribution, user, creations)
   }
@@ -133,7 +133,7 @@ export class ContributionResolver {
     eventDeleteContribution.userId = user.id
     eventDeleteContribution.contributionId = contribution.id
     eventDeleteContribution.amount = contribution.amount
-    await eventProtocol.writeEvent(event.setEventContributionDelete(eventDeleteContribution))
+    await writeEvent(event.setEventContributionDelete(eventDeleteContribution))
 
     const res = await contribution.softRemove()
     return !!res
@@ -291,7 +291,7 @@ export class ContributionResolver {
     eventUpdateContribution.userId = user.id
     eventUpdateContribution.contributionId = contributionId
     eventUpdateContribution.amount = amount
-    await eventProtocol.writeEvent(event.setEventContributionUpdate(eventUpdateContribution))
+    await writeEvent(event.setEventContributionUpdate(eventUpdateContribution))
 
     return new UnconfirmedContribution(contributionToUpdate, user, creations)
   }
@@ -358,9 +358,7 @@ export class ContributionResolver {
     eventAdminCreateContribution.userId = moderator.id
     eventAdminCreateContribution.amount = amount
     eventAdminCreateContribution.contributionId = contribution.id
-    await eventProtocol.writeEvent(
-      event.setEventAdminContributionCreate(eventAdminCreateContribution),
-    )
+    await writeEvent(event.setEventAdminContributionCreate(eventAdminCreateContribution))
 
     return getUserCreation(emailContact.userId, clientTimezoneOffset)
   }
@@ -470,9 +468,7 @@ export class ContributionResolver {
     eventAdminContributionUpdate.userId = user.id
     eventAdminContributionUpdate.amount = amount
     eventAdminContributionUpdate.contributionId = contributionToUpdate.id
-    await eventProtocol.writeEvent(
-      event.setEventAdminContributionUpdate(eventAdminContributionUpdate),
-    )
+    await writeEvent(event.setEventAdminContributionUpdate(eventAdminContributionUpdate))
 
     return result
   }
@@ -550,9 +546,7 @@ export class ContributionResolver {
     eventAdminContributionDelete.userId = contribution.userId
     eventAdminContributionDelete.amount = contribution.amount
     eventAdminContributionDelete.contributionId = contribution.id
-    await eventProtocol.writeEvent(
-      event.setEventAdminContributionDelete(eventAdminContributionDelete),
-    )
+    await writeEvent(event.setEventAdminContributionDelete(eventAdminContributionDelete))
     sendContributionDeniedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
@@ -680,7 +674,7 @@ export class ContributionResolver {
       eventContributionConfirm.userId = user.id
       eventContributionConfirm.amount = contribution.amount
       eventContributionConfirm.contributionId = contribution.id
-      await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
+      await writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
     } finally {
       releaseLock()
     }

backend/src/graphql/resolver/TransactionResolver.ts

@@ -30,7 +30,7 @@ import {
   sendTransactionReceivedEmail,
 } from '@/emails/sendEmailVariants'
 import { Event, EventTransactionReceive, EventTransactionSend } from '@/event/Event'
-import { eventProtocol } from '@/event/EventProtocolEmitter'
+import { writeEvent } from '@/event/EventProtocolEmitter'
 
 import { BalanceResolver } from './BalanceResolver'
 import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const'
@@ -144,16 +144,14 @@ export const executeTransaction = async (
       eventTransactionSend.xUserId = transactionSend.linkedUserId
       eventTransactionSend.transactionId = transactionSend.id
       eventTransactionSend.amount = transactionSend.amount.mul(-1)
-      await eventProtocol.writeEvent(new Event().setEventTransactionSend(eventTransactionSend))
+      await writeEvent(new Event().setEventTransactionSend(eventTransactionSend))
 
       const eventTransactionReceive = new EventTransactionReceive()
       eventTransactionReceive.userId = transactionReceive.userId
       eventTransactionReceive.xUserId = transactionReceive.linkedUserId
       eventTransactionReceive.transactionId = transactionReceive.id
       eventTransactionReceive.amount = transactionReceive.amount
-      await eventProtocol.writeEvent(
-        new Event().setEventTransactionReceive(eventTransactionReceive),
-      )
+      await writeEvent(new Event().setEventTransactionReceive(eventTransactionReceive))
     } catch (e) {
       await queryRunner.rollbackTransaction()
       logger.error(`Transaction was not successful: ${e}`)

backend/src/graphql/resolver/UserResolver.ts

@@ -48,7 +48,7 @@ import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddle
 import { klicktippSignIn } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
-import { eventProtocol } from '@/event/EventProtocolEmitter'
+import { writeEvent } from '@/event/EventProtocolEmitter'
 import {
   Event,
   EventLogin,
@@ -179,7 +179,7 @@ export class UserResolver {
     })
     const ev = new EventLogin()
     ev.userId = user.id
-    eventProtocol.writeEvent(new Event().setEventLogin(ev))
+    writeEvent(new Event().setEventLogin(ev))
     logger.info(`successful Login: ${JSON.stringify(user, null, 2)}`)
     return user
   }
@@ -251,9 +251,7 @@ export class UserResolver {
         })
         const eventSendAccountMultiRegistrationEmail = new EventSendAccountMultiRegistrationEmail()
         eventSendAccountMultiRegistrationEmail.userId = foundUser.id
-        eventProtocol.writeEvent(
-          event.setEventSendConfirmationEmail(eventSendAccountMultiRegistrationEmail),
-        )
+        writeEvent(event.setEventSendConfirmationEmail(eventSendAccountMultiRegistrationEmail))
         logger.info(
           `sendAccountMultiRegistrationEmail by ${firstName} ${lastName} to ${foundUser.firstName} ${foundUser.lastName} <${email}>`,
         )
@@ -336,7 +334,7 @@ export class UserResolver {
       })
       logger.info(`sendAccountActivationEmail of ${firstName}.${lastName} to ${email}`)
       eventSendConfirmEmail.userId = dbUser.id
-      eventProtocol.writeEvent(event.setEventSendConfirmationEmail(eventSendConfirmEmail))
+      writeEvent(event.setEventSendConfirmationEmail(eventSendConfirmEmail))
 
       if (!emailSent) {
         logger.debug(`Account confirmation link: ${activationLink}`)
@@ -354,10 +352,10 @@ export class UserResolver {
 
     if (redeemCode) {
       eventRedeemRegister.userId = dbUser.id
-      await eventProtocol.writeEvent(event.setEventRedeemRegister(eventRedeemRegister))
+      await writeEvent(event.setEventRedeemRegister(eventRedeemRegister))
     } else {
       eventRegister.userId = dbUser.id
-      await eventProtocol.writeEvent(event.setEventRegister(eventRegister))
+      await writeEvent(event.setEventRegister(eventRegister))
     }
 
     return new User(dbUser)
@@ -477,7 +475,7 @@ export class UserResolver {
 
       const eventActivateAccount = new EventActivateAccount()
       eventActivateAccount.userId = user.id
-      eventProtocol.writeEvent(event.setEventActivateAccount(eventActivateAccount))
+      writeEvent(event.setEventActivateAccount(eventActivateAccount))
     } catch (e) {
       await queryRunner.rollbackTransaction()
       throw new LogError('Error on writing User and User Contact data', e)
@@ -824,9 +822,7 @@ export class UserResolver {
       const event = new Event()
       const eventSendConfirmationEmail = new EventSendConfirmationEmail()
       eventSendConfirmationEmail.userId = user.id
-      await eventProtocol.writeEvent(
-        event.setEventSendConfirmationEmail(eventSendConfirmationEmail),
-      )
+      await writeEvent(event.setEventSendConfirmationEmail(eventSendConfirmationEmail))
     }
 
     return true

database/entity/0050-add_messageId_to_event_protocol/EventProtocol.ts

@@ -16,17 +16,17 @@ export class EventProtocol extends BaseEntity {
   @Column({ name: 'user_id', unsigned: true, nullable: false })
   userId: number
 
-  @Column({ name: 'x_user_id', unsigned: true, nullable: true })
-  xUserId: number
+  @Column({ name: 'x_user_id', type: 'int', unsigned: true, nullable: true })
+  xUserId: number | null
 
-  @Column({ name: 'x_community_id', unsigned: true, nullable: true })
-  xCommunityId: number
+  @Column({ name: 'x_community_id', type: 'int', unsigned: true, nullable: true })
+  xCommunityId: number | null
 
-  @Column({ name: 'transaction_id', unsigned: true, nullable: true })
-  transactionId: number
+  @Column({ name: 'transaction_id', type: 'int', unsigned: true, nullable: true })
+  transactionId: number | null
 
-  @Column({ name: 'contribution_id', unsigned: true, nullable: true })
-  contributionId: number
+  @Column({ name: 'contribution_id', type: 'int', unsigned: true, nullable: true })
+  contributionId: number | null
 
   @Column({
     type: 'decimal',
@@ -35,8 +35,8 @@ export class EventProtocol extends BaseEntity {
     nullable: true,
     transformer: DecimalTransformer,
   })
-  amount: Decimal
+  amount: Decimal | null
 
-  @Column({ name: 'message_id', unsigned: true, nullable: true })
-  messageId: number
+  @Column({ name: 'message_id', type: 'int', unsigned: true, nullable: true })
+  messageId: number | null
 }

deployment/bare_metal/.env.dist

@@ -27,7 +27,7 @@ COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community"
 COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # backend
-BACKEND_CONFIG_VERSION=v14.2022-12-22
+BACKEND_CONFIG_VERSION=v15.2023-02-07
 
 JWT_EXPIRES_IN=10m
 GDT_API_URL=https://gdt.gradido.net
@@ -56,9 +56,6 @@ EMAIL_CODE_REQUEST_TIME=10
 
 WEBHOOK_ELOPAGE_SECRET=secret
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
 # Federation
 # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
 # on an hash created from this topic

dht-node/.env.dist

@@ -8,9 +8,6 @@ DB_PASSWORD=
 DB_DATABASE=gradido_community
 TYPEORM_LOGGING_RELATIVE_PATH=typeorm.dht-node.log
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
 # SET LOG LEVEL AS NEEDED IN YOUR .ENV
 # POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal
 # LOG_LEVEL=info

dht-node/.env.template

@@ -8,9 +8,6 @@ DB_PASSWORD=$DB_PASSWORD
 DB_DATABASE=gradido_community
 TYPEORM_LOGGING_RELATIVE_PATH=$TYPEORM_LOGGING_RELATIVE_PATH
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
-
 # Federation
 FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
 FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED

dht-node/src/config/index.ts

@@ -9,7 +9,7 @@ const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v1.2023-01-01',
+    EXPECTED: 'v2.2023-02-07',
     CURRENT: '',
   },
 }
@@ -28,11 +28,6 @@ const database = {
     process.env.TYPEORM_LOGGING_RELATIVE_PATH || 'typeorm.dht-node.log',
 }
 
-const eventProtocol = {
-  // global switch to enable writing of EventProtocol-Entries
-  EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-}
-
 const federation = {
   FEDERATION_DHT_TOPIC: process.env.FEDERATION_DHT_TOPIC || 'GRADIDO_HUB',
   FEDERATION_DHT_SEED: process.env.FEDERATION_DHT_SEED || null,
@@ -55,7 +50,6 @@ const CONFIG = {
   ...constants,
   ...server,
   ...database,
-  ...eventProtocol,
   ...federation,
 }
 

federation/src/config/index.ts

@@ -52,10 +52,6 @@ const community = {
      process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
 }
 */
-// const eventProtocol = {
-// global switch to enable writing of EventProtocol-Entries
-// EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-// }
 
 // This is needed by graphql-directive-auth
 // process.env.APP_SECRET = server.JWT_SECRET