Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: improve zod parser

Marc Seitzdfb2e64ffe86
diff --git a/ee/features/conversations/api/team-faqs-route.ts b/ee/features/conversations/api/team-faqs-route.ts
index 3cf8d059..8bf247ff 100644
--- a/ee/features/conversations/api/team-faqs-route.ts
+++ b/ee/features/conversations/api/team-faqs-route.ts
@@ -122,30 +122,32 @@ const routeHandlers = {
}
}
- // Validate that referenced messages (if any) belong to the same conversation/dataroom
- if (
- data.sourceConversationId &&
- (data.questionMessageId || data.answerMessageId)
- ) {
+ // Validate that referenced messages (if any) belong to this dataroom (and conversation, if provided)
+ const messageIds = [data.questionMessageId, data.answerMessageId].filter(
+ Boolean,
+ ) as string[];
+
+ if (messageIds.length > 0) {
const msgs = await prisma.message.findMany({
where: {
- id: {
- in: [data.questionMessageId, data.answerMessageId].filter(
- Boolean,
- ) as string[],
+ id: { in: messageIds },
+ conversation: {
+ dataroomId,
+ ...(data.sourceConversationId
+ ? { id: data.sourceConversationId }
+ : {}),
},
- conversation: { id: data.sourceConversationId, dataroomId },
},
select: { id: true },
});
- const providedCount = [
- data.questionMessageId,
- data.answerMessageId,
- ].filter(Boolean).length;
- if (msgs.length !== providedCount) {
+
+ if (msgs.length !== messageIds.length) {
return res.status(400).json({
error:
- "Message references must belong to the specified conversation and dataroom",
+ "Message references must belong to the dataroom" +
+ (data.sourceConversationId
+ ? " and the specified conversation"
+ : ""),
});
}
}
diff --git a/ee/features/conversations/lib/schemas/faq.ts b/ee/features/conversations/lib/schemas/faq.ts
index 9db3edcd..b54b862f 100644
--- a/ee/features/conversations/lib/schemas/faq.ts
+++ b/ee/features/conversations/lib/schemas/faq.ts
@@ -9,31 +9,71 @@ const baseFAQSchema = z.object({
answer: z
.string()
.min(10, "Answer must be at least 10 characters")
- .max(2000, "Answer too long"),
+ .max(1000, "Answer too long"),
visibilityMode: z.enum(["PUBLIC_DATAROOM", "PUBLIC_LINK", "PUBLIC_DOCUMENT"]),
});
// Schema for publishing a new FAQ
-export const publishFAQSchema = baseFAQSchema.extend({
- originalQuestion: z.string().optional(),
- linkId: z.string().cuid("Invalid link ID format").optional(),
- dataroomDocumentId: z.string().cuid("Invalid document ID format").optional(),
- sourceConversationId: z
- .string()
- .cuid("Invalid conversation ID format")
- .optional(),
- questionMessageId: z
- .string()
- .cuid("Invalid question message ID format")
- .optional(),
- answerMessageId: z
- .string()
- .cuid("Invalid answer message ID format")
- .optional(),
- isAnonymized: z.boolean().default(true),
- documentPageNumber: z.number().int().min(1).optional(),
- documentVersionNumber: z.number().int().min(1).optional(),
-});
+export const publishFAQSchema = baseFAQSchema
+ .extend({
+ originalQuestion: z.string().optional(),
+ linkId: z.string().cuid("Invalid link ID format").optional(),
+ dataroomDocumentId: z
+ .string()
+ .cuid("Invalid document ID format")
+ .optional(),
+ sourceConversationId: z
+ .string()
+ .cuid("Invalid conversation ID format")
+ .optional(),
+ questionMessageId: z
+ .string()
+ .cuid("Invalid question message ID format")
+ .optional(),
+ answerMessageId: z
+ .string()
+ .cuid("Invalid answer message ID format")
+ .optional(),
+ isAnonymized: z.boolean().default(true),
+ documentPageNumber: z.number().int().min(1).optional(),
+ documentVersionNumber: z.number().int().min(1).optional(),
+ })
+ .superRefine((data, ctx) => {
+ if (data.visibilityMode === "PUBLIC_LINK" && !data.linkId) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: "Link ID is required for link visibility",
+ path: ["linkId"],
+ });
+ }
+ if (data.visibilityMode === "PUBLIC_DOCUMENT" && !data.dataroomDocumentId) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: "Document ID is required for document visibility",
+ path: ["dataroomDocumentId"],
+ });
+ }
+ if (
+ (data.documentPageNumber != null || data.documentVersionNumber != null) &&
+ !data.dataroomDocumentId
+ ) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: "Document page/version requires a document",
+ path: ["dataroomDocumentId"],
+ });
+ }
+ if (
+ (data.questionMessageId || data.answerMessageId) &&
+ !data.sourceConversationId
+ ) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: "Message references require a source conversation",
+ path: ["sourceConversationId"],
+ });
+ }
+ });
// Schema for updating an existing FAQ (all fields optional except where business logic requires)
export const updateFAQSchema = z.object({
@@ -45,7 +85,7 @@ export const updateFAQSchema = z.object({
answer: z
.string()
.min(10, "Answer must be at least 10 characters")
- .max(2000, "Answer too long")
+ .max(1000, "Answer too long")
.optional(),
visibilityMode: z
.enum(["PUBLIC_DATAROOM", "PUBLIC_LINK", "PUBLIC_DOCUMENT"])