Merge branch 'master' into open-creations-call

backend/src/graphql/resolver/BalanceResolver.ts

@@ -32,7 +32,7 @@ export class BalanceResolver {
 
     const lastTransaction = context.lastTransaction
       ? context.lastTransaction
-      : await dbTransaction.findOne({ userId: user.id }, { order: { balanceDate: 'DESC' } })
+      : await dbTransaction.findOne({ userId: user.id }, { order: { id: 'DESC' } })
 
     logger.debug(`lastTransaction=${lastTransaction}`)
 

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

@@ -1947,6 +1947,23 @@ describe('ContributionResolver', () => {
                 }),
               )
             })
+
+            describe('confirm same contribution again', () => {
+              it('throws an error', async () => {
+                await expect(
+                  mutate({
+                    mutation: confirmContribution,
+                    variables: {
+                      id: creation ? creation.id : -1,
+                    },
+                  }),
+                ).resolves.toEqual(
+                  expect.objectContaining({
+                    errors: [new GraphQLError('Contribution already confirmd.')],
+                  }),
+                )
+              })
+            })
           })
 
           describe('confirm two creations one after the other quickly', () => {

backend/src/graphql/resolver/ContributionResolver.ts

@@ -555,12 +555,20 @@ export class ContributionResolver {
     @Arg('id', () => Int) id: number,
     @Ctx() context: Context,
   ): Promise<boolean> {
+    // acquire lock
+    const releaseLock = await TRANSACTIONS_LOCK.acquire()
+
+    try {
       const clientTimezoneOffset = getClientTimezoneOffset(context)
       const contribution = await DbContribution.findOne(id)
       if (!contribution) {
         logger.error(`Contribution not found for given id: ${id}`)
         throw new Error('Contribution not found to given id.')
       }
+      if (contribution.confirmedAt) {
+        logger.error(`Contribution already confirmd: ${id}`)
+        throw new Error('Contribution already confirmd.')
+      }
       const moderatorUser = getUser(context)
       if (moderatorUser.id === contribution.userId) {
         logger.error('Moderator can not confirm own contribution')
@@ -582,9 +590,6 @@ export class ContributionResolver {
         clientTimezoneOffset,
       )
 
-    // acquire lock
-    const releaseLock = await TRANSACTIONS_LOCK.acquire()
-
       const receivedCallDate = new Date()
       const queryRunner = getConnection().createQueryRunner()
       await queryRunner.connect()
@@ -648,7 +653,6 @@ export class ContributionResolver {
         throw new Error('Creation was not successful.')
       } finally {
         await queryRunner.release()
-      releaseLock()
       }
 
       const event = new Event()
@@ -657,6 +661,10 @@ export class ContributionResolver {
       eventContributionConfirm.amount = contribution.amount
       eventContributionConfirm.contributionId = contribution.id
       await eventProtocol.writeEvent(event.setEventContributionConfirm(eventContributionConfirm))
+    } finally {
+      releaseLock()
+    }
+
     return true
   }
 

backend/src/graphql/resolver/TransactionResolver.ts

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