delete rsvp request and rsvp when user selects 'not going'; use priorityemails for all rsvp types

Author: probablyangg

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

@@ -154,8 +154,8 @@ export async function POST(req: NextRequest) {
 
     // Send notification emails to proposers
     try {
-      // Import the priority queue function
-      const { queuePriorityEmail } = await import("src/lib/queue");
+      // Import the immediate priority email function
+      const { sendPriorityEmailImmediately } = await import("src/lib/queue");
 
       // Transform event to match ServerEvent type (using type assertion for compatibility)
       const serverEvent = {
@@ -182,15 +182,15 @@ export async function POST(req: NextRequest) {
 
       // Queue as priority emails instead of regular emails
       if (proposerEmails.length > 0) {
-        await queuePriorityEmail({
+        await sendPriorityEmailImmediately({
           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`
+          `Sent ${proposerEmails.length} approval request emails immediately as priority`
         );
       }
     } catch (emailError) {
@@ -370,7 +370,7 @@ 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 { sendPriorityEmailImmediately } = await import("src/lib/queue");
 
         const emailType =
           status === "APPROVED" ? "approval-approved" : "approval-rejected";
@@ -402,16 +402,16 @@ export async function PUT(req: NextRequest) {
               : undefined,
         };
 
-        // Queue as priority email
-        await queuePriorityEmail({
+        // Send as immediate priority email
+        await sendPriorityEmailImmediately({
           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`
+          `Sent approval ${status.toLowerCase()} email immediately as priority`
         );
       }
     } catch (emailError) {

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

@@ -112,7 +112,9 @@ export async function POST(req: NextRequest) {
 
     // 2. Determine state and initialize variables
     const eventLimit = event.limit;
-    const wasGoing = existingRsvp?.rsvpType === RSVP_TYPE.GOING;
+    const wasGoing =
+      existingRsvp?.rsvpType === RSVP_TYPE.GOING ||
+      existingRsvp?.rsvpType === RSVP_TYPE.MAYBE;
     const isNowGoing = rsvp.type === RSVP_TYPE.GOING;
     const isChangingToMaybeOrNotGoing =
       rsvp.type === RSVP_TYPE.MAYBE || rsvp.type === RSVP_TYPE.NOT_GOING;

src/components/EventPage/EventWrapper.tsx

@@ -87,6 +87,16 @@ const EventWrapper = ({
       {
         onSuccess: (data) => {
           console.log("RSVP Update successful in component:", data);
+
+          // Handle approval required response
+          if (data.status === "APPROVAL_REQUIRED") {
+            console.log("Approval required, opening approval request modal");
+            setIsConfirmCredenzaOpen(false);
+            setIsApprovalRequestOpen(true);
+            return;
+          }
+
+          // Handle normal success
           setIsConfirmCredenzaOpen(false);
           setPendingRsvpType(null);
         },

src/hooks/useUpdateRsvp.ts

@@ -8,8 +8,9 @@ type RsvpMutationVariables = {
 };
 
 type RsvpApiResponse = {
-  status: "SUCCESS" | "WAITLISTED";
+  status: "SUCCESS" | "WAITLISTED" | "APPROVAL_REQUIRED";
   eventId: string;
+  message?: string;
 };
 
 const useUpdateRsvp = () => {
@@ -39,14 +40,26 @@ const useUpdateRsvp = () => {
       }),
     });
 
+    const result = await response.json();
+
+    // Handle special case where approval is required
     if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}));
+      // Check if this is an "APPROVAL_REQUIRED" response
+      if (
+        response.status === 400 &&
+        result.data?.status === "APPROVAL_REQUIRED"
+      ) {
+        // Return the approval required data instead of throwing an error
+        return result.data;
+      }
+
+      // For other errors, throw as usual
+      const errorData = result || {};
       throw new Error(
         errorData?.error || `HTTP error! status: ${response.status}`
       );
     }
 
-    const result = await response.json();
     return result.data as RsvpApiResponse;
   };