improved query

backend/src/graphql/resolver/TransactionResolver.ts

@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
-import { getCustomRepository, getConnection, MoreThan } from '@dbTools/typeorm'
+import { getCustomRepository, getConnection } from '@dbTools/typeorm'
 
 import CONFIG from '@/config'
 import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail'
@@ -23,7 +23,6 @@ import { TransactionLinkRepository } from '@repository/TransactionLink'
 
 import { User as dbUser } from '@entity/User'
 import { Transaction as dbTransaction } from '@entity/Transaction'
-import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 
 import { apiPost } from '@/apis/HttpRequest'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
@@ -115,10 +114,8 @@ export class TransactionResolver {
     const transactions: Transaction[] = []
 
     const transactionLinkRepository = getCustomRepository(TransactionLinkRepository)
-    const { sumHoldAvailableAmount, sumAmount } = await transactionLinkRepository.sumAmounts(
+    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
-      user.id,
+      await transactionLinkRepository.sumAmounts(user.id, now)
-      now,
-    )
 
     // decay transaction
     if (!onlyCreations && currentPage === 1 && order === Order.DESC) {
@@ -127,24 +124,14 @@ export class TransactionResolver {
       )
       // open transaction link sum transaction
       if (sumHoldAvailableAmount.greaterThan(0)) {
-        const lastTransactionLink = await dbTransactionLink.find({
-          where: { userId: self.id, redeemedBy: null, validUntil: MoreThan(now) },
-          order: { createdAt: 'DESC' },
-          take: 1,
-        })
-        const firstTransactionLink = await dbTransactionLink.find({
-          where: { userId: self.id, redeemedBy: null, validUntil: MoreThan(now) },
-          order: { createdAt: 'ASC' },
-          take: 1,
-        })
         transactions.push(
           virtualLinkTransaction(
             lastTransaction.balance,
             sumAmount,
             sumHoldAvailableAmount,
             sumHoldAvailableAmount.minus(sumAmount.toString()),
-            firstTransactionLink[0].createdAt,
+            firstDate || now,
-            lastTransactionLink[0].validUntil,
+            lastDate || now,
             self,
           ),
         )

backend/src/server/plugins.ts

@@ -39,7 +39,6 @@ const apolloLogPlugin = ApolloLogPlugin({
   },
 })
 
-const plugins =
+const plugins = process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin] // , apolloLogPlugin
-  process.env.NODE_ENV === 'development' ? [setHeadersPlugin] : [setHeadersPlugin, apolloLogPlugin]
 
 export default plugins

backend/src/typeorm/repository/TransactionLink.ts

@@ -7,20 +7,30 @@ export class TransactionLinkRepository extends Repository<dbTransactionLink> {
   async sumAmounts(
     userId: number,
     date: Date,
-  ): Promise<{ sumHoldAvailableAmount: Decimal; sumAmount: Decimal }> {
+  ): Promise<{
-    const { sumHoldAvailableAmount, sumAmount } = await this.createQueryBuilder('transactionLinks')
+    sumHoldAvailableAmount: Decimal
-      .select('SUM(transactionLinks.holdAvailableAmount)', 'sumHoldAvailableAmount')
+    sumAmount: Decimal
-      .addSelect('SUM(transactionLinks.amount)', 'sumAmount')
+    lastDate: Date | null
-      .where('transactionLinks.userId = :userId', { userId })
+    firstDate: Date | null
-      .andWhere('transactionLinks.redeemedAt is NULL')
+  }> {
-      .andWhere('transactionLinks.validUntil > :date', { date })
+    const { sumHoldAvailableAmount, sumAmount, lastDate, firstDate } =
-      .orderBy('transactionLinks.createdAt', 'DESC')
+      await this.createQueryBuilder('transactionLinks')
-      .getRawOne()
+        .select('SUM(transactionLinks.holdAvailableAmount)', 'sumHoldAvailableAmount')
+        .addSelect('SUM(transactionLinks.amount)', 'sumAmount')
+        .addSelect('MAX(transactionLinks.validUntil)', 'lastDate')
+        .addSelect('MIN(transactionLinks.createdAt)', 'firstDate')
+        .where('transactionLinks.userId = :userId', { userId })
+        .andWhere('transactionLinks.redeemedAt is NULL')
+        .andWhere('transactionLinks.validUntil > :date', { date })
+        .orderBy('transactionLinks.createdAt', 'DESC')
+        .getRawOne()
     return {
       sumHoldAvailableAmount: sumHoldAvailableAmount
         ? new Decimal(sumHoldAvailableAmount)
         : new Decimal(0),
       sumAmount: sumAmount ? new Decimal(sumAmount) : new Decimal(0),
+      lastDate: lastDate || null,
+      firstDate: firstDate || null,
     }
   }
 }