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

CHANGELOG.md

@@ -4,8 +4,50 @@ 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.1](https://github.com/gradido/gradido/compare/1.18.0...1.18.1)
+
+- fix(frontend): fix is last month for empty form date [`#2697`](https://github.com/gradido/gradido/pull/2697)
+- fix(frontend): community link [`#2696`](https://github.com/gradido/gradido/pull/2696)
+
+#### [1.18.0](https://github.com/gradido/gradido/compare/1.17.1...1.18.0)
+
+> 9 February 2023
+
+- feat(release): version 1.18.0 [`#2690`](https://github.com/gradido/gradido/pull/2690)
+- 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)

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

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.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
@@ -86,5 +86,10 @@
     "> 1%",
     "last 2 versions",
     "not ie <= 10"
+  ],
+  "nodemonConfig": {
+    "ignore": [
+      "**/*.spec.js"
     ]
   }
+}

backend/.env.dist

@@ -1,5 +1,3 @@
-CONFIG_VERSION=v14.2022-12-22
-
 # Server
 PORT=4000
 JWT_SECRET=secret123

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "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"
+    ]
   }
 }

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({

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

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

backend/src/emails/templates/contributionDeleted/subject.pug

@@ -0,0 +1 @@
+= t('emails.contributionDeleted.subject')

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

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',

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}`)
 

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

@@ -246,6 +246,7 @@ describe('Contribution Links', () => {
         })
 
         it('returns an error if missing startDate', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -270,6 +271,7 @@ describe('Contribution Links', () => {
         })
 
         it('returns an error if missing endDate', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -292,6 +294,7 @@ describe('Contribution Links', () => {
         })
 
         it('returns an error if endDate is before startDate', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -316,27 +319,8 @@ describe('Contribution Links', () => {
           )
         })
 
-        it('returns an error if name is an empty string', async () => {
-          await expect(
-            mutate({
-              mutation: createContributionLink,
-              variables: {
-                ...variables,
-                name: '',
-              },
-            }),
-          ).resolves.toEqual(
-            expect.objectContaining({
-              errors: [new GraphQLError('The name must be initialized!')],
-            }),
-          )
-        })
-
-        it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith('The name must be initialized!')
-        })
-
         it('returns an error if name is shorter than 5 characters', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -347,22 +331,17 @@ describe('Contribution Links', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [
+              errors: [new GraphQLError('The value of name is too short')],
-                new GraphQLError(
-                  `The value of 'name' with a length of 3 did not fulfill the requested bounderies min=5 and max=100`,
-                ),
-              ],
             }),
           )
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith(
+          expect(logger.error).toBeCalledWith('The value of name is too short', 3)
-            `The value of 'name' with a length of 3 did not fulfill the requested bounderies min=5 and max=100`,
-          )
         })
 
         it('returns an error if name is longer than 100 characters', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -373,42 +352,17 @@ describe('Contribution Links', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [
+              errors: [new GraphQLError('The value of name is too long')],
-                new GraphQLError(
-                  `The value of 'name' with a length of 101 did not fulfill the requested bounderies min=5 and max=100`,
-                ),
-              ],
             }),
           )
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith(
+          expect(logger.error).toBeCalledWith('The value of name is too long', 101)
-            `The value of 'name' with a length of 101 did not fulfill the requested bounderies min=5 and max=100`,
-          )
-        })
-
-        it('returns an error if memo is an empty string', async () => {
-          await expect(
-            mutate({
-              mutation: createContributionLink,
-              variables: {
-                ...variables,
-                memo: '',
-              },
-            }),
-          ).resolves.toEqual(
-            expect.objectContaining({
-              errors: [new GraphQLError('The memo must be initialized!')],
-            }),
-          )
-        })
-
-        it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith('The memo must be initialized!')
         })
 
         it('returns an error if memo is shorter than 5 characters', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -419,22 +373,17 @@ describe('Contribution Links', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [
+              errors: [new GraphQLError('The value of memo is too short')],
-                new GraphQLError(
-                  `The value of 'memo' with a length of 3 did not fulfill the requested bounderies min=5 and max=255`,
-                ),
-              ],
             }),
           )
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith(
+          expect(logger.error).toBeCalledWith('The value of memo is too short', 3)
-            `The value of 'memo' with a length of 3 did not fulfill the requested bounderies min=5 and max=255`,
-          )
         })
 
         it('returns an error if memo is longer than 255 characters', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -445,22 +394,17 @@ describe('Contribution Links', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [
+              errors: [new GraphQLError('The value of memo is too long')],
-                new GraphQLError(
-                  `The value of 'memo' with a length of 256 did not fulfill the requested bounderies min=5 and max=255`,
-                ),
-              ],
             }),
           )
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith(
+          expect(logger.error).toBeCalledWith('The value of memo is too long', 256)
-            `The value of 'memo' with a length of 256 did not fulfill the requested bounderies min=5 and max=255`,
-          )
         })
 
         it('returns an error if amount is not positive', async () => {
+          jest.clearAllMocks()
           await expect(
             mutate({
               mutation: createContributionLink,
@@ -471,15 +415,13 @@ describe('Contribution Links', () => {
             }),
           ).resolves.toEqual(
             expect.objectContaining({
-              errors: [new GraphQLError('The amount=0 must be initialized with a positiv value!')],
+              errors: [new GraphQLError('The amount must be a positiv value')],
             }),
           )
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith(
+          expect(logger.error).toBeCalledWith('The amount must be a positiv value', new Decimal(0))
-            'The amount=0 must be initialized with a positiv value!',
-          )
         })
       })
 
@@ -530,14 +472,14 @@ describe('Contribution Links', () => {
               }),
             ).resolves.toEqual(
               expect.objectContaining({
-                errors: [new GraphQLError('Contribution Link not found to given id.')],
+                errors: [new GraphQLError('Contribution Link not found')],
               }),
             )
           })
         })
 
         it('logs the error thrown', () => {
-          expect(logger.error).toBeCalledWith('Contribution Link not found to given id: -1')
+          expect(logger.error).toBeCalledWith('Contribution Link not found', -1)
         })
 
         describe('valid id', () => {
@@ -601,13 +543,13 @@ describe('Contribution Links', () => {
               mutate({ mutation: deleteContributionLink, variables: { id: -1 } }),
             ).resolves.toEqual(
               expect.objectContaining({
-                errors: [new GraphQLError('Contribution Link not found to given id.')],
+                errors: [new GraphQLError('Contribution Link not found')],
               }),
             )
           })
 
           it('logs the error thrown', () => {
-            expect(logger.error).toBeCalledWith('Contribution Link not found to given id: -1')
+            expect(logger.error).toBeCalledWith('Contribution Link not found', -1)
           })
         })
 

backend/src/graphql/resolver/ContributionLinkResolver.ts

@@ -20,6 +20,7 @@ import Paginated from '@arg/Paginated'
 
 // TODO: this is a strange construct
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
+import LogError from '@/server/LogError'
 
 @Resolver()
 export class ContributionLinkResolver {
@@ -39,35 +40,22 @@ export class ContributionLinkResolver {
     }: ContributionLinkArgs,
   ): Promise<ContributionLink> {
     isStartEndDateValid(validFrom, validTo)
-    if (!name) {
+    if (name.length < CONTRIBUTIONLINK_NAME_MIN_CHARS) {
-      logger.error(`The name must be initialized!`)
+      throw new LogError('The value of name is too short', name.length)
-      throw new Error(`The name must be initialized!`)
     }
-    if (
+    if (name.length > CONTRIBUTIONLINK_NAME_MAX_CHARS) {
-      name.length < CONTRIBUTIONLINK_NAME_MIN_CHARS ||
+      throw new LogError('The value of name is too long', name.length)
-      name.length > CONTRIBUTIONLINK_NAME_MAX_CHARS
-    ) {
-      const msg = `The value of 'name' with a length of ${name.length} did not fulfill the requested bounderies min=${CONTRIBUTIONLINK_NAME_MIN_CHARS} and max=${CONTRIBUTIONLINK_NAME_MAX_CHARS}`
-      logger.error(`${msg}`)
-      throw new Error(`${msg}`)
     }
-    if (!memo) {
+    if (memo.length < MEMO_MIN_CHARS) {
-      logger.error(`The memo must be initialized!`)
+      throw new LogError('The value of memo is too short', memo.length)
-      throw new Error(`The memo must be initialized!`)
     }
-    if (memo.length < MEMO_MIN_CHARS || memo.length > MEMO_MAX_CHARS) {
+    if (memo.length > MEMO_MAX_CHARS) {
-      const msg = `The value of 'memo' with a length of ${memo.length} did not fulfill the requested bounderies min=${MEMO_MIN_CHARS} and max=${MEMO_MAX_CHARS}`
+      throw new LogError('The value of memo is too long', memo.length)
-      logger.error(`${msg}`)
-      throw new Error(`${msg}`)
-    }
-    if (!amount) {
-      logger.error(`The amount must be initialized!`)
-      throw new Error('The amount must be initialized!')
     }
     if (!new Decimal(amount).isPositive()) {
-      logger.error(`The amount=${amount} must be initialized with a positiv value!`)
+      throw new LogError('The amount must be a positiv value', amount)
-      throw new Error(`The amount=${amount} must be initialized with a positiv value!`)
     }
+
     const dbContributionLink = new DbContributionLink()
     dbContributionLink.amount = amount
     dbContributionLink.name = name
@@ -107,8 +95,7 @@ export class ContributionLinkResolver {
   async deleteContributionLink(@Arg('id', () => Int) id: number): Promise<Date | null> {
     const contributionLink = await DbContributionLink.findOne(id)
     if (!contributionLink) {
-      logger.error(`Contribution Link not found to given id: ${id}`)
+      throw new LogError('Contribution Link not found', id)
-      throw new Error('Contribution Link not found to given id.')
     }
     await contributionLink.softRemove()
     logger.debug(`deleteContributionLink successful!`)
@@ -134,8 +121,7 @@ export class ContributionLinkResolver {
   ): Promise<ContributionLink> {
     const dbContributionLink = await DbContributionLink.findOne(id)
     if (!dbContributionLink) {
-      logger.error(`Contribution Link not found to given id: ${id}`)
+      throw new LogError('Contribution Link not found', id)
-      throw new Error('Contribution Link not found to given id.')
     }
     dbContributionLink.amount = amount
     dbContributionLink.name = name

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', () => {

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 LogError(`ContributionMessage was not sent successfully: ${e}`, e)
-      throw new Error(`ContributionMessage was not successful: ${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 LogError('Contribution not found', contributionId)
-        throw new Error('Contribution not found')
       }
       if (contribution.userId === user.id) {
-        logger.error('Admin can not answer on own contribution')
+        throw new LogError('Admin can not answer on his own contribution', contributionId)
-        throw new Error('Admin can not answer on own contribution')
       }
       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 LogError(`ContributionMessage was not sent successfully: ${e}`, e)
-      throw new Error(`ContributionMessage was not successful: ${e}`)
     } finally {
       await queryRunner.release()
     }

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

@@ -22,11 +22,7 @@ import {
   listContributions,
   listUnconfirmedContributions,
 } from '@/seeds/graphql/queries'
-import {
+import { sendContributionConfirmedEmail } from '@/emails/sendEmailVariants'
-  // sendAccountActivationEmail,
-  sendContributionConfirmedEmail,
-  // sendContributionRejectedEmail,
-} from '@/emails/sendEmailVariants'
 import {
   cleanDB,
   resetToken,
@@ -47,7 +43,6 @@ import { EventProtocolType } from '@/event/EventProtocolType'
 import { logger, i18n as localization } from '@test/testSetup'
 import { UserInputError } from 'apollo-server-express'
 
-// 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')

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])
@@ -547,7 +551,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,
@@ -608,16 +612,11 @@ export class ContributionResolver {
       const queryRunner = getConnection().createQueryRunner()
       await queryRunner.connect()
       await queryRunner.startTransaction('REPEATABLE READ') // 'READ COMMITTED')
-      try {
+
-        const lastTransaction = await queryRunner.manager
+      const lastTransaction = await getLastTransaction(contribution.userId)
-          .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')
 
+      try {
         let newBalance = new Decimal(0)
         let decay: Decay | null = null
         if (lastTransaction) {
@@ -768,6 +767,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,

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
+          const lastTransaction = await getLastTransaction(user.id)
-            .createQueryBuilder()
-            .select('transaction')
-            .from(DbTransaction, 'transaction')
-            .where('transaction.userId = :id', { id: user.id })
-            .orderBy('transaction.id', 'DESC')
-            .getOne()
           let newBalance = new Decimal(0)
 
           let decay: Decay | null = null

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(
+    const lastTransaction = await getLastTransaction(user.id, ['contribution'])
-      { userId: user.id },
-      { order: { id: 'DESC' }, relations: ['contribution'] },
-    )
     logger.debug(`lastTransaction=${lastTransaction}`)
 
     const balanceResolver = new BalanceResolver()

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,
+    },
+  )
+}

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": {
+    "contributionDeleted": {
-      "commonGoodContributionRejected": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.",
+      "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“!"
     },

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",

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)

database/.env.dist

@@ -1,5 +1,3 @@
-CONFIG_VERSION=v1.2022-03-18
-
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=root

database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

dht-node/.env.dist

@@ -1,5 +1,3 @@
-CONFIG_VERSION=v1.2023-01-01
-
 # Database
 DB_HOST=localhost
 DB_PORT=3306

frontend/.env.dist

@@ -1,5 +1,3 @@
-CONFIG_VERSION=v4.2022-12-20
-
 # Environment
 DEFAULT_PUBLISHER_ID=2896
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "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"
+    ]
+  }
 }

frontend/src/components/Contributions/ContributionForm.spec.js

@@ -24,11 +24,6 @@ describe('ContributionForm', () => {
     $t: jest.fn((t) => t),
     $d: jest.fn((d) => d),
     $n: jest.fn((n) => n),
-    $store: {
-      state: {
-        creation: ['1000', '1000', '1000'],
-      },
-    },
     $i18n: {
       locale: 'en',
     },
@@ -61,7 +56,7 @@ describe('ContributionForm', () => {
       })
     })
 
-    describe('dates', () => {
+    describe('dates and max amounts', () => {
       beforeEach(async () => {
         await wrapper.setData({
           form: {
@@ -73,204 +68,176 @@ describe('ContributionForm', () => {
         })
       })
 
-      describe('actual date', () => {
+      describe('max amount reached for both months', () => {
-        describe('same month', () => {
+        beforeEach(() => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
+            maxGddThisMonth: 0,
+          })
+          wrapper.setData({
+            form: {
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
+          })
+        })
+
+        it('shows message that no contributions are available', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
+            'contribution.noOpenCreation.allMonth',
+          )
+        })
+      })
+
+      describe('max amount reached for last month, no date selected', () => {
+        beforeEach(() => {
+          wrapper.setProps({
+            maxGddLastMonth: 0,
+          })
+        })
+
+        it('shows no message', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
+        })
+      })
+
+      describe('max amount reached for last month, last month selected', () => {
         beforeEach(async () => {
-            const now = new Date().toISOString()
+          wrapper.setProps({
-            await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now)
+            maxGddLastMonth: 0,
+            isThisMonth: false,
           })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
-        })
-
-        describe.skip('month before', () => {
-          beforeEach(async () => {
-            await wrapper
-              .findComponent({ name: 'BFormDatepicker' })
-              .vm.$emit('input', wrapper.vm.minimalDate)
-          })
-
-          describe('isThisMonth', () => {
-            it('has false', () => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
-            })
-          })
-        })
-      })
-
-      describe.skip('date in middle of year', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            // jest.useFakeTimers('modern')
-            // jest.setSystemTime(new Date('2020-07-06'))
-            // await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now)
           await wrapper.setData({
-              maximalDate: new Date(2020, 6, 6),
+            form: {
-              form: { date: new Date(2020, 6, 6) },
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-          describe('minimalDate', () => {
+        it('shows message that no contributions are available for last month', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
+            'contribution.noOpenCreation.lastMonth',
+          )
         })
       })
 
-          describe('isThisMonth', () => {
+      describe('max amount reached for last month, this month selected', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
-        })
-
-        describe('month before', () => {
         beforeEach(async () => {
-            // jest.useFakeTimers('modern')
+          wrapper.setProps({
-            // jest.setSystemTime(new Date('2020-07-06'))
+            maxGddLastMonth: 0,
-            // console.log('middle of year date – now:', wrapper.vm.minimalDate)
+            isThisMonth: true,
-            // await wrapper
+          })
-            //   .findComponent({ name: 'BFormDatepicker' })
-            //   .vm.$emit('input', wrapper.vm.minimalDate)
           await wrapper.setData({
-              maximalDate: new Date(2020, 6, 6),
+            form: {
-              form: { date: new Date(2020, 5, 6) },
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-          describe('minimalDate', () => {
+        it('shows no message', () => {
-            it('has "2020-06-01T00:00:00.000Z"', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2020-06-01T00:00:00.000Z')
         })
       })
 
-          describe('isThisMonth', () => {
+      describe('max amount reached for this month, no date selected', () => {
-            it('has false', () => {
+        beforeEach(() => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
+          wrapper.setProps({
-            })
+            maxGddThisMonth: 0,
-          })
           })
         })
 
-      describe.skip('date in january', () => {
+        it('shows no message', () => {
-        describe('same month', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
+        })
+      })
+
+      describe('max amount reached for this month, this month selected', () => {
         beforeEach(async () => {
+          wrapper.setProps({
+            maxGddThisMonth: 0,
+            isThisMonth: true,
+          })
           await wrapper.setData({
-              maximalDate: new Date(2020, 0, 6),
+            form: {
-              form: { date: new Date(2020, 0, 6) },
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-          describe('minimalDate', () => {
+        it('shows message that no contributions are available for last month', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').text()).toBe(
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
+            'contribution.noOpenCreation.thisMonth',
+          )
         })
       })
 
-          describe('isThisMonth', () => {
+      describe('max amount reached for this month, last month selected', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
-        })
-
-        describe('month before', () => {
         beforeEach(async () => {
-            // jest.useFakeTimers('modern')
+          wrapper.setProps({
-            // jest.setSystemTime(new Date('2020-07-06'))
+            maxGddThisMonth: 0,
-            // console.log('middle of year date – now:', wrapper.vm.minimalDate)
+            isThisMonth: false,
-            // await wrapper
+          })
-            //   .findComponent({ name: 'BFormDatepicker' })
-            //   .vm.$emit('input', wrapper.vm.minimalDate)
           await wrapper.setData({
-              maximalDate: new Date(2020, 0, 6),
+            form: {
-              form: { date: new Date(2019, 11, 6) },
+              id: null,
+              date: 'set',
+              memo: '',
+              amount: '',
+            },
           })
         })
 
-          describe('minimalDate', () => {
+        it('shows no message', () => {
-            it('has "2019-12-01T00:00:00.000Z"', () => {
+          expect(wrapper.find('[data-test="contribtion-message"]').exists()).toBe(false)
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2019-12-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has false', () => {
-              expect(wrapper.vm.isThisMonth).toBe(false)
-            })
         })
       })
     })
 
-      describe.skip('date with the 31st day of the month', () => {
+    describe('default return message', () => {
-        describe('same month', () => {
+      it('returns an empty string', () => {
-          beforeEach(async () => {
+        expect(wrapper.vm.noOpenCreation).toBe('')
-            await wrapper.setData({
-              maximalDate: new Date('2022-10-31T00:00:00.000Z'),
-              form: { date: new Date('2022-10-31T00:00:00.000Z') },
       })
     })
 
-          describe('minimalDate', () => {
+    describe('update amount', () => {
-            it('has "2022-09-01T00:00:00.000Z"', () => {
+      beforeEach(() => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2022-09-01T00:00:00.000Z')
+        wrapper.findComponent({ name: 'InputHour' }).vm.$emit('updateAmount', 20)
+      })
+
+      it('updates form amount', () => {
+        expect(wrapper.vm.form.amount).toBe('400.00')
       })
     })
 
-          describe('isThisMonth', () => {
+    describe('watch value', () => {
-            it('has true', () => {
+      beforeEach(() => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
+        wrapper.setProps({
-            })
+          value: {
-          })
+            id: 42,
+            date: 'set',
+            memo: 'Some Memo',
+            amount: '400.00',
+          },
         })
       })
 
-      describe.skip('date with the 28th day of the month', () => {
+      it('updates form', () => {
-        describe('same month', () => {
+        expect(wrapper.vm.form).toEqual({
-          beforeEach(async () => {
+          id: 42,
-            await wrapper.setData({
+          date: 'set',
-              maximalDate: new Date('2023-02-28T00:00:00.000Z'),
+          memo: 'Some Memo',
-              form: { date: new Date('2023-02-28T00:00:00.000Z') },
+          amount: '400.00',
-            })
-          })
-
-          describe('minimalDate', () => {
-            it('has "2023-01-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2023-01-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
-        })
-      })
-
-      describe.skip('date with 29.02.2024 leap year', () => {
-        describe('same month', () => {
-          beforeEach(async () => {
-            await wrapper.setData({
-              maximalDate: new Date('2024-02-29T00:00:00.000Z'),
-              form: { date: new Date('2024-02-29T00:00:00.000Z') },
-            })
-          })
-
-          describe('minimalDate', () => {
-            it('has "2024-01-01T00:00:00.000Z"', () => {
-              expect(wrapper.vm.minimalDate.toISOString()).toBe('2024-01-01T00:00:00.000Z')
-            })
-          })
-
-          describe('isThisMonth', () => {
-            it('has true', () => {
-              expect(wrapper.vm.isThisMonth).toBe(true)
-            })
-          })
         })
       })
     })
@@ -477,24 +444,23 @@ describe('ContributionForm', () => {
             })
           })
 
-          describe.skip('on trigger submit', () => {
+          describe('on trigger submit', () => {
             beforeEach(async () => {
               await wrapper.find('form').trigger('submit')
             })
 
             it('emits "update-contribution"', () => {
-              expect(wrapper.emitted('update-contribution')).toEqual(
+              expect(wrapper.emitted('update-contribution')).toEqual([
-                expect.arrayContaining([
+                [
-                  expect.arrayContaining([
                   {
                     id: 2,
                     date: now,
+                    hours: 0,
                     memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
                     amount: '200',
                   },
-                  ]),
+                ],
-                ]),
+              ])
-              )
             })
           })
         })

frontend/src/components/Contributions/ContributionForm.vue

@@ -23,10 +23,7 @@
         <template #nav-next-year><span></span></template>
       </b-form-datepicker>
 
-      <div
+      <div v-if="showMessage" class="p-3" data-test="contribtion-message">
-        v-if="(isThisMonth && maxGddThisMonth <= 0) || (!isThisMonth && maxGddLastMonth <= 0)"
-        class="p-3"
-      >
         {{ noOpenCreation }}
       </div>
       <div v-else>
@@ -118,8 +115,8 @@ export default {
     }
   },
   methods: {
-    updateAmount(amount) {
+    updateAmount(hours) {
-      this.form.amount = (amount * 20).toFixed(2).toString()
+      this.form.amount = (hours * 20).toFixed(2).toString()
     },
     submit() {
       this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
@@ -135,6 +132,15 @@ export default {
     },
   },
   computed: {
+    showMessage() {
+      if (this.maxGddThisMonth <= 0 && this.maxGddLastMonth <= 0) return true
+      if (this.form.date)
+        return (
+          (this.isThisMonth && this.maxGddThisMonth <= 0) ||
+          (!this.isThisMonth && this.maxGddLastMonth <= 0)
+        )
+      return false
+    },
     disabled() {
       return (
         this.form.date === '' ||

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 }]])
+      })
+    })
   })
 })

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')
         })
     },

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 ",

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 ",

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',

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,

frontend/src/pages/InfoStatistic.vue

@@ -6,9 +6,9 @@
         {{ CONFIG.COMMUNITY_DESCRIPTION }}
       </div>
       <div>
-        <router-link :to="CONFIG.COMMUNITY_URL">
+        <b-link :href="CONFIG.COMMUNITY_URL">
           {{ CONFIG.COMMUNITY_URL }}
-        </router-link>
+        </b-link>
       </div>
       <hr />
       <div class="h3">{{ $t('community.openContributionLinks') }}</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",