Merge pull request #1758 from Giveth/master

Master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "giveth-graphql-api",
-  "version": "1.24.3",
+  "version": "1.24.4",
   "description": "Backend GraphQL server for Giveth originally forked from Topia",
   "main": "./dist/index.js",
   "dependencies": {
@@ -250,6 +250,5 @@
       "ethers": "^5.5.4"
     }
   },
-  "author": "James Farrell",
   "license": "ISC"
 }

src/repositories/qfRoundRepository.test.ts

@@ -229,9 +229,11 @@ function getQfRoundTotalProjectsDonationsSumTestCases() {
   });
 
   it('should return 0 when no donations', async () => {
-    const { uniqueDonors, totalDonationUsd } = await getQfRoundStats(qfRound);
+    const { uniqueDonors, totalDonationUsd, donationsCount } =
+      await getQfRoundStats(qfRound);
     expect(totalDonationUsd).to.equal(0);
     expect(uniqueDonors).to.equal(0);
+    expect(donationsCount).to.equal(0);
   });
 
   it('should return correct value for single project', async () => {
@@ -266,9 +268,10 @@ function getQfRoundTotalProjectsDonationsSumTestCases() {
     );
     await refreshProjectEstimatedMatchingView();
     const sum = await getQfRoundTotalSqrtRootSumSquared(qfRound.id);
-    const { uniqueDonors } = await getQfRoundStats(qfRound);
+    const { uniqueDonors, donationsCount } = await getQfRoundStats(qfRound);
     expect(sum).to.equal(289);
     expect(uniqueDonors).to.equal(3);
+    expect(donationsCount).to.equal(6);
   });
 
   it('should return correct value for multiple projects', async () => {
@@ -311,9 +314,10 @@ function getQfRoundTotalProjectsDonationsSumTestCases() {
 
     await refreshProjectEstimatedMatchingView();
     const sum = await getQfRoundTotalSqrtRootSumSquared(qfRound.id);
-    const { uniqueDonors } = await getQfRoundStats(qfRound);
+    const { uniqueDonors, donationsCount } = await getQfRoundStats(qfRound);
     expect(sum).to.equal(289 * 5);
     expect(uniqueDonors).to.equal(3);
+    expect(donationsCount).to.equal(12);
   });
 }
 

src/repositories/qfRoundRepository.ts

@@ -219,11 +219,13 @@ export const getQfRoundStats = async (
 ): Promise<{
   uniqueDonors: number;
   totalDonationUsd: number;
+  donationsCount: number;
 }> => {
   const { id: qfRoundId, beginDate, endDate } = qfRound;
   const result = await Donation.createQueryBuilder('donation')
     .select('COUNT(DISTINCT donation.fromWalletAddress)', 'uniqueDonors')
     .addSelect('SUM(donation.valueUsd)', 'totalDonationUsd')
+    .addSelect('COALESCE(COUNT(donation.id), 0)', 'donationsCount')
     .where('donation.qfRoundId = :qfRoundId', { qfRoundId })
     .andWhere('donation.status = :status', { status: 'verified' })
     .andWhere('donation.createdAt BETWEEN :beginDate AND :endDate', {
@@ -238,6 +240,7 @@ export const getQfRoundStats = async (
   return {
     uniqueDonors: parseInt(result.uniqueDonors) || 0,
     totalDonationUsd: parseFloat(result.totalDonationUsd) || 0,
+    donationsCount: parseInt(result.donationsCount) || 0,
   };
 };
 

src/resolvers/qfRoundResolver.ts

@@ -36,6 +36,9 @@ export class QfRoundStatsResponse {
   @Field()
   uniqueDonors: number;
 
+  @Field()
+  donationsCount: number;
+
   @Field()
   allDonationsUsdValue: number;
 
@@ -203,9 +206,11 @@ export class QfRoundResolver {
     if (!qfRound) {
       return null;
     }
-    const { uniqueDonors, totalDonationUsd } = await getQfRoundStats(qfRound);
+    const { uniqueDonors, totalDonationUsd, donationsCount } =
+      await getQfRoundStats(qfRound);
     return {
       uniqueDonors,
+      donationsCount,
       allDonationsUsdValue: totalDonationUsd,
       matchingPool: qfRound.allocatedFund,
       qfRound,

test/graphqlQueries.ts

@@ -992,6 +992,7 @@ export const qfRoundStatsQuery = `
       slug: $slug
     ) {
       uniqueDonors
+      donationsCount
       allDonationsUsdValue
       matchingPool
       qfRound{