Merge branch 'master' into refactor-deny-contribution-unit-test

2025-12-13 07:45:54 +00:00 · 2023-02-10 07:17:03 +01:00 · 2023-02-10 07:17:03 +01:00 · 320f939f9b
commit 320f939f9b
parent 6ff43e2d4c 0fa61c67eb
34 changed files with 322 additions and 68 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,8 +4,42 @@ All notable changes to this project will be documented in this file. Dates are d

 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

+#### [1.18.0](https://github.com/gradido/gradido/compare/1.17.1...1.18.0)
+
+- refactor(frontend):  toast by automatically logged out [`#2681`](https://github.com/gradido/gradido/pull/2681)
+- refactor(frontend): change text for gdd_per_link.choose-amount [`#2638`](https://github.com/gradido/gradido/pull/2638)
+- fix(backend): emails for deny and delete contribution [`#2688`](https://github.com/gradido/gradido/pull/2688)
+- refactor(other): remove config version from `.env.dist` [`#2686`](https://github.com/gradido/gradido/pull/2686)
+- refactor(backend): use LogError on contributionMessageResolver [`#2663`](https://github.com/gradido/gradido/pull/2663)
+- refactor(backend): get last transaction by only one function [`#2668`](https://github.com/gradido/gradido/pull/2668)
+- refactor(other): don't rebuild modul if unit test file has been changed [`#2667`](https://github.com/gradido/gradido/pull/2667)
+- refactor(backend): use LogError on contributionLinkResolver [`#2662`](https://github.com/gradido/gradido/pull/2662)
+- refactor(backend): remove event protocol config switch [`#2670`](https://github.com/gradido/gradido/pull/2670)
+- refactor(backend): event protocol [`#2652`](https://github.com/gradido/gradido/pull/2652)
+- refactor(frontend): sidebar becomes smaller when critical phase [`#2649`](https://github.com/gradido/gradido/pull/2649)
+- refactor(backend): use LogError on sendEMailTranslated [`#2656`](https://github.com/gradido/gradido/pull/2656)
+- refactor(backend): log error class [`#2640`](https://github.com/gradido/gradido/pull/2640)
+- feat(backend): add filterState parameter to listAllContributions query [`#2619`](https://github.com/gradido/gradido/pull/2619)
+- refactor(frontend): there is no message when a month is fully created [`#2626`](https://github.com/gradido/gradido/pull/2626)
+- refactor(frontend): better text alignment on send via link [`#2637`](https://github.com/gradido/gradido/pull/2637)
+- refactor(frontend): text changed as indicated in the issues [`#2642`](https://github.com/gradido/gradido/pull/2642)
+- refactor(frontend): when you click on create, you will be directed to the form [`#2645`](https://github.com/gradido/gradido/pull/2645)
+- feat(backend): federation: separated dht-hub features in new dht-node modul [`#2510`](https://github.com/gradido/gradido/pull/2510)
+- refactor(backend): refine assembly of error message in user resolver [`#2636`](https://github.com/gradido/gradido/pull/2636)
+- fix(backend): unit tests creations for 31st day [`#2641`](https://github.com/gradido/gradido/pull/2641)
+- fix(workflow): properly lint pr - prevent requirement to restart linting [`#2635`](https://github.com/gradido/gradido/pull/2635)
+- feat(frontend): 'yes'-button shows which dialog is currently open with a different color  [`#2629`](https://github.com/gradido/gradido/pull/2629)
+- feat(backend): federation implement multiple apollo graphql endpoints [`#2459`](https://github.com/gradido/gradido/pull/2459)
+- refactor(frontend): add legend to all contribution tab, and add tests. [`#2625`](https://github.com/gradido/gradido/pull/2625)
+- feat(frontend): unit tests community page [`#2587`](https://github.com/gradido/gradido/pull/2587)
+- feat(backend): deny contributions [`#2461`](https://github.com/gradido/gradido/pull/2461)
+- refactor(admin): update yarn.lock file of admin. [`#2579`](https://github.com/gradido/gradido/pull/2579)
+
 #### [1.17.1](https://github.com/gradido/gradido/compare/1.17.0...1.17.1)

+> 20 January 2023
+
+- chore(release): v1.17.1 [`#2588`](https://github.com/gradido/gradido/pull/2588)
 - refactor(frontend): change contribution memo add word-break [`#2583`](https://github.com/gradido/gradido/pull/2583)
 - refactor(admin): add text-break on all table memo fields [`#2584`](https://github.com/gradido/gradido/pull/2584)
 - fix(frontend): throw proper frontend warning errors [`#2586`](https://github.com/gradido/gradido/pull/2586)
--- a/admin/.env.dist
+++ b/admin/.env.dist
@ -1,5 +1,3 @@
-CONFIG_VERSION=v1.2022-03-18
-
 GRAPHQL_URI=http://localhost:4000/graphql
 WALLET_AUTH_URL=http://localhost/authenticate?token={token}
 WALLET_URL=http://localhost/login
--- a/admin/package.json
+++ b/admin/package.json
@ -3,7 +3,7 @@
  "description": "Administraion Interface for Gradido",
  "main": "index.js",
  "author": "Moriz Wahl",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "license": "Apache-2.0",
  "private": false,
  "scripts": {
@ -86,5 +86,10 @@
    "> 1%",
    "last 2 versions",
    "not ie <= 10"
-  ]
+  ],
+  "nodemonConfig": {
+    "ignore": [
+      "**/*.spec.js"
+    ]
+  }
 }
--- a/backend/.env.dist
+++ b/backend/.env.dist
@ -1,5 +1,3 @@
-CONFIG_VERSION=v14.2022-12-22
-
 # Server
 PORT=4000
 JWT_SECRET=secret123
--- a/backend/package.json
+++ b/backend/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-backend",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/backend",
@ -72,5 +72,10 @@
    "ts-node": "^10.0.0",
    "tsconfig-paths": "^3.14.0",
    "typescript": "^4.3.4"
+  },
+  "nodemonConfig": {
+    "ignore": [
+      "**/*.test.ts"
+    ]
  }
 }
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@ -10,6 +10,7 @@ import {
  sendAccountMultiRegistrationEmail,
  sendContributionConfirmedEmail,
  sendContributionDeniedEmail,
+  sendContributionDeletedEmail,
  sendResetPasswordEmail,
  sendTransactionLinkRedeemedEmail,
  sendTransactionReceivedEmail,
@ -438,6 +439,84 @@ describe('sendEmailVariants', () => {
    })
  })

+  describe('sendContributionDeletedEmail', () => {
+    beforeAll(async () => {
+      result = await sendContributionDeletedEmail({
+        firstName: 'Peter',
+        lastName: 'Lustig',
+        email: 'peter@lustig.de',
+        language: 'en',
+        senderFirstName: 'Bibi',
+        senderLastName: 'Bloxberg',
+        contributionMemo: 'My contribution.',
+      })
+    })
+
+    describe('calls "sendEmailTranslated"', () => {
+      it('with expected parameters', () => {
+        expect(sendEmailTranslated).toBeCalledWith({
+          receiver: {
+            to: 'Peter Lustig <peter@lustig.de>',
+          },
+          template: 'contributionDeleted',
+          locals: {
+            firstName: 'Peter',
+            lastName: 'Lustig',
+            locale: 'en',
+            senderFirstName: 'Bibi',
+            senderLastName: 'Bloxberg',
+            contributionMemo: 'My contribution.',
+            overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+            supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+            communityURL: CONFIG.COMMUNITY_URL,
+          },
+        })
+      })
+
+      it('has expected result', () => {
+        expect(result).toMatchObject({
+          envelope: {
+            from: 'info@gradido.net',
+            to: ['peter@lustig.de'],
+          },
+          message: expect.any(String),
+          originalMessage: expect.objectContaining({
+            to: 'Peter Lustig <peter@lustig.de>',
+            from: 'Gradido (do not answer) <info@gradido.net>',
+            attachments: [],
+            subject: 'Gradido: Your common good contribution was deleted',
+            html: expect.any(String),
+            text: expect.stringContaining('GRADIDO: YOUR COMMON GOOD CONTRIBUTION WAS DELETED'),
+          }),
+        })
+        expect(result.originalMessage.html).toContain('<!DOCTYPE html>')
+        expect(result.originalMessage.html).toContain('<html lang="en">')
+        expect(result.originalMessage.html).toContain(
+          '<title>Gradido: Your common good contribution was deleted</title>',
+        )
+        expect(result.originalMessage.html).toContain(
+          '>Gradido: Your common good contribution was deleted</h1>',
+        )
+        expect(result.originalMessage.html).toContain('Hello Peter Lustig')
+        expect(result.originalMessage.html).toContain(
+          'Your public good contribution “My contribution.” was deleted by Bibi Bloxberg.',
+        )
+        expect(result.originalMessage.html).toContain(
+          'To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!',
+        )
+        expect(result.originalMessage.html).toContain(
+          `Link to your account: <a href="${CONFIG.EMAIL_LINK_OVERVIEW}">${CONFIG.EMAIL_LINK_OVERVIEW}</a>`,
+        )
+        expect(result.originalMessage.html).toContain('Please do not reply to this email!')
+        expect(result.originalMessage.html).toContain('Kind regards,<br>your Gradido team')
+        expect(result.originalMessage.html).toContain('—————')
+        expect(result.originalMessage.html).toContain(
+          '<div style="position: relative; left: -22px;"><img src="https://gdd.gradido.net/img/brand/green.png" width="200" alt="Gradido-Akademie Logo"></div><br>Gradido-Akademie<br>Institut für Wirtschaftsbionik<br>Pfarrweg 2<br>74653 Künzelsau<br>Deutschland<br><a href="mailto:support@supportmail.com">support@supportmail.com</a><br><a href="http://localhost/">http://localhost/</a>',
+        )
+      })
+    })
+  })
+
  describe('sendResetPasswordEmail', () => {
    beforeAll(async () => {
      result = await sendResetPasswordEmail({
--- a/backend/src/emails/sendEmailVariants.ts
+++ b/backend/src/emails/sendEmailVariants.ts
@ -103,6 +103,32 @@ export const sendContributionConfirmedEmail = (data: {
  })
 }

+export const sendContributionDeletedEmail = (data: {
+  firstName: string
+  lastName: string
+  email: string
+  language: string
+  senderFirstName: string
+  senderLastName: string
+  contributionMemo: string
+}): Promise<Record<string, unknown> | null> => {
+  return sendEmailTranslated({
+    receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` },
+    template: 'contributionDeleted',
+    locals: {
+      firstName: data.firstName,
+      lastName: data.lastName,
+      locale: data.language,
+      senderFirstName: data.senderFirstName,
+      senderLastName: data.senderLastName,
+      contributionMemo: data.contributionMemo,
+      overviewURL: CONFIG.EMAIL_LINK_OVERVIEW,
+      supportEmail: CONFIG.COMMUNITY_SUPPORT_MAIL,
+      communityURL: CONFIG.COMMUNITY_URL,
+    },
+  })
+}
+
 export const sendContributionDeniedEmail = (data: {
  firstName: string
  lastName: string
--- a/backend/src/emails/templates/contributionDeleted/html.pug
+++ b/backend/src/emails/templates/contributionDeleted/html.pug
@ -0,0 +1,16 @@
+doctype html
+html(lang=locale)
+  head
+    title= t('emails.contributionDeleted.subject')
+  body
+    h1(style='margin-bottom: 24px;')= t('emails.contributionDeleted.subject')
+    #container.col
+      include ../hello.pug
+      p= t('emails.contributionDeleted.commonGoodContributionDeleted', { senderFirstName, senderLastName, contributionMemo })
+      p= t('emails.contributionDeleted.toSeeContributionsAndMessages')
+      p
+        = t('emails.general.linkToYourAccount')
+        = " "
+        a(href=overviewURL) #{overviewURL}
+      p= t('emails.general.pleaseDoNotReply')
+      include ../greatingFormularImprint.pug
--- a/backend/src/emails/templates/contributionDeleted/subject.pug
+++ b/backend/src/emails/templates/contributionDeleted/subject.pug
@ -0,0 +1 @@
+= t('emails.contributionDeleted.subject')
--- a/backend/src/event/Event.ts
+++ b/backend/src/event/Event.ts
@ -67,6 +67,7 @@ export class EventTransactionReceiveRedeem extends EventBasicTxX {}
 export class EventContributionCreate extends EventBasicCt {}
 export class EventAdminContributionCreate extends EventBasicCt {}
 export class EventAdminContributionDelete extends EventBasicCt {}
+export class EventAdminContributionDeny extends EventBasicCt {}
 export class EventAdminContributionUpdate extends EventBasicCt {}
 export class EventUserCreateContributionMessage extends EventBasicCtMsg {}
 export class EventAdminCreateContributionMessage extends EventBasicCtMsg {}
@ -298,6 +299,13 @@ export class Event {
    return this
  }

+  public setEventAdminContributionDeny(ev: EventAdminContributionDeny): Event {
+    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
+    this.type = EventProtocolType.ADMIN_CONTRIBUTION_DENY
+
+    return this
+  }
+
  public setEventAdminContributionUpdate(ev: EventAdminContributionUpdate): Event {
    this.setByBasicCt(ev.userId, ev.contributionId, ev.amount)
    this.type = EventProtocolType.ADMIN_CONTRIBUTION_UPDATE
--- a/backend/src/event/EventProtocolType.ts
+++ b/backend/src/event/EventProtocolType.ts
@ -35,6 +35,7 @@ export enum EventProtocolType {
  CONTRIBUTION_UPDATE = 'CONTRIBUTION_UPDATE',
  ADMIN_CONTRIBUTION_CREATE = 'ADMIN_CONTRIBUTION_CREATE',
  ADMIN_CONTRIBUTION_DELETE = 'ADMIN_CONTRIBUTION_DELETE',
+  ADMIN_CONTRIBUTION_DENY = 'ADMIN_CONTRIBUTION_DENY',
  ADMIN_CONTRIBUTION_UPDATE = 'ADMIN_CONTRIBUTION_UPDATE',
  USER_CREATE_CONTRIBUTION_MESSAGE = 'USER_CREATE_CONTRIBUTION_MESSAGE',
  ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@ -15,6 +15,8 @@ import { calculateDecay } from '@/util/decay'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { GdtResolver } from './GdtResolver'

+import { getLastTransaction } from './util/getLastTransaction'
+
@Resolver()
 export class BalanceResolver {
  @Authorized([RIGHTS.BALANCE])
@ -32,7 +34,7 @@ export class BalanceResolver {

    const lastTransaction = context.lastTransaction
      ? context.lastTransaction
-      : await dbTransaction.findOne({ userId: user.id }, { order: { id: 'DESC' } })
+      : await getLastTransaction(user.id)

    logger.debug(`lastTransaction=${lastTransaction}`)

--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@ -88,6 +88,7 @@ describe('ContributionMessageResolver', () => {

      describe('input not valid', () => {
        it('throws error when contribution does not exist', async () => {
+          jest.clearAllMocks()
          await expect(
            mutate({
              mutation: adminCreateContributionMessage,
@ -100,14 +101,22 @@ describe('ContributionMessageResolver', () => {
            expect.objectContaining({
              errors: [
                new GraphQLError(
-                  'ContributionMessage was not successful: Error: Contribution not found',
+                  'ContributionMessage was not sent successfully: Error: Contribution not found',
                ),
              ],
            }),
          )
        })

+        it('logs the error thrown', () => {
+          expect(logger.error).toBeCalledWith(
+            'ContributionMessage was not sent successfully: Error: Contribution not found',
+            new Error('Contribution not found'),
+          )
+        })
+
        it('throws error when contribution.userId equals user.id', async () => {
+          jest.clearAllMocks()
          await mutate({
            mutation: login,
            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
@ -132,12 +141,19 @@ describe('ContributionMessageResolver', () => {
            expect.objectContaining({
              errors: [
                new GraphQLError(
-                  'ContributionMessage was not successful: Error: Admin can not answer on own contribution',
+                  'ContributionMessage was not sent successfully: Error: Admin can not answer on his own contribution',
                ),
              ],
            }),
          )
        })
+
+        it('logs the error thrown', () => {
+          expect(logger.error).toBeCalledWith(
+            'ContributionMessage was not sent successfully: Error: Admin can not answer on his own contribution',
+            new Error('Admin can not answer on his own contribution'),
+          )
+        })
      })

      describe('valid input', () => {
@ -210,6 +226,7 @@ describe('ContributionMessageResolver', () => {

      describe('input not valid', () => {
        it('throws error when contribution does not exist', async () => {
+          jest.clearAllMocks()
          await expect(
            mutate({
              mutation: createContributionMessage,
@ -222,14 +239,22 @@ describe('ContributionMessageResolver', () => {
            expect.objectContaining({
              errors: [
                new GraphQLError(
-                  'ContributionMessage was not successful: Error: Contribution not found',
+                  'ContributionMessage was not sent successfully: Error: Contribution not found',
                ),
              ],
            }),
          )
        })

+        it('logs the error thrown', () => {
+          expect(logger.error).toBeCalledWith(
+            'ContributionMessage was not sent successfully: Error: Contribution not found',
+            new Error('Contribution not found'),
+          )
+        })
+
        it('throws error when other user tries to send createContributionMessage', async () => {
+          jest.clearAllMocks()
          await mutate({
            mutation: login,
            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
@ -246,12 +271,19 @@ describe('ContributionMessageResolver', () => {
            expect.objectContaining({
              errors: [
                new GraphQLError(
-                  'ContributionMessage was not successful: Error: Can not send message to contribution of another user',
+                  'ContributionMessage was not sent successfully: Error: Can not send message to contribution of another user',
                ),
              ],
            }),
          )
        })
+
+        it('logs the error thrown', () => {
+          expect(logger.error).toBeCalledWith(
+            'ContributionMessage was not sent successfully: Error: Can not send message to contribution of another user',
+            new Error('Can not send message to contribution of another user'),
+          )
+        })
      })

      describe('valid input', () => {
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@ -12,10 +12,10 @@ import { ContributionStatus } from '@enum/ContributionStatus'
 import { Order } from '@enum/Order'
 import Paginated from '@arg/Paginated'

-import { backendLogger as logger } from '@/server/logger'
 import { RIGHTS } from '@/auth/RIGHTS'
 import { Context, getUser } from '@/server/context'
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
+import LogError from '@/server/LogError'

@Resolver()
 export class ContributionMessageResolver {
@ -54,8 +54,7 @@ export class ContributionMessageResolver {
      await queryRunner.commitTransaction()
    } catch (e) {
      await queryRunner.rollbackTransaction()
-      logger.error(`ContributionMessage was not successful: ${e}`)
-      throw new Error(`ContributionMessage was not successful: ${e}`)
+      throw new LogError(`ContributionMessage was not sent successfully: ${e}`, e)
    } finally {
      await queryRunner.release()
    }
@ -95,9 +94,7 @@ export class ContributionMessageResolver {
    @Ctx() context: Context,
  ): Promise<ContributionMessage> {
    const user = getUser(context)
-    if (!user.emailContact) {
-      user.emailContact = await UserContact.findOneOrFail({ where: { id: user.emailId } })
-    }
+
    const queryRunner = getConnection().createQueryRunner()
    await queryRunner.connect()
    await queryRunner.startTransaction('REPEATABLE READ')
@ -108,12 +105,10 @@ export class ContributionMessageResolver {
        relations: ['user'],
      })
      if (!contribution) {
-        logger.error('Contribution not found')
-        throw new Error('Contribution not found')
+        throw new LogError('Contribution not found', contributionId)
      }
      if (contribution.userId === user.id) {
-        logger.error('Admin can not answer on own contribution')
-        throw new Error('Admin can not answer on own contribution')
+        throw new LogError('Admin can not answer on his own contribution', contributionId)
      }
      if (!contribution.user.emailContact) {
        contribution.user.emailContact = await UserContact.findOneOrFail({
@ -149,8 +144,7 @@ export class ContributionMessageResolver {
      await queryRunner.commitTransaction()
    } catch (e) {
      await queryRunner.rollbackTransaction()
-      logger.error(`ContributionMessage was not successful: ${e}`)
-      throw new Error(`ContributionMessage was not successful: ${e}`)
+      throw new LogError(`ContributionMessage was not sent successfully: ${e}`, e)
    } finally {
      await queryRunner.release()
    }
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@ -25,11 +25,7 @@ import {
  listContributions,
  listUnconfirmedContributions,
 } from '@/seeds/graphql/queries'
-import {
-  // sendAccountActivationEmail,
-  sendContributionConfirmedEmail,
-  // sendContributionRejectedEmail,
-} from '@/emails/sendEmailVariants'
+import { sendContributionConfirmedEmail } from '@/emails/sendEmailVariants'
 import {
  cleanDB,
  resetToken,
@ -53,7 +49,6 @@ import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz'
 import { UnconfirmedContribution } from '../model/UnconfirmedContribution'
 import { ContributionListResult } from '../model/Contribution'

-// mock account activation email to avoid console spam
 // mock account activation email to avoid console spam
 jest.mock('@/emails/sendEmailVariants', () => {
  const originalModule = jest.requireActual('@/emails/sendEmailVariants')
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@ -44,16 +44,20 @@ import {
  EventContributionConfirm,
  EventAdminContributionCreate,
  EventAdminContributionDelete,
+  EventAdminContributionDeny,
  EventAdminContributionUpdate,
 } from '@/event/Event'
 import { writeEvent } from '@/event/EventProtocolEmitter'
 import { calculateDecay } from '@/util/decay'
 import {
  sendContributionConfirmedEmail,
+  sendContributionDeletedEmail,
  sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'

+import { getLastTransaction } from './util/getLastTransaction'
+
@Resolver()
 export class ContributionResolver {
  @Authorized([RIGHTS.CREATE_CONTRIBUTION])
@ -546,7 +550,7 @@ export class ContributionResolver {
    eventAdminContributionDelete.amount = contribution.amount
    eventAdminContributionDelete.contributionId = contribution.id
    await writeEvent(event.setEventAdminContributionDelete(eventAdminContributionDelete))
-    sendContributionDeniedEmail({
+    sendContributionDeletedEmail({
      firstName: user.firstName,
      lastName: user.lastName,
      email: user.emailContact.email,
@ -607,16 +611,11 @@ export class ContributionResolver {
      const queryRunner = getConnection().createQueryRunner()
      await queryRunner.connect()
      await queryRunner.startTransaction('REPEATABLE READ') // 'READ COMMITTED')
-      try {
-        const lastTransaction = await queryRunner.manager
-          .createQueryBuilder()
-          .select('transaction')
-          .from(DbTransaction, 'transaction')
-          .where('transaction.userId = :id', { id: contribution.userId })
-          .orderBy('transaction.id', 'DESC')
-          .getOne()
-        logger.info('lastTransaction ID', lastTransaction ? lastTransaction.id : 'undefined')

+      const lastTransaction = await getLastTransaction(contribution.userId)
+      logger.info('lastTransaction ID', lastTransaction ? lastTransaction.id : 'undefined')
+
+      try {
        let newBalance = new Decimal(0)
        let decay: Decay | null = null
        if (lastTransaction) {
@ -767,6 +766,13 @@ export class ContributionResolver {
    contributionToUpdate.deniedAt = new Date()
    const res = await contributionToUpdate.save()

+    const event = new Event()
+    const eventAdminContributionDeny = new EventAdminContributionDeny()
+    eventAdminContributionDeny.userId = contributionToUpdate.userId
+    eventAdminContributionDeny.amount = contributionToUpdate.amount
+    eventAdminContributionDeny.contributionId = contributionToUpdate.id
+    await writeEvent(event.setEventAdminContributionDeny(eventAdminContributionDeny))
+
    sendContributionDeniedEmail({
      firstName: user.firstName,
      lastName: user.lastName,
--- a/backend/src/graphql/resolver/TransactionLinkResolver.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts
@ -33,6 +33,8 @@ import { executeTransaction } from './TransactionResolver'
 import QueryLinkResult from '@union/QueryLinkResult'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'

+import { getLastTransaction } from './util/getLastTransaction'
+
 // TODO: do not export, test it inside the resolver
 export const transactionLinkCode = (date: Date): string => {
  const time = date.getTime().toString(16)
@ -275,13 +277,7 @@ export class TransactionLinkResolver {

          await queryRunner.manager.insert(DbContribution, contribution)

-          const lastTransaction = await queryRunner.manager
-            .createQueryBuilder()
-            .select('transaction')
-            .from(DbTransaction, 'transaction')
-            .where('transaction.userId = :id', { id: user.id })
-            .orderBy('transaction.id', 'DESC')
-            .getOne()
+          const lastTransaction = await getLastTransaction(user.id)
          let newBalance = new Decimal(0)

          let decay: Decay | null = null
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@ -38,6 +38,8 @@ import { findUserByEmail } from './UserResolver'

 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'

+import { getLastTransaction } from './util/getLastTransaction'
+
 export const executeTransaction = async (
  amount: Decimal,
  memo: string,
@ -206,10 +208,7 @@ export class TransactionResolver {
    logger.info(`transactionList(user=${user.firstName}.${user.lastName}, ${user.emailId})`)

    // find current balance
-    const lastTransaction = await dbTransaction.findOne(
-      { userId: user.id },
-      { order: { id: 'DESC' }, relations: ['contribution'] },
-    )
+    const lastTransaction = await getLastTransaction(user.id, ['contribution'])
    logger.debug(`lastTransaction=${lastTransaction}`)

    const balanceResolver = new BalanceResolver()
--- a/backend/src/graphql/resolver/util/getLastTransaction.ts
+++ b/backend/src/graphql/resolver/util/getLastTransaction.ts
@ -0,0 +1,14 @@
+import { Transaction as DbTransaction } from '@entity/Transaction'
+
+export const getLastTransaction = async (
+  userId: number,
+  relations?: string[],
+): Promise<DbTransaction | undefined> => {
+  return DbTransaction.findOne(
+    { userId },
+    {
+      order: { balanceDate: 'DESC', id: 'DESC' },
+      relations,
+    },
+  )
+}
--- a/backend/src/locales/de.json
+++ b/backend/src/locales/de.json
@ -23,8 +23,13 @@
      "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt und in deinem Gradido-Konto gutgeschrieben.",
      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde bestätigt"
    },
-    "contributionRejected": {
-      "commonGoodContributionRejected": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
+    "contributionDeleted": {
+      "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.",
+      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde gelöscht",
+      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
+    },
+    "contributionDenied": {
+      "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
      "subject": "Gradido: Dein Gemeinwohl-Beitrag wurde abgelehnt",
      "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Gemeinschaft“ auf den Tab „Meine Beiträge zum Gemeinwohl“!"
    },
--- a/backend/src/locales/en.json
+++ b/backend/src/locales/en.json
@ -23,6 +23,11 @@
      "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
      "subject": "Gradido: Your contribution to the common good was confirmed"
    },
+    "contributionDeleted": {
+      "commonGoodContributionDeleted": "Your public good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.",
+      "subject": "Gradido: Your common good contribution was deleted",
+      "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
+    },
    "contributionDenied": {
      "commonGoodContributionDenied": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
      "subject": "Gradido: Your common good contribution was rejected",
--- a/backend/src/util/validate.ts
+++ b/backend/src/util/validate.ts
@ -1,10 +1,10 @@
 import { calculateDecay } from './decay'
 import Decimal from 'decimal.js-light'
-import { Transaction } from '@entity/Transaction'
 import { Decay } from '@model/Decay'
 import { getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { getLastTransaction } from '../graphql/resolver/util/getLastTransaction'

 function isStringBoolean(value: string): boolean {
  const lowerValue = value.toLowerCase()
@ -20,7 +20,7 @@ async function calculateBalance(
  time: Date,
  transactionLink?: dbTransactionLink | null,
 ): Promise<{ balance: Decimal; decay: Decay; lastTransactionId: number } | null> {
-  const lastTransaction = await Transaction.findOne({ userId }, { order: { id: 'DESC' } })
+  const lastTransaction = await getLastTransaction(userId)
  if (!lastTransaction) return null

  const decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, time)
--- a/database/.env.dist
+++ b/database/.env.dist
@ -1,5 +1,3 @@
-CONFIG_VERSION=v1.2022-03-18
-
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=root
--- a/database/package.json
+++ b/database/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido-database",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido Database Tool to execute database migrations",
  "main": "src/index.ts",
  "repository": "https://github.com/gradido/gradido/database",
--- a/dht-node/.env.dist
+++ b/dht-node/.env.dist
@ -1,5 +1,3 @@
-CONFIG_VERSION=v1.2023-01-01
-
 # Database
 DB_HOST=localhost
 DB_PORT=3306
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@ -1,5 +1,3 @@
-CONFIG_VERSION=v4.2022-12-20
-
 # Environment
 DEFAULT_PUBLISHER_ID=2896

--- a/frontend/package.json
+++ b/frontend/package.json
@ -1,6 +1,6 @@
 {
  "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "private": true,
  "scripts": {
    "start": "node run/server.js",
@ -104,5 +104,10 @@
  ],
  "author": "Gradido-Akademie - https://www.gradido.net/",
  "license": "Apache-2.0",
-  "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur."
+  "description": "Gradido, the Natural Economy of Life, is a way to worldwide prosperity and peace in harmony with nature. - Gradido, die Natürliche Ökonomie des lebens, ist ein Weg zu weltweitem Wohlstand und Frieden in Harmonie mit der Natur.",
+  "nodemonConfig": {
+    "ignore": [
+      "**/*.spec.js"
+    ]
+  }
 }
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@ -116,5 +116,15 @@ describe('ContributionList', () => {
        expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 2 }]])
      })
    })
+
+    describe('update status', () => {
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
+      })
+
+      it('emits update status', () => {
+        expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
+      })
+    })
  })
 })
--- a/frontend/src/components/SessionLogoutTimeout.vue
+++ b/frontend/src/components/SessionLogoutTimeout.vue
@ -67,6 +67,7 @@ export default {
      }
      if (this.tokenExpiresInSeconds === 0) {
        this.$timer.stop('tokenExpires')
+        this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
        this.$emit('logout')
      }
    },
@ -84,6 +85,7 @@ export default {
        })
        .catch(() => {
          this.$timer.stop('tokenExpires')
+          this.toastInfoNoHide(this.$t('session.automaticallyLoggedOut'))
          this.$emit('logout')
        })
    },
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@ -173,7 +173,7 @@
  "GDD": "GDD",
  "gddKonto": "GDD Konto",
  "gdd_per_link": {
-    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+    "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest, und trage eine Nachricht ein. Die Nachricht ist ein Pflichtfeld.",
    "copy-link": "Link kopieren",
    "copy-link-with-text": "Link und Text kopieren",
    "created": "Der Link wurde erstellt!",
@ -272,6 +272,7 @@
  "send_gdd": "GDD versenden",
  "send_per_link": "GDD versenden per Link",
  "session": {
+    "automaticallyLoggedOut": "Du wurdest automatisch abgemeldet",
    "extend": "Angemeldet bleiben",
    "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
    "logoutIn": "Abmelden in ",
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@ -173,7 +173,7 @@
  "GDD": "GDD",
  "gddKonto": "GDD Konto",
  "gdd_per_link": {
-    "choose-amount": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
+    "choose-amount": "Select an amount you want to send via link and enter a message. The message is mandatory.",
    "copy-link": "Copy link",
    "copy-link-with-text": "Copy link and text",
    "created": "Link was created!",
@ -272,6 +272,7 @@
  "send_gdd": "Send GDD",
  "send_per_link": "Send GDD via Link",
  "session": {
+    "automaticallyLoggedOut": "You have been automatically logged out.",
    "extend": "Stay logged in",
    "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
    "logoutIn": "Log out in ",
--- a/frontend/src/mixins/toaster.js
+++ b/frontend/src/mixins/toaster.js
@ -18,11 +18,18 @@ export const toasters = {
        variant: 'warning',
      })
    },
+    toastInfoNoHide(message) {
+      this.toast(message, {
+        title: this.$t('navigation.info'),
+        variant: 'warning',
+        noAutoHide: true,
+      })
+    },
    toast(message, options) {
      if (message.replace) message = message.replace(/^GraphQL error: /, '')
      this.$root.$bvToast.toast(message, {
-        autoHideDelay: 5000,
        appendToast: true,
+        autoHideDelay: 5000,
        solid: true,
        toaster: 'b-toaster-top-right',
        headerClass: 'gdd-toaster-title',
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@ -70,6 +70,8 @@ describe('Community', () => {
                lastName: 'Bloxberg',
                state: 'IN_PROGRESS',
                messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
              },
              {
                id: 1550,
@ -84,6 +86,8 @@ describe('Community', () => {
                lastName: 'Bloxberg',
                state: 'CONFIRMED',
                messagesCount: 0,
+                deniedAt: null,
+                deniedBy: null,
              },
            ],
            contributionCount: 1,
@ -112,6 +116,10 @@ describe('Community', () => {
                confirmedAt: null,
                firstName: 'Bibi',
                lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
              {
                id: 1550,
@ -124,7 +132,10 @@ describe('Community', () => {
                firstName: 'Bibi',
                contributionDate: '2022-06-15T08:47:06.000Z',
                lastName: 'Bloxberg',
+                deniedAt: null,
+                deniedBy: null,
                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
              {
                id: 1556,
@ -137,6 +148,10 @@ describe('Community', () => {
                confirmedAt: null,
                firstName: 'Bob',
                lastName: 'der Baumeister',
+                deniedAt: null,
+                deniedBy: null,
+                messagesCount: 0,
+                state: 'IN_PROGRESS',
              },
            ],
            contributionCount: 3,
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gradido",
-  "version": "1.17.1",
+  "version": "1.18.0",
  "description": "Gradido",
  "main": "index.js",
  "repository": "git@github.com:gradido/gradido.git",