validate on notificationFields

Author: nyoung697

src/component/internal.ts

@@ -3,6 +3,7 @@ import { internalAction, internalMutation } from "./functions.js";
 import { internal } from "./_generated/api.js";
 import { Id } from "./_generated/dataModel.js";
 import { ensureCoordinator } from "./helpers.js";
+import { notificationFields } from "./schema.js";
 
 export const markNotificationState = internalMutation({
   args: {
@@ -148,21 +149,17 @@ export const coordinateSendingPushNotifications = internalMutation({
               _contentAvailable: n.metadata._contentAvailable ?? undefined,
               data: n.metadata.data ?? undefined,
               title: n.metadata.title,
-              subtitle: n.metadata.subtitle ?? undefined,
               body: n.metadata.body ?? undefined,
               ttl: n.metadata.ttl ?? undefined,
               expiration: n.metadata.expiration ?? undefined,
               priority: n.metadata.priority ?? undefined,
-              // subtitle: n.metadata.subtitle ?? undefined,
+              subtitle: n.metadata.subtitle ?? undefined,
               sound: n.metadata.sound ?? "default",
               badge: n.metadata.badge ?? undefined,
               interruptionLevel: n.metadata.interruptionLevel ?? undefined,
               channelId: n.metadata.channelId ?? undefined,
               categoryId: n.metadata.categoryId ?? undefined,
               mutableContent: n.metadata.mutableContent ?? undefined,
-              // sound: n.metadata.sound ?? "default",
-              // data: n.metadata.data ?? undefined,
-              categoryIdentifier: n.metadata.categoryIdentifier ?? undefined,
             },
             _id: n._id,
           };
@@ -207,13 +204,7 @@ export const action_sendPushNotifications = internalAction({
       v.object({
         message: v.object({
           to: v.string(),
-          title: v.string(),
-          subtitle: v.optional(v.string()),
-          body: v.optional(v.string()),
-          sound: v.string(),
-          data: v.optional(v.any()),
-          channelId: v.optional(v.string()),
-          categoryIdentifier: v.optional(v.string()),
+          ...notificationFields
         }),
         _id: v.id("notifications"),
       })

src/component/schema.ts

@@ -7,21 +7,17 @@ export const notificationFields = {
   _contentAvailable: v.optional(v.boolean()),
   data: v.optional(v.any()),
   title: v.string(),
-  subtitle: v.optional(v.string()),
   body: v.optional(v.string()),
   ttl: v.optional(v.number()),
   expiration: v.optional(v.number()),
   priority: v.optional(v.union(v.literal("default"), v.literal("normal"), v.literal("high"))),
-  // subtitle: v.optional(v.string()),
+  subtitle: v.optional(v.string()),
   sound: v.optional(v.union(v.string(), v.null())),
   badge: v.optional(v.number()),
   interruptionLevel: v.optional(v.union(v.literal("active"), v.literal("critical"), v.literal("passive"), v.literal("time-sensitive"))),
   channelId: v.optional(v.string()),
   categoryId: v.optional(v.string()),
   mutableContent: v.optional(v.boolean()),
-  // sound: v.optional(v.string()),
-  // data: v.optional(v.any()),
-  categoryIdentifier: v.optional(v.string()),
 };
 
 /**