Merge pull request #61 from GeneralMagicio/joinWithEarlyAccessRound

join get user donations query with early access round
GeneralMagicio · Sep 19, 2024 · e9bbf28 · e9bbf28
2 parents 003ccfd + 14394e8
commit e9bbf28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/entities/donation.ts b/src/entities/donation.ts
@@ -262,7 +262,6 @@ export class Donation extends BaseEntity {
   @ManyToOne(_type => EarlyAccessRound, { eager: true, nullable: true })
   earlyAccessRound?: EarlyAccessRound | null;
 
-  @Field({ nullable: true })
   @RelationId((donation: Donation) => donation.earlyAccessRound)
   @Column({ nullable: true })
   earlyAccessRoundId: number;

diff --git a/src/resolvers/donationResolver.ts b/src/resolvers/donationResolver.ts
@@ -646,6 +646,7 @@ export class DonationResolver {
       .leftJoinAndSelect('donation.project', 'project')
       .leftJoinAndSelect('donation.user', 'user')
       .leftJoinAndSelect('donation.qfRound', 'qfRound')
+      .leftJoinAndSelect('donation.earlyAccessRound', 'earlyAccessRound')
       .where(`donation.userId = ${userId}`)
       .orderBy(
         `donation.${orderBy.field}`,
@@ -908,9 +909,7 @@ export class DonationResolver {
         }
         await donation.save();
       } else {
-        const activeRound = await findActiveEarlyAccessRound();
-        donation.earlyAccessRound = activeRound;
-        donation.earlyAccessRoundId = activeRound?.id as number;
+        donation.earlyAccessRound = await findActiveEarlyAccessRound();
         await donation.save();
       }
       let priceChainId;