Tiffany/308 parse unfinalized donor offer

prisma/migrations/20260328061136_add_partner_signature_to_signoff/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "SignOff" ADD COLUMN     "partnerSignatureUrl" TEXT,
+ADD COLUMN     "partnerSignerName" TEXT;

prisma/schema.prisma

@@ -310,8 +310,10 @@ model SignOff {
   staffMemberName String
   partnerId       Int
   partnerName     String
+  partnerSignerName String?
   date            DateTime
   signatureUrl    String?
+  partnerSignatureUrl String?
 
   createdAt DateTime @default(now())
 

src/app/api/donorOffers/[donorOfferId]/csv/route.ts

@@ -0,0 +1,56 @@
+import { auth } from "@/auth";
+import DonorOfferService from "@/services/donorOfferService";
+import UserService from "@/services/userService";
+import {
+  ArgumentError,
+  AuthenticationError,
+  errorResponse,
+} from "@/util/errors";
+import { NextRequest, NextResponse } from "next/server";
+import { z } from "zod";
+
+const paramSchema = z.object({
+  donorOfferId: z.string().transform((val) => {
+    const parsed = parseInt(val, 10);
+    if (Number.isNaN(parsed)) {
+      throw new Error("donorOfferId must be a valid number");
+    }
+    return parsed;
+  }),
+});
+
+export async function GET(
+  _: NextRequest,
+  { params }: { params: Promise<{ donorOfferId: string }> }
+) {
+  try {
+    const session = await auth();
+    if (!session?.user) {
+      throw new AuthenticationError("Session required");
+    }
+
+    UserService.checkPermission(session.user, "offerWrite");
+
+    const resolvedParams = await params;
+    const parsed = paramSchema.safeParse(resolvedParams);
+    if (!parsed.success) {
+      throw new ArgumentError(parsed.error.message);
+    }
+
+    const { csv, fileName } =
+      await DonorOfferService.getUnfinalizedDonorOfferCsv(
+        parsed.data.donorOfferId
+      );
+
+    return new NextResponse(csv, {
+      status: 200,
+      headers: {
+        "Content-Type": "text/csv; charset=utf-8",
+        "Content-Disposition": `attachment; filename="${fileName}"`,
+        "Cache-Control": "no-store",
+      },
+    });
+  } catch (error) {
+    return errorResponse(error);
+  }
+}

src/app/api/reset/route.ts

@@ -17,19 +17,22 @@ async function resetDatabase() {
   const signOffs = await db.signOff.findMany({
     select: {
       signatureUrl: true,
+      partnerSignatureUrl: true,
     },
   });
 
   // Delete signatures from Azure Storage
   for (const signOff of signOffs) {
-    if (signOff.signatureUrl) {
+    const signatureUrls = [
+      signOff.signatureUrl,
+      signOff.partnerSignatureUrl,
+    ].filter(Boolean);
+
+    for (const signatureUrl of signatureUrls) {
       try {
-        await FileService.deleteSignature(signOff.signatureUrl);
+        await FileService.deleteSignature(signatureUrl!);
       } catch (error) {
-        console.warn(
-          `Failed to delete signature: ${signOff.signatureUrl}`,
-          error
-        );
+        console.warn(`Failed to delete signature: ${signatureUrl}`, error);
       }
     }
   }
@@ -75,4 +78,3 @@ export async function POST() {
     return errorResponse(error);
   }
 }
-

src/app/api/signOffs/[signOffId]/route.ts

@@ -24,12 +24,15 @@ const patchSchema = z.object({
   staffName: z.string().optional(),
   partnerId: z.number().int().positive().optional(),
   partnerName: z.string().optional(),
+  partnerSignerName: z.string().optional(),
   date: z
     .string()
     .transform((str) => new Date(str))
     .optional(),
   signatureUrl: z.string().optional(),
+  partnerSignatureUrl: z.string().optional(),
   allocations: z.array(z.number().int().positive()).optional(),
+  staffUserId: z.number().int().positive().optional(),
 });
 
 export async function GET(
@@ -85,6 +88,7 @@ export async function PATCH(
     }
 
     const form = await request.formData();
+    const userId = parseInt(session.user.id!);
     const formObj = {
       staffName:
         form.get("staffName") !== null
@@ -98,15 +102,24 @@ export async function PATCH(
         form.get("partnerName") !== null
           ? String(form.get("partnerName"))
           : undefined,
+      partnerSignerName:
+        form.get("partnerSignerName") !== null
+          ? String(form.get("partnerSignerName"))
+          : undefined,
       date: form.get("date") !== null ? String(form.get("date")) : undefined,
       signatureUrl:
         form.get("signatureUrl") !== null
           ? String(form.get("signatureUrl"))
           : undefined,
+      partnerSignatureUrl:
+        form.get("partnerSignatureUrl") !== null
+          ? String(form.get("partnerSignatureUrl"))
+          : undefined,
       allocations:
         form.getAll("allocation").length > 0
           ? form.getAll("allocation").map((val) => Number(val))
           : undefined,
+      staffUserId: userId,
     };
     const parsed = patchSchema.safeParse(formObj);
 

src/app/api/signOffs/route.ts

@@ -14,8 +14,10 @@ const createSignOffSchema = z.object({
   partnerId: z.number().int().positive(),
   staffName: z.string(),
   partnerName: z.string(),
+  partnerSignerName: z.string(),
   date: z.string().transform((str) => new Date(str)),
   signatureUrl: z.string(),
+  partnerSignatureUrl: z.string(),
   allocations: z.array(z.number()),
   staffUserId: z.number().int().positive().optional(),
 });
@@ -85,6 +87,15 @@ export async function POST(req: NextRequest) {
           ? String(form.get("partnerName"))
           : undefined,
       date: form.get("date") != null ? String(form.get("date")) : undefined,
+      partnerSignerName:
+        form.get("partnerSignerName") != null
+          ? String(form.get("partnerSignerName"))
+          : undefined,
+      partnerSignatureUrl:
+        form.get("partnerSignatureUrl") != null
+          ? String(form.get("partnerSignatureUrl"))
+          : undefined,
+
       signatureUrl:
         form.get("signatureUrl") != null
           ? String(form.get("signatureUrl"))

src/components/NotificationHandler.tsx

@@ -66,11 +66,13 @@ export default function NotificationHandler({
   const router = useRouter();
   const [client, setClient] = useState<Ably.Realtime | null>(null);
   const [notifications, setNotifications] = useState<UnifiedNotification[]>([]);
+  const activeSupportTab = searchParams.get("activeTab");
 
   const [chatUnreadCount, setChatUnreadCount] = useState(0);
 
   // Ensure that mirroring doesn't overwrite sessionStorage before loading
   const isHydrated = useRef(false);
+  const activeSupportTabRef = useRef(activeSupportTab);
 
   useEffect(() => {
     const realtime = getRealtimeClient();
@@ -129,6 +131,10 @@ export default function NotificationHandler({
     [apiClient, notifications]
   );
 
+  useEffect(() => {
+    activeSupportTabRef.current = activeSupportTab;
+  }, [activeSupportTab]);
+
   useEffect(() => {
     if (!user) {
       sessionStorage.removeItem("chat_notifications");
@@ -293,7 +299,7 @@ export default function NotificationHandler({
       const channelId = event.channel?.id ?? event.cid?.split(":")[1];
       if (!channelId) return;
 
-      if (searchParams.get("activeTab") === "Unresolved") return;
+      if (activeSupportTabRef.current === "Unresolved") return;
 
       const text = event.message?.text?.trim();
       const channelName =
@@ -357,7 +363,7 @@ export default function NotificationHandler({
 
     return () => {
       didInterrupt = true;
-      streamClient.off("notification.message_new", handleTicketMessage);
+      streamClient.off("message.new", handleTicketMessage);
       streamClient.off("notification.mark_read", handleMarkRead);
       streamClient
         .disconnectUser()