Refactor email sending to use priority queue for approval notifications and enhance RSVP handling. Update RSVP logic to require approval only for GOING responses and streamline email data structure for improved iCal generation.

Author: probablyangg

src/app/api/approval/rsvp/route.ts

@@ -4,7 +4,7 @@ import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 import type { RSVP_TYPE } from "@prisma/client";
 import { RSVP_APPROVAL_STATUS } from "@prisma/client";
-import { sendEventEmail } from "src/utils/email/send";
+import type { EmailType } from "src/components/Email";
 
 type CreateApprovalRequestBody = {
   userId: string;
@@ -154,22 +154,44 @@ export async function POST(req: NextRequest) {
 
     // Send notification emails to proposers
     try {
+      // Import the priority queue function
+      const { queuePriorityEmail } = await import("src/lib/queue");
+
+      // Transform event to match ServerEvent type (using type assertion for compatibility)
+      const serverEvent = {
+        ...event,
+        collections: [], // Add missing collections property
+        community: null, // Add missing community property
+      } as any; // Type assertion to bypass strict typing
+
+      // Prepare proposer emails for priority queue
       const proposerEmails = event.proposers
-        .map((p) => p.user.email)
-        .filter((email) => email) as string[];
-
-      for (const proposer of event.proposers) {
-        if (proposer.user.email) {
-          sendEventEmail({
-            receiver: proposer.user,
-            type: "approval-requested",
-            event: event,
-          }).catch((error) =>
-            console.error(
-              `Error sending approval request email to ${proposer.user.email}: ${error?.message}`
-            )
-          );
-        }
+        .filter((p) => p.user.email)
+        .map((proposer) => ({
+          event: serverEvent,
+          type: "approval-requested" as EmailType,
+          receiver: {
+            id: proposer.user.id,
+            email: proposer.user.email,
+            address: proposer.user.address,
+            nickname: proposer.user.nickname,
+            isBeta: proposer.user.isBeta,
+            profile: null, // User doesn't have profiles in this context
+          },
+        }));
+
+      // Queue as priority emails instead of regular emails
+      if (proposerEmails.length > 0) {
+        await queuePriorityEmail({
+          event: serverEvent,
+          creatorId: undefined, // No specific creator for approval requests
+          proposerEmails: proposerEmails,
+          attendeeEmails: [], // No attendee emails for approval requests
+        });
+
+        console.log(
+          `Queued ${proposerEmails.length} approval request emails as priority`
+        );
       }
     } catch (emailError) {
       console.error("Error sending notification emails:", emailError);
@@ -348,24 +370,48 @@ export async function PUT(req: NextRequest) {
     // Send notification email to the requester
     try {
       if (updatedRequest.user.email) {
+        const { queuePriorityEmail } = await import("src/lib/queue");
+
         const emailType =
           status === "APPROVED" ? "approval-approved" : "approval-rejected";
-        sendEventEmail({
-          receiver: updatedRequest.user,
-          type: emailType,
-          event: updatedRequest.event,
+
+        // Transform event to match ServerEvent type (using type assertion for compatibility)
+        const serverEvent = {
+          ...updatedRequest.event,
+          collections: [], // Add missing collections property
+          community: null, // Add missing community property
+        } as any; // Type assertion to bypass strict typing
+
+        // Prepare email for priority queue
+        const requesterEmail = {
+          event: serverEvent,
+          type: emailType as EmailType,
+          receiver: {
+            id: updatedRequest.user.id,
+            email: updatedRequest.user.email,
+            address: updatedRequest.user.address,
+            nickname: updatedRequest.user.nickname,
+            isBeta: updatedRequest.user.isBeta,
+            profile: updatedRequest.user.profiles?.[0] || null,
+          },
           // For approved requests, include the RSVP type for iCal generation
           approvalRsvpType:
             status === "APPROVED" &&
             ["GOING", "MAYBE", "NOT_GOING"].includes(approvalRequest.rsvpType)
               ? (approvalRequest.rsvpType as "GOING" | "MAYBE" | "NOT_GOING")
               : undefined,
-        }).catch((error) =>
-          console.error(
-            `Error sending approval ${status.toLowerCase()} email: ${
-              error?.message
-            }`
-          )
+        };
+
+        // Queue as priority email
+        await queuePriorityEmail({
+          event: serverEvent,
+          creatorId: undefined,
+          proposerEmails: [], // No proposer emails for responses
+          attendeeEmails: [requesterEmail], // Send to the requester
+        });
+
+        console.log(
+          `Queued approval ${status.toLowerCase()} email as priority`
         );
       }
     } catch (emailError) {

src/app/api/create/rsvp/route.ts

@@ -3,7 +3,7 @@ import { prisma } from "src/utils/db";
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 import { sendEventEmail } from "src/utils/email/send";
-import { RSVP_TYPE, type User } from "@prisma/client";
+import { RSVP_TYPE, RSVP_APPROVAL_STATUS, type User } from "@prisma/client";
 import { rsvpTypeToEmailType } from "src/utils/rsvpTypetoEmailType";
 import {
   scheduleReminderEmails,
@@ -70,8 +70,11 @@ export async function POST(req: NextRequest) {
           },
         });
 
-      if (existingApprovalRequest) {
-        // Return the status of existing approval request
+      if (
+        existingApprovalRequest &&
+        existingApprovalRequest.status === RSVP_APPROVAL_STATUS.PENDING
+      ) {
+        // Only block if there's a PENDING approval request
         return NextResponse.json({
           data: {
             status: "APPROVAL_PENDING",
@@ -83,15 +86,16 @@ export async function POST(req: NextRequest) {
         });
       }
 
-      // If user doesn't have an existing RSVP or approval request, they need to go through approval flow
-      if (!existingRsvp) {
+      // Only require approval for "GOING" RSVPs
+      // Users can freely RSVP as "MAYBE" or "NOT_GOING" without approval
+      if (rsvp.type === RSVP_TYPE.GOING && !existingRsvp) {
         return NextResponse.json(
           {
             data: {
               status: "APPROVAL_REQUIRED",
               eventId: rsvp.eventId,
               message:
-                "This event requires approval. Please use the approval request endpoint.",
+                "This event requires approval to RSVP as 'Going'. Please use the approval request endpoint.",
             },
           },
           { status: 400 }
@@ -127,18 +131,64 @@ export async function POST(req: NextRequest) {
         `User ${user.id} changing from GOING to ${rsvp.type} for event ${event.id}`
       );
 
+      // Safety check: existingRsvp should exist if wasGoing is true
+      if (!existingRsvp) {
+        console.error(
+          `User ${user.id} was marked as GOING but no existing RSVP found for event ${event.id}`
+        );
+        return NextResponse.json(
+          { error: "Invalid RSVP state - no existing RSVP found" },
+          { status: 500 }
+        );
+      }
+
       // Increment the event sequence to ensure calendar clients recognize the update
       await prisma.event.update({
         where: { id: event.id },
         data: { sequence: event.sequence + 1 },
       });
 
-      await prisma.rsvp.update({
-        where: { id: existingRsvp.id }, // Use existingRsvp.id which is guaranteed
-        data: { rsvpType: rsvp.type },
-      });
-      finalRsvpTypeForUser = rsvp.type;
-      emailTypeForUser = rsvpTypeToEmailType(finalRsvpTypeForUser, true); // Send update email
+      // For approval-required events: if user is changing to NOT_GOING, delete both RSVP and approval request
+      // This makes it simpler for the frontend - user starts completely fresh if they want to rejoin
+      if (event.requiresApproval && rsvp.type === RSVP_TYPE.NOT_GOING) {
+        try {
+          // Delete the RSVP record entirely
+          await prisma.rsvp.delete({
+            where: { id: existingRsvp.id },
+          });
+
+          // Delete any approval requests for this user/event
+          await prisma.rsvpApprovalRequest.deleteMany({
+            where: {
+              eventId: event.id,
+              userId: user.id,
+            },
+          });
+
+          console.log(
+            `Deleted RSVP and approval request for user ${user.id} on event ${event.id} (marked NOT_GOING)`
+          );
+          finalRsvpTypeForUser = RSVP_TYPE.NOT_GOING;
+          emailTypeForUser = rsvpTypeToEmailType(RSVP_TYPE.NOT_GOING, true); // Send update email
+        } catch (deleteError) {
+          console.error("Error deleting RSVP/approval request:", deleteError);
+          // Fallback to updating RSVP if deletion fails
+          await prisma.rsvp.update({
+            where: { id: existingRsvp.id },
+            data: { rsvpType: rsvp.type },
+          });
+          finalRsvpTypeForUser = rsvp.type;
+          emailTypeForUser = rsvpTypeToEmailType(finalRsvpTypeForUser, true);
+        }
+      } else {
+        // For non-approval events or non-NOT_GOING changes, just update the RSVP
+        await prisma.rsvp.update({
+          where: { id: existingRsvp.id },
+          data: { rsvpType: rsvp.type },
+        });
+        finalRsvpTypeForUser = rsvp.type;
+        emailTypeForUser = rsvpTypeToEmailType(finalRsvpTypeForUser, true); // Send update email
+      }
 
       // A spot potentially opened up, try to promote
       if (eventLimit > 0) {
@@ -150,6 +200,29 @@ export async function POST(req: NextRequest) {
       console.log(
         `User ${user.id} wants to RSVP as GOING for event ${event.id}`
       );
+
+      // For approval-required events, check if user needs approval to change to GOING
+      if (
+        event.requiresApproval &&
+        !rsvp.adminOverride &&
+        existingRsvp &&
+        !wasGoing
+      ) {
+        // User has existing RSVP but wasn't GOING, and now wants to be GOING
+        // They need approval for this change
+        return NextResponse.json(
+          {
+            data: {
+              status: "APPROVAL_REQUIRED",
+              eventId: rsvp.eventId,
+              message:
+                "This event requires approval to change your RSVP to 'Going'. Please use the approval request endpoint.",
+            },
+          },
+          { status: 400 }
+        );
+      }
+
       const currentGoingCount = event.rsvps.filter(
         (r) => r.rsvpType === RSVP_TYPE.GOING && r.attendeeId !== user.id // Exclude self if updating from Maybe->Going
       ).length;

src/app/api/profile/update-image/route.ts

@@ -1,4 +1,5 @@
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 import { auth } from "@clerk/nextjs/server";
 import { prisma } from "src/utils/db";
 import { getPublicS3Url } from "src/utils/s3";

src/app/api/query/getUserEvents/route.ts

@@ -1,4 +1,5 @@
-import { NextRequest, NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
 import { prisma } from "src/utils/db";
 import formatEvent from "src/utils/formatEvent";
 import { DateTime } from "luxon";

src/components/Card.tsx

@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 import { useEffect, useState } from "react";
 import { Article } from "./Article";
 import { Skeleton } from "./ui/skeleton";
-import { ClientEvent } from "src/types";
+import type { ClientEvent } from "src/types";
 import { WhoElseIsGoing } from "./Hero";
 
 export const CardTemplate = ({

src/components/Email/components/EventDetails.tsx

@@ -1,4 +1,4 @@
-import { ConvoEvent } from "../types";
+import type { ConvoEvent } from "../types";
 import { DateTime } from "luxon";
 
 interface EventDetailsProps {

src/components/Email/templates/Create.tsx

@@ -1,4 +1,4 @@
-import { EmailTemplateWithEventProps } from "../types";
+import type { EmailTemplateWithEventProps } from "../types";
 import { EmailWrapper } from "../components/EmailWrapper";
 import { EventDetails } from "../components/EventDetails";
 

src/components/Email/templates/DeletedProposer.tsx

@@ -1,4 +1,4 @@
-import { EmailTemplateWithEventProps } from "../types";
+import type { EmailTemplateWithEventProps } from "../types";
 import { EmailWrapper } from "../components/EmailWrapper";
 import { EventDetails } from "../components/EventDetails";
 

src/components/Email/templates/InviteGoing.tsx

@@ -1,4 +1,4 @@
-import { EmailTemplateWithEventProps } from "../types";
+import type { EmailTemplateWithEventProps } from "../types";
 import { EmailWrapper } from "../components/EmailWrapper";
 import { EventDetails } from "../components/EventDetails";
 import { StarryEyesEmoji } from "../components/EmailEmojis";

src/components/Email/templates/InviteMaybe.tsx

@@ -1,4 +1,4 @@
-import { EmailTemplateWithEventProps } from "../types";
+import type { EmailTemplateWithEventProps } from "../types";
 import { EmailWrapper } from "../components/EmailWrapper";
 import { EventDetails } from "../components/EventDetails";
 import { TongueStickingOutEmoji } from "../components/EmailEmojis";