From 46fe5b017a48a4a12aa446337a5293c84afb0db7 Mon Sep 17 00:00:00 2001
From: Aleksandar Petkov <sashko506@gmail.com>
Date: Sat, 30 Nov 2024 11:09:59 +0200
Subject: [PATCH] fix: Connect non anonymous donation by personId (#678)

* fix: Connect non anonymous donation by personId
It is not necessary for the billlingEmail to be the one of the registered user(e.g. company emails for billing)

* fix: Tests
---
 apps/api/src/donations/donations.service.ts               | 8 +++++---
 .../api/src/sockets/notifications/notification.service.ts | 3 ++-
 apps/api/src/stripe/stripe.controller.spec.ts             | 4 ++--
 apps/api/src/stripe/stripe.service.ts                     | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/api/src/donations/donations.service.ts b/apps/api/src/donations/donations.service.ts
index 23200674..e334795e 100644
--- a/apps/api/src/donations/donations.service.ts
+++ b/apps/api/src/donations/donations.service.ts
@@ -914,7 +914,7 @@ export class DonationsService {
             create: {
               amount: paymentData.netAmount,
               type: paymentData.type as DonationType,
-              person: paymentData.personId ? { connect: { email: paymentData.billingEmail } } : {},
+              person: paymentData.personId ? { connect: { id: paymentData.personId } } : {},
               targetVault: targetVaultData,
             },
           },
@@ -928,7 +928,7 @@ export class DonationsService {
           donation.amount,
           tx,
         )
-        this.notificationService.sendNotification('successfulDonation', donation)
+        this.notificationService.sendNotification('successfulDonation', donation.donations[0])
       }
 
       return donation
@@ -966,7 +966,9 @@ export class DonationsService {
         },
         include: { donations: true },
       })
-      Logger.debug('Donation found by subscription: ', donation)
+      if (donation) {
+        Logger.debug('Donation found by subscription: ', donation)
+      }
     }
     return donation
   }
diff --git a/apps/api/src/sockets/notifications/notification.service.ts b/apps/api/src/sockets/notifications/notification.service.ts
index ca02aea2..9d2f625d 100644
--- a/apps/api/src/sockets/notifications/notification.service.ts
+++ b/apps/api/src/sockets/notifications/notification.service.ts
@@ -9,11 +9,12 @@ export const donationNotificationSelect = Prisma.validator<Prisma.PaymentSelect>
   amount: true,
   extPaymentMethodId: true,
   createdAt: true,
-
   donations: {
     select: {
       id: true,
       targetVaultId: true,
+      createdAt: true,
+      amount: true,
       person: {
         select: {
           firstName: true,
diff --git a/apps/api/src/stripe/stripe.controller.spec.ts b/apps/api/src/stripe/stripe.controller.spec.ts
index d6334f87..e6690324 100644
--- a/apps/api/src/stripe/stripe.controller.spec.ts
+++ b/apps/api/src/stripe/stripe.controller.spec.ts
@@ -34,7 +34,7 @@ describe('StripeController', () => {
     checkout: { sessions: { create: jest.fn() } },
     paymentIntents: { retrieve: jest.fn() },
     refunds: { create: jest.fn() },
-    setupIntents: { retrieve: jest.fn() },
+    setupIntents: { retrieve: jest.fn(), update: jest.fn() },
     customers: { create: jest.fn(), list: jest.fn() },
     paymentMethods: { attach: jest.fn() },
     products: { search: jest.fn(), create: jest.fn() },
@@ -199,7 +199,7 @@ describe('StripeController', () => {
       reason: 'requested_by_customer',
     })
   })
-  it(`should not call setupintents.update if campaign can't accept donations`, async () => {
+  it(`should not call setupintents.update if no campaignId is provided`, async () => {
     prismaMock.campaign.findFirst.mockResolvedValue({
       id: 'complete-campaign',
       allowDonationOnComplete: false,
diff --git a/apps/api/src/stripe/stripe.service.ts b/apps/api/src/stripe/stripe.service.ts
index da944112..ee76a707 100644
--- a/apps/api/src/stripe/stripe.service.ts
+++ b/apps/api/src/stripe/stripe.service.ts
@@ -37,7 +37,7 @@ export class StripeService {
   ): Promise<Stripe.Response<Stripe.SetupIntent>> {
     if (!inputDto.metadata.campaignId)
       throw new BadRequestException('campaignId is missing from metadata')
-    const campaign = await this.campaignService.validateCampaignId(
+    await this.campaignService.validateCampaignId(
       inputDto.metadata.campaignId as string,
     )
     return await this.stripeClient.setupIntents.update(id, inputDto, { idempotencyKey })