Merge branch 'staging' of https://github.com/GeneralMagicio/QAcc-BE into staging

Author: lovelgeorge99

src/resolvers/donationResolver.ts

@@ -218,6 +218,15 @@ class DonationMetrics {
   averagePercentageToGiveth: number;
 }
 
+@ObjectType()
+class TotalDonations {
+  @Field(_type => [Donation])
+  donations: Donation[];
+
+  @Field(_type => Int)
+  totalCount: number;
+}
+
 @InputType()
 class SwapTransactionInput {
   @Field({ nullable: true })
@@ -1130,4 +1139,25 @@ export class DonationResolver {
       throw e;
     }
   }
+
+  @Query(_returns => TotalDonations, { nullable: true })
+  async donationsByQfRoundId(
+    @Ctx() _ctx: ApolloContext,
+    @Arg('qfRoundId', _type => Int) qfRoundId: number,
+  ) {
+    const query = this.donationRepository
+      .createQueryBuilder('donation')
+      .leftJoin('donation.project', 'project')
+      .leftJoin('donation.user', 'user')
+      .addSelect(['project.title', 'project.abc', 'project.id', 'user.id'])
+      .where('donation.qfRoundId = :qfRoundId', { qfRoundId })
+      .orderBy('donation.createdAt', 'DESC');
+
+    const [donations, totalCount] = await query.getManyAndCount();
+
+    return {
+      donations,
+      totalCount: totalCount,
+    };
+  }
 }

src/services/donationService.test.ts

@@ -151,7 +151,7 @@ function syncDonationStatusWithBlockchainNetworkTestCases() {
     sinon.restore();
   });
 
-  it('should verify a Polygon donation', async () => {
+  it.skip('should verify a Polygon donation', async () => {
     // https://polygonscan.com/tx/0x16f122ad45705dfa41bb323c3164b6d840cbb0e9fa8b8e58bd7435370f8bbfc8
 
     const updateDonation = await syncDonationStatusWithBlockchainNetwork({
@@ -163,7 +163,7 @@ function syncDonationStatusWithBlockchainNetworkTestCases() {
     assert.equal(updateDonation.status, DONATION_STATUS.VERIFIED);
   });
 
-  it('should associate donation to overlapping early access round after verification', async () => {
+  it.skip('should associate donation to overlapping early access round after verification', async () => {
     sinon.stub(chains, 'validateTransactionWithInputData');
     ea = await EarlyAccessRound.create({
       roundNumber: generateEARoundNumber(),
@@ -189,7 +189,7 @@ function syncDonationStatusWithBlockchainNetworkTestCases() {
     // assert.equal(updateDonation.earlyAccessRoundId, ea.id);
   });
 
-  it('should associate donation to overlapping qf round after verification', async () => {
+  it.skip('should associate donation to overlapping qf round after verification', async () => {
     sinon.stub(chains, 'validateTransactionWithInputData');
     qf = await QfRound.create({
       roundNumber: 1,

test/graphqlQueries.ts

@@ -2270,3 +2270,21 @@ export const setSkipVerificationMutation = `
     setSkipVerification(skipVerification: $skipVerification)
   }
 `;
+
+export const getDonationsByQfRoundId = `
+query donationsByQfRoundId($qfRoundId: Int!) {
+  donationsByQfRoundId(qfRoundId: $qfRoundId) {
+    donations {
+      amount
+      createdAt
+      project {
+        id
+      }
+      user {
+        id
+      }
+    }
+    totalCount
+  }
+}
+`;