473 - Refactor and change out the donation flow to use Stripe.SetupIntents

apps/api/src/app/app.module.ts

@@ -49,6 +49,7 @@ import { PaypalModule } from '../paypal/paypal.module'
 import { ExportModule } from '../export/export.module'
 import { JwtModule } from '@nestjs/jwt'
 import { NotificationModule } from '../sockets/notifications/notification.module'
+import { StripeModule } from '../stripe/stripe.module'
 
 @Module({
   imports: [
@@ -96,6 +97,7 @@ import { NotificationModule } from '../sockets/notifications/notification.module
     ExportModule,
     JwtModule,
     NotificationModule,
+    StripeModule,
   ],
   controllers: [AppController],
   providers: [

apps/api/src/campaign/campaign.service.ts

@@ -1,18 +1,8 @@
-import {
-  Prisma,
-  Campaign,
-  CampaignState,
-  CampaignType,
-  Donation,
-  DonationStatus,
-  DonationType,
-  Vault,
-} from '@prisma/client'
+import { Prisma, Campaign, CampaignState, CampaignType, Donation, Vault } from '@prisma/client'
 import {
   forwardRef,
   Inject,
   Injectable,
-  InternalServerErrorException,
   Logger,
   NotAcceptableException,
   NotFoundException,
@@ -21,7 +11,6 @@ import {
 import { PersonService } from '../person/person.service'
 import { PrismaService } from '../prisma/prisma.service'
 import { VaultService } from '../vault/vault.service'
-import { shouldAllowStatusChange } from '../donations/helpers/donation-status-updates'
 import { PaymentData } from '../donations/helpers/payment-intent-helpers'
 import { CreateCampaignDto } from './dto/create-campaign.dto'
 import { UpdateCampaignDto } from './dto/update-campaign.dto'
@@ -32,17 +21,11 @@ import {
   CampaignListItem,
   CampaignListItemSelect,
 } from './dto/list-campaigns.dto'
-import {
-  NotificationService,
-  donationNotificationSelect,
-} from '../sockets/notifications/notification.service'
-import { DonationMetadata } from '../donations/dontation-metadata.interface'
 
 @Injectable()
 export class CampaignService {
   constructor(
     private prisma: PrismaService,
-    private notificationService: NotificationService,
     @Inject(forwardRef(() => VaultService)) private vaultService: VaultService,
     @Inject(forwardRef(() => PersonService)) private personService: PersonService,
   ) {}
@@ -409,174 +392,6 @@ export class CampaignService {
     return this.prisma.donation.findFirst({ where: { extPaymentIntentId: paymentIntentId } })
   }
 
-  /**
-   * Creates or Updates an incoming donation depending on the newDonationStatus attribute
-   * @param campaign
-   * @param paymentData
-   * @param newDonationStatus
-   * @param metadata
-   * @returns donation.id of the created/updated donation
-   */
-  async updateDonationPayment(
-    campaign: Campaign,
-    paymentData: PaymentData,
-    newDonationStatus: DonationStatus,
-    metadata?: DonationMetadata,
-  ): Promise<string> {
-    const campaignId = campaign.id
-    Logger.debug('Update donation to status: ' + newDonationStatus, {
-      campaignId,
-      paymentIntentId: paymentData.paymentIntentId,
-    })
-
-    /**
-     * Create or connect campaign vault
-     */
-    const vault = await this.prisma.vault.findFirst({ where: { campaignId } })
-    const targetVaultData = vault
-      ? // Connect the existing vault to this donation
-        { connect: { id: vault.id } }
-      : // Create new vault for the campaign
-        { create: { campaignId, currency: campaign.currency, name: campaign.title } }
-
-    // Find donation by extPaymentIntentId and update if status allows
-
-    let donation = await this.prisma.donation.findUnique({
-      where: { extPaymentIntentId: paymentData.paymentIntentId },
-      select: donationNotificationSelect,
-    })
-
-    // check for UUID length of personId
-    // subscriptions always have a personId
-    if (!donation && paymentData.personId && paymentData.personId.length === 36) {
-      // search for a subscription donation
-      // for subscriptions, we don't have a paymentIntentId
-      donation = await this.prisma.donation.findFirst({
-        where: {
-          status: DonationStatus.initial,
-          personId: paymentData.personId,
-          chargedAmount: paymentData.chargedAmount,
-          extPaymentMethodId: 'subscription',
-        },
-        select: donationNotificationSelect,
-      })
-
-      if (donation) {
-        donation.status = newDonationStatus
-        this.notificationService.sendNotification('successfulDonation', donation)
-      }
-
-      Logger.debug('Donation found by subscription: ', donation)
-    }
-
-    //if missing create the donation with the incoming status
-    if (!donation) {
-      Logger.debug(
-        'No donation exists with extPaymentIntentId: ' +
-          paymentData.paymentIntentId +
-          ' Creating new donation with status: ' +
-          newDonationStatus,
-      )
-
-      try {
-        donation = await this.prisma.donation.create({
-          data: {
-            amount: paymentData.netAmount,
-            chargedAmount: paymentData.chargedAmount,
-            currency: campaign.currency,
-            targetVault: targetVaultData,
-            provider: paymentData.paymentProvider,
-            type: DonationType.donation,
-            status: newDonationStatus,
-            extCustomerId: paymentData.stripeCustomerId ?? '',
-            extPaymentIntentId: paymentData.paymentIntentId,
-            extPaymentMethodId: paymentData.paymentMethodId ?? '',
-            billingName: paymentData.billingName,
-            billingEmail: paymentData.billingEmail,
-            person: paymentData.personId ? { connect: { id: paymentData.personId } } : {},
-          },
-          select: donationNotificationSelect,
-        })
-
-        this.notificationService.sendNotification('successfulDonation', donation)
-      } catch (error) {
-        Logger.error(
-          `Error while creating donation with paymentIntentId: ${paymentData.paymentIntentId} and status: ${newDonationStatus} . Error is: ${error}`,
-        )
-        throw new InternalServerErrorException(error)
-      }
-    }
-    //donation exists, so check if it is safe to update it
-    else if (shouldAllowStatusChange(donation.status, newDonationStatus)) {
-      try {
-        const updatedDonation = await this.prisma.donation.update({
-          where: {
-            id: donation.id,
-          },
-          data: {
-            status: newDonationStatus,
-            amount: paymentData.netAmount,
-            extCustomerId: paymentData.stripeCustomerId,
-            extPaymentMethodId: paymentData.paymentMethodId,
-            extPaymentIntentId: paymentData.paymentIntentId,
-            billingName: paymentData.billingName,
-            billingEmail: paymentData.billingEmail,
-          },
-          select: donationNotificationSelect,
-        })
-
-        this.notificationService.sendNotification('successfulDonation', {
-          ...updatedDonation,
-          person: donation.person,
-        })
-      } catch (error) {
-        Logger.error(
-          `Error wile updating donation with paymentIntentId: ${paymentData.paymentIntentId} in database. Error is: ${error}`,
-        )
-        throw new InternalServerErrorException(error)
-      }
-    }
-    //donation exists but we need to skip because previous status is from later event than the incoming
-    else {
-      Logger.warn(
-        `Skipping update of donation with paymentIntentId: ${paymentData.paymentIntentId}
-        and status: ${newDonationStatus} because the event comes after existing donation with status: ${donation.status}`,
-      )
-    }
-
-    //For successful donations we will also need to link them to user and add donation wish:
-    if (newDonationStatus === DonationStatus.succeeded) {
-      Logger.debug('metadata?.isAnonymous = ' + metadata?.isAnonymous)
-
-      if (metadata?.isAnonymous != 'true') {
-        await this.prisma.donation.update({
-          where: { id: donation.id },
-          data: {
-            person: {
-              connect: {
-                email: paymentData.billingEmail,
-              },
-            },
-          },
-        })
-      }
-    }
-
-    return donation.id
-  }
-
-  async createDonationWish(wish: string, donationId: string, campaignId: string) {
-    const person = await this.prisma.donation.findUnique({ where: { id: donationId } }).person()
-    await this.prisma.donationWish.create({
-      data: {
-        message: wish,
-        donationId,
-        campaignId,
-        personId: person?.id,
-      },
-    })
-  }
-
   async donateToCampaign(campaign: Campaign, paymentData: PaymentData) {
     Logger.debug('Update amounts with successful donation', {
       campaignId: campaign.id,
@@ -588,8 +403,6 @@ export class CampaignService {
     const vault = await this.getCampaignVault(campaign.id)
     if (vault) {
       await this.vaultService.incrementVaultAmount(vault.id, paymentData.netAmount)
-    } else {
-      //vault is already checked and created if not existing in updateDonationPayment() above
     }
   }
 

apps/api/src/config/validation.config.ts

@@ -11,7 +11,7 @@ const globalValidationPipe = new ValidationPipe({
     excludeExtraneousValues: true,
   },
   stopAtFirstError: false,
-  forbidUnknownValues: true,
+  forbidUnknownValues: false,
   disableErrorMessages: false,
   exceptionFactory: (errors) => new BadRequestException(errors),
   validationError: { target: false, value: false },

apps/api/src/domain/generated/donation/dto/create-donation.dto.ts

@@ -4,7 +4,7 @@ import { ApiProperty } from '@nestjs/swagger'
 export class CreateDonationDto {
   @ApiProperty({ enum: DonationType })
   type: DonationType
-  extCustomerId: string
+  extCustomerId?: string
   extPaymentIntentId: string
   extPaymentMethodId: string
   billingEmail?: string

apps/api/src/domain/generated/donation/entities/donation.entity.ts

@@ -8,7 +8,7 @@ export class Donation {
   status: DonationStatus
   provider: PaymentProvider
   targetVaultId: string
-  extCustomerId: string
+  extCustomerId: string | null
   extPaymentIntentId: string
   extPaymentMethodId: string
   createdAt: Date

apps/api/src/domain/generated/recurringDonation/dto/create-recurringDonation.dto.ts

@@ -5,5 +5,5 @@ export class CreateRecurringDonationDto {
   @ApiProperty({ enum: RecurringDonationStatus })
   status: RecurringDonationStatus
   extSubscriptionId: string
-  extCustomerId?: string
+  extCustomerId: string
 }

apps/api/src/domain/generated/recurringDonation/entities/recurringDonation.entity.ts

@@ -8,7 +8,7 @@ export class RecurringDonation {
   vaultId: string
   personId: string
   extSubscriptionId: string
-  extCustomerId: string | null
+  extCustomerId: string
   createdAt: Date
   updatedAt: Date | null
   amount: number