Merge pull request #367 from Merit-Systems/master

[Release] Email Campaigns, test fixes

Author: zdql

echo-control/package.json

@@ -55,6 +55,7 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-switch": "^1.2.5",
     "@radix-ui/react-tabs": "^1.1.13",
+    "@react-email/render": "^1.2.3",
     "@shikijs/core": "^3.11.0",
     "@shikijs/engine-javascript": "^3.11.0",
     "@shikijs/langs": "^3.11.0",

echo-control/prisma/migrations/20250910195326_add_outbound_email_table/migration.sql

@@ -0,0 +1,19 @@
+-- CreateTable
+CREATE TABLE "public"."outbound_emails_sent" (
+    "id" UUID NOT NULL,
+    "emailCampaignId" TEXT NOT NULL,
+    "userId" UUID NOT NULL,
+    "echoAppId" UUID,
+    "createdAt" TIMESTAMPTZ(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "outbound_emails_sent_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "outbound_emails_sent_emailCampaignId_idx" ON "public"."outbound_emails_sent"("emailCampaignId");
+
+-- AddForeignKey
+ALTER TABLE "public"."outbound_emails_sent" ADD CONSTRAINT "outbound_emails_sent_userId_fkey" FOREIGN KEY ("userId") REFERENCES "public"."users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."outbound_emails_sent" ADD CONSTRAINT "outbound_emails_sent_echoAppId_fkey" FOREIGN KEY ("echoAppId") REFERENCES "public"."echo_apps"("id") ON DELETE CASCADE ON UPDATE CASCADE;

echo-control/prisma/schema.prisma

@@ -10,34 +10,35 @@ datasource db {
 }
 
 model User {
-  id                   String               @id @default(uuid()) @db.Uuid
-  email                String               @unique
-  name                 String?
-  emailVerified        DateTime?
-  image                String?
-  isArchived           Boolean              @default(false)
-  archivedAt           DateTime?            @db.Timestamptz(6)
-  createdAt            DateTime             @default(now()) @db.Timestamptz(6)
-  updatedAt            DateTime             @updatedAt @db.Timestamptz(6)
-  totalPaid            Decimal              @default(0) @db.Decimal(65, 14)
-  totalSpent           Decimal              @default(0) @db.Decimal(65, 14)
-  admin                Boolean              @default(false)
-  referralGithubUserId String?              @db.Uuid
-  accounts             Account[]
-  sessions             Session[]
-  apiKeys              ApiKey[]
-  appMemberships       AppMembership[]
-  payments             Payment[]
-  refreshTokens        RefreshToken[]
-  transactions         Transaction[]
-  spendPoolUsage       UserSpendPoolUsage[]
-  ReferralCode         ReferralCode[]
-  appSessions          AppSession[]
-  Payout               Payout[]
-  githubLink           GithubLink?
-  latestTosVersion     Decimal?
-  latestPrivacyVersion Decimal?
+  id                       String               @id @default(uuid()) @db.Uuid
+  email                    String               @unique
+  name                     String?
+  emailVerified            DateTime?
+  image                    String?
+  isArchived               Boolean              @default(false)
+  archivedAt               DateTime?            @db.Timestamptz(6)
+  createdAt                DateTime             @default(now()) @db.Timestamptz(6)
+  updatedAt                DateTime             @updatedAt @db.Timestamptz(6)
+  totalPaid                Decimal              @default(0) @db.Decimal(65, 14)
+  totalSpent               Decimal              @default(0) @db.Decimal(65, 14)
+  admin                    Boolean              @default(false)
+  referralGithubUserId     String?              @db.Uuid
+  accounts                 Account[]
+  sessions                 Session[]
+  apiKeys                  ApiKey[]
+  appMemberships           AppMembership[]
+  payments                 Payment[]
+  refreshTokens            RefreshToken[]
+  transactions             Transaction[]
+  spendPoolUsage           UserSpendPoolUsage[]
+  ReferralCode             ReferralCode[]
+  appSessions              AppSession[]
+  Payout                   Payout[]
+  githubLink               GithubLink?
+  latestTosVersion         Decimal?
+  latestPrivacyVersion     Decimal?
   latestFreeCreditsVersion Decimal?
+  OutboundEmailSent        OutboundEmailSent[]
 
   @@map("users")
 }
@@ -100,11 +101,12 @@ model EchoApp {
   githubLink              GithubLink? // The GitHub link for this app (one-to-one)
   spendPools              SpendPool[] // Spend pools associated with this app
   ReferralCode            ReferralCode[]
-  currentReferralRewardId String?          @db.Uuid // Reference to current active referral reward
-  currentReferralReward   ReferralReward?  @relation("CurrentReferralReward", fields: [currentReferralRewardId], references: [id])
-  ReferralRewards         ReferralReward[] @relation("AppReferralRewards") // All referral rewards for this app
+  currentReferralRewardId String?             @db.Uuid // Reference to current active referral reward
+  currentReferralReward   ReferralReward?     @relation("CurrentReferralReward", fields: [currentReferralRewardId], references: [id])
+  ReferralRewards         ReferralReward[]    @relation("AppReferralRewards") // All referral rewards for this app
   appSessions             AppSession[]
   payouts                 Payout[]
+  OutboundEmailSent       OutboundEmailSent[]
 
   @@map("echo_apps")
 }
@@ -198,21 +200,21 @@ model AppSession {
 }
 
 model Payment {
-  id          String     @id @default(uuid()) @db.Uuid
-  paymentId   String     @unique
-  amount      Decimal    @db.Decimal(65, 14)
-  currency    String     @default("usd")
+  id          String            @id @default(uuid()) @db.Uuid
+  paymentId   String            @unique
+  amount      Decimal           @db.Decimal(65, 14)
+  currency    String            @default("usd")
   status      String
   source      EnumPaymentSource @default(stripe)
   description String?
-  isArchived  Boolean    @default(false)
-  archivedAt  DateTime?  @db.Timestamptz(6)
-  createdAt   DateTime   @default(now()) @db.Timestamptz(6)
-  updatedAt   DateTime   @updatedAt @db.Timestamptz(6)
-  userId      String     @db.Uuid
-  spendPoolId String?    @db.Uuid
-  spendPool   SpendPool? @relation(fields: [spendPoolId], references: [id])
-  user        User       @relation(fields: [userId], references: [id], onDelete: Cascade)
+  isArchived  Boolean           @default(false)
+  archivedAt  DateTime?         @db.Timestamptz(6)
+  createdAt   DateTime          @default(now()) @db.Timestamptz(6)
+  updatedAt   DateTime          @updatedAt @db.Timestamptz(6)
+  userId      String            @db.Uuid
+  spendPoolId String?           @db.Uuid
+  spendPool   SpendPool?        @relation(fields: [spendPoolId], references: [id])
+  user        User              @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@map("payments")
 }
@@ -254,20 +256,20 @@ model MarkUp {
 }
 
 model GithubLink {
-  id           String        @id @default(uuid()) @db.Uuid
-  githubId     Int
-  githubType   GithubType
-  githubUrl    String
-  description  String?
-  isArchived   Boolean       @default(false)
-  archivedAt   DateTime?     @db.Timestamptz(6)
-  createdAt    DateTime      @default(now()) @db.Timestamptz(6)
-  updatedAt    DateTime      @updatedAt @db.Timestamptz(6)
-  echoAppId    String?       @unique @db.Uuid
-  userId       String?       @unique @db.Uuid
-  echoApp      EchoApp?      @relation(fields: [echoAppId], references: [id], onDelete: Cascade)
-  user         User?         @relation(fields: [userId], references: [id], onDelete: Cascade)
-  Payout       Payout[]
+  id          String     @id @default(uuid()) @db.Uuid
+  githubId    Int
+  githubType  GithubType
+  githubUrl   String
+  description String?
+  isArchived  Boolean    @default(false)
+  archivedAt  DateTime?  @db.Timestamptz(6)
+  createdAt   DateTime   @default(now()) @db.Timestamptz(6)
+  updatedAt   DateTime   @updatedAt @db.Timestamptz(6)
+  echoAppId   String?    @unique @db.Uuid
+  userId      String?    @unique @db.Uuid
+  echoApp     EchoApp?   @relation(fields: [echoAppId], references: [id], onDelete: Cascade)
+  user        User?      @relation(fields: [userId], references: [id], onDelete: Cascade)
+  Payout      Payout[]
 
   @@map("github_links")
 }
@@ -414,18 +416,29 @@ model ReferralReward {
   @@map("referral_rewards")
 }
 
-
-
-
 model InFlightRequest {
-  id String @id @default(uuid()) @db.Uuid
-  userId String @db.Uuid
-  echoAppId String @db.Uuid
-  numberInFlight Int @default(0)
-  totalEscrowed Decimal @default(0.0) @db.Decimal(65, 14)
-  createdAt DateTime @default(now()) @db.Timestamptz(6)
-  updatedAt DateTime @updatedAt @db.Timestamptz(6)
+  id             String   @id @default(uuid()) @db.Uuid
+  userId         String   @db.Uuid
+  echoAppId      String   @db.Uuid
+  numberInFlight Int      @default(0)
+  totalEscrowed  Decimal  @default(0.0) @db.Decimal(65, 14)
+  createdAt      DateTime @default(now()) @db.Timestamptz(6)
+  updatedAt      DateTime @updatedAt @db.Timestamptz(6)
 
   @@unique([userId, echoAppId])
   @@map("in_flight_requests")
-}
+}
+
+model OutboundEmailSent {
+  id              String   @id @default(uuid()) @db.Uuid
+  emailCampaignId String
+  userId          String   @db.Uuid
+  echoAppId       String?  @db.Uuid
+  createdAt       DateTime @default(now()) @db.Timestamptz(6)
+
+  user    User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+  echoApp EchoApp? @relation(fields: [echoAppId], references: [id], onDelete: Cascade)
+
+  @@index([emailCampaignId])
+  @@map("outbound_emails_sent")
+}