Consolidate accidentally doubled organizations tables

Author: benkoppe

apps/dashboard/convex/_generated/ai/ai-files.state.json

@@ -72,12 +72,12 @@ type ParsedEmail = {
 
 type StoredParsedEmail = ParsedEmail & {
   listservId?: Id<"listservs">;
-  organizationId?: Id<"organizations">;
+  organizationId?: Id<"orgs">;
 };
 
 type MatchableListserv = {
   _id: Id<"listservs">;
-  organizationId?: Id<"organizations">;
+  organizationId?: Id<"orgs">;
   listEmail: string;
   senderEmails: string[];
 };
@@ -374,7 +374,7 @@ export const storeParsedMessages = internalMutation({
         gmailMessageId: v.string(),
         threadId: v.optional(v.string()),
         listservId: v.optional(v.id("listservs")),
-        organizationId: v.optional(v.id("organizations")),
+        organizationId: v.optional(v.id("orgs")),
         sender: v.string(),
         senderEmail: v.string(),
         to: v.array(v.string()),

apps/dashboard/convex/_generated/ai/guidelines.md

@@ -83,7 +83,7 @@ type ParsedItem = {
 
 type SourceMessage = Doc<"listservMessages"> & {
   listserv?: Doc<"listservs"> | null;
-  organization?: Doc<"organizations"> | null;
+  organization?: Doc<"orgs"> | null;
 };
 
 export const runParseNow = action({
@@ -200,10 +200,28 @@ export const publishEvent = mutation({
   args: { token: v.string(), eventId: v.id("events") },
   handler: async (ctx, args) => {
     requireAdminToken(args.token);
-    await ctx.db.patch(args.eventId, {
-      visibility: "published",
-      updatedAt: Date.now(),
-    });
+    const now = Date.now();
+
+    await ctx.db.patch(args.eventId, { visibility: "published", updatedAt: now });
+
+    // Insert the eventOrgs join so the org name appears in the feed post header.
+    // organizationId now points directly to `orgs`, so no cross-table sync needed.
+    const event = await ctx.db.get(args.eventId);
+    if (!event?.organizationId) return;
+
+    const existing = await ctx.db
+      .query("eventOrgs")
+      .withIndex("by_event", (q) => q.eq("eventId", args.eventId))
+      .filter((q) => q.eq(q.field("orgId"), event.organizationId!))
+      .unique();
+
+    if (existing === null) {
+      await ctx.db.insert("eventOrgs", {
+        eventId: args.eventId,
+        orgId: event.organizationId,
+        eventCreationTime: event._creationTime,
+      });
+    }
   },
 });
 
@@ -596,7 +614,7 @@ function getGeminiConfig(): AIConfig | null {
 function buildParsePrompt(message: SourceMessage) {
   const input = {
     sourceOrganization: message.organization?.name,
-    sourceOrganizationType: message.organization?.type,
+    sourceOrganizationType: message.organization?.orgType,
     sourceEmail: message.senderEmail,
     sourceName: message.listserv?.name,
     subject: message.subject,

apps/dashboard/convex/ingestion.ts

@@ -17,7 +17,8 @@ export default defineSchema({
     isSeed: v.optional(v.boolean()),
   }).index("by_user", ["userId"]),
 
-  // Organizations (clubs) — first-class entity for follows + org page
+  // Organizations (clubs) — canonical table for all org data, user-facing and
+  // admin/listserv pipeline. Merged from the former `organizations` table.
   orgs: defineTable({
     slug: v.string(),
     name: v.string(),
@@ -28,8 +29,21 @@ export default defineSchema({
     websiteUrl: v.optional(v.string()),
     email: v.optional(v.string()),
     isVerified: v.boolean(),
-    loopSummary: v.optional(v.string()), // populated by seed/AI branch later
+    loopSummary: v.optional(v.string()),
     isSeed: v.optional(v.boolean()),
+    // Fields from the former `organizations` admin table:
+    orgType: v.optional(
+      v.union(
+        v.literal("club"),
+        v.literal("department"),
+        v.literal("official"),
+        v.literal("publication"),
+        v.literal("company"),
+        v.literal("other"),
+      ),
+    ),
+    orgStatus: v.optional(v.union(v.literal("active"), v.literal("hidden"))),
+    updatedAt: v.optional(v.number()),
   })
     .index("by_slug", ["slug"])
     .index("by_seed", ["isSeed"])
@@ -91,27 +105,6 @@ export default defineSchema({
     .index("by_listserv", ["listserv"])
     .index("by_seed", ["isSeed"]),
 
-  organizations: defineTable({
-    name: v.string(),
-    slug: v.string(),
-    type: v.union(
-      v.literal("club"),
-      v.literal("department"),
-      v.literal("official"),
-      v.literal("publication"),
-      v.literal("company"),
-      v.literal("other"),
-    ),
-    description: v.optional(v.string()),
-    website: v.optional(v.string()),
-    tags: v.array(v.string()),
-    status: v.union(v.literal("active"), v.literal("hidden")),
-    createdAt: v.number(),
-    updatedAt: v.number(),
-  })
-    .index("by_slug", ["slug"])
-    .index("by_status", ["status"]),
-
   listservCandidates: defineTable({
     email: v.string(),
     displayName: v.optional(v.string()),
@@ -140,7 +133,7 @@ export default defineSchema({
     displayName: v.optional(v.string()),
     listEmail: v.string(),
     senderEmails: v.array(v.string()),
-    organizationId: v.optional(v.id("organizations")),
+    organizationId: v.optional(v.id("orgs")),
     sourceType: v.optional(
       v.union(
         v.literal("lyris"),
@@ -208,7 +201,7 @@ export default defineSchema({
     gmailMessageId: v.string(),
     threadId: v.optional(v.string()),
     listservId: v.optional(v.id("listservs")),
-    organizationId: v.optional(v.id("organizations")),
+    organizationId: v.optional(v.id("orgs")),
     sender: v.string(),
     senderEmail: v.string(),
     to: v.array(v.string()),
@@ -341,12 +334,12 @@ export default defineSchema({
     adminNonce: v.optional(v.boolean()),
   }).index("by_state", ["state"]),
 
-  // One row per listserv item
+  // One row per parsed listserv event
   events: defineTable({
     listservEmailId: v.optional(v.id("listservEmails")), // legacy link to the listserv email data
     sourceMessageId: v.optional(v.id("listservMessages")),
     listservId: v.optional(v.id("listservs")),
-    organizationId: v.optional(v.id("organizations")),
+    organizationId: v.optional(v.id("orgs")),
     listserv: v.string(),
     listservSection: v.string(),
 
@@ -430,7 +423,6 @@ export default defineSchema({
     tags: v.array(v.string()),
     targetAudience: v.optional(
       v.union(
-        // decide if we need all or define more
         v.literal("all"),
         v.literal("first_year"),
         v.literal("women_nonbinary"),

apps/dashboard/convex/parser.ts

@@ -13,13 +13,15 @@ const ORG_TYPES = v.union(
   v.literal("other"),
 );
 
+type OrgType = "club" | "department" | "official" | "publication" | "company" | "other";
+
 export const overview = query({
   args: { token: v.string() },
   handler: async (ctx, args) => {
     requireAdminToken(args.token);
 
     const [organizations, listservs, messages] = await Promise.all([
-      ctx.db.query("organizations").order("asc").collect(),
+      ctx.db.query("orgs").order("asc").collect(),
       ctx.db.query("listservs").order("asc").collect(),
       ctx.db
         .query("listservMessages")
@@ -91,7 +93,7 @@ export const createOrganization = mutation({
   },
   handler: async (ctx, args) => {
     requireAdminToken(args.token);
-    return getOrCreateOrganization(ctx, {
+    return getOrCreateOrg(ctx, {
       name: args.name,
       type: args.type,
       description: cleanOptional(args.description),
@@ -104,7 +106,7 @@ export const createOrganization = mutation({
 export const updateOrganization = mutation({
   args: {
     token: v.string(),
-    organizationId: v.id("organizations"),
+    organizationId: v.id("orgs"),
     name: v.string(),
     type: ORG_TYPES,
     description: v.optional(v.string()),
@@ -117,11 +119,11 @@ export const updateOrganization = mutation({
     await ctx.db.patch(args.organizationId, {
       name: args.name.trim(),
       slug: slugify(args.name),
-      type: args.type,
-      description: cleanOptional(args.description),
-      website: cleanOptional(args.website),
+      orgType: args.type,
+      description: cleanOptional(args.description) ?? "",
+      websiteUrl: cleanOptional(args.website),
       tags: args.tags ?? [],
-      status: args.status,
+      orgStatus: args.status,
       updatedAt: Date.now(),
     });
   },
@@ -131,7 +133,7 @@ export const assignSender = mutation({
   args: {
     token: v.string(),
     senderEmail: v.string(),
-    organizationId: v.optional(v.id("organizations")),
+    organizationId: v.optional(v.id("orgs")),
     organizationName: v.optional(v.string()),
     organizationType: v.optional(ORG_TYPES),
     sourceName: v.optional(v.string()),
@@ -152,7 +154,7 @@ export const assignSender = mutation({
     const suggestion = suggestSource(senderEmail);
     const organizationId =
       args.organizationId ??
-      (await getOrCreateOrganization(ctx, {
+      (await getOrCreateOrg(ctx, {
         name:
           cleanOptional(args.organizationName) ?? suggestion.organizationName,
         type: args.organizationType ?? suggestion.organizationType,
@@ -256,7 +258,7 @@ export const assignSourceOrganization = mutation({
   args: {
     token: v.string(),
     listservId: v.id("listservs"),
-    organizationId: v.id("organizations"),
+    organizationId: v.id("orgs"),
   },
   handler: async (ctx, args) => {
     requireAdminToken(args.token);
@@ -275,42 +277,36 @@ export const assignSourceOrganization = mutation({
   },
 });
 
-async function getOrCreateOrganization(
+async function getOrCreateOrg(
   ctx: MutationCtx,
   params: {
     name: string;
-    type:
-      | "club"
-      | "department"
-      | "official"
-      | "publication"
-      | "company"
-      | "other";
+    type: OrgType;
     description?: string;
     website?: string;
     tags: string[];
   },
-): Promise<Id<"organizations">> {
+): Promise<Id<"orgs">> {
   const name = params.name.trim();
   if (!name) throw new Error("Organization name is required.");
 
   const slug = slugify(name);
   const existing = await ctx.db
-    .query("organizations")
+    .query("orgs")
     .withIndex("by_slug", (q) => q.eq("slug", slug))
     .unique();
   if (existing) return existing._id;
 
   const now = Date.now();
-  return ctx.db.insert("organizations", {
+  return ctx.db.insert("orgs", {
     name,
     slug,
-    type: params.type,
-    description: params.description,
-    website: params.website,
+    orgType: params.type,
+    description: params.description ?? "",
+    websiteUrl: params.website,
     tags: params.tags,
-    status: "active",
-    createdAt: now,
+    isVerified: false,
+    orgStatus: "active",
     updatedAt: now,
   });
 }