From c3f7f1542078ecc322ecb4cf453e1d0876434357 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 16 Jan 2023 11:21:38 +0100
Subject: [PATCH] refactor all semaphore-locks

---
 .../graphql/resolver/ContributionResolver.ts  |  1 -
 .../graphql/resolver/TransactionResolver.ts   | 41 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 7771c62ca..198d2e590 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -557,7 +557,6 @@ export class ContributionResolver {
   ): Promise<boolean> {
     // acquire lock
     const releaseLock = await TRANSACTIONS_LOCK.acquire()
-
     try {
       const clientTimezoneOffset = getClientTimezoneOffset(context)
       const contribution = await DbContribution.findOne(id)
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 33914583e..2f97596b2 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -45,29 +45,28 @@ export const executeTransaction = async (
   recipient: dbUser,
   transactionLink?: dbTransactionLink | null,
 ): Promise<boolean> => {
-  logger.info(
-    `executeTransaction(amount=${amount}, memo=${memo}, sender=${sender}, recipient=${recipient})...`,
-  )
-
-  if (sender.id === recipient.id) {
-    logger.error(`Sender and Recipient are the same.`)
-    throw new Error('Sender and Recipient are the same.')
-  }
-
-  if (memo.length > MEMO_MAX_CHARS) {
-    logger.error(`memo text is too long: memo.length=${memo.length} > ${MEMO_MAX_CHARS}`)
-    throw new Error(`memo text is too long (${MEMO_MAX_CHARS} characters maximum)`)
-  }
-
-  if (memo.length < MEMO_MIN_CHARS) {
-    logger.error(`memo text is too short: memo.length=${memo.length} < ${MEMO_MIN_CHARS}`)
-    throw new Error(`memo text is too short (${MEMO_MIN_CHARS} characters minimum)`)
-  }
-
   // acquire lock
   const releaseLock = await TRANSACTIONS_LOCK.acquire()
-
   try {
+    logger.info(
+      `executeTransaction(amount=${amount}, memo=${memo}, sender=${sender}, recipient=${recipient})...`,
+    )
+
+    if (sender.id === recipient.id) {
+      logger.error(`Sender and Recipient are the same.`)
+      throw new Error('Sender and Recipient are the same.')
+    }
+
+    if (memo.length > MEMO_MAX_CHARS) {
+      logger.error(`memo text is too long: memo.length=${memo.length} > ${MEMO_MAX_CHARS}`)
+      throw new Error(`memo text is too long (${MEMO_MAX_CHARS} characters maximum)`)
+    }
+
+    if (memo.length < MEMO_MIN_CHARS) {
+      logger.error(`memo text is too short: memo.length=${memo.length} < ${MEMO_MIN_CHARS}`)
+      throw new Error(`memo text is too short (${MEMO_MIN_CHARS} characters minimum)`)
+    }
+
     // validate amount
     const receivedCallDate = new Date()
     const sendBalance = await calculateBalance(
@@ -187,10 +186,10 @@ export const executeTransaction = async (
       })
     }
     logger.info(`finished executeTransaction successfully`)
-    return true
   } finally {
     releaseLock()
   }
+  return true
 }
 
 @Resolver()