Merge branch 'master' into 2675-Toast-Message-when-forced-to-logout-clientside

admin/package.json

@@ -86,5 +86,10 @@
     "> 1%",
     "last 2 versions",
     "not ie <= 10"
+  ],
+  "nodemonConfig": {
+    "ignore": [
+      "**/*.spec.js"
     ]
   }
+}

backend/package.json

@@ -72,5 +72,8 @@
     "ts-node": "^10.0.0",
     "tsconfig-paths": "^3.14.0",
     "typescript": "^4.3.4"
+  },
+  "nodemonConfig": {
+    "ignore": ["**/*.test.ts"]
   }
 }

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/ContributionResolver.ts

@@ -54,6 +54,8 @@ import {
 } from '@/emails/sendEmailVariants'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 
+import { getLastTransaction } from './util/getLastTransaction'
+
 @Resolver()
 export class ContributionResolver {
   @Authorized([RIGHTS.CREATE_CONTRIBUTION])
@@ -607,16 +609,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) {

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/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)

frontend/package.json

@@ -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"
+    ]
+  }
 }