From b955a62cd8c2ec16cc71f6ac93cb55ee14d7ebe2 Mon Sep 17 00:00:00 2001 From: Guy Ben-Aharon Date: Thu, 19 Feb 2026 14:54:57 +0200 Subject: [PATCH] fix: reuse getTenantId func --- packages/backend/convex/tenants.ts | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/packages/backend/convex/tenants.ts b/packages/backend/convex/tenants.ts index 0c17351..a4f52da 100644 --- a/packages/backend/convex/tenants.ts +++ b/packages/backend/convex/tenants.ts @@ -71,17 +71,8 @@ export const create = mutation({ export const getGeneral = query({ args: {}, handler: async (ctx) => { - const user = await getUser(ctx); - const membership = await ctx.db - .query("accountMembers") - .withIndex("by_user", (q) => q.eq("userId", user._id)) - .first(); - if (!membership) return null; - - const tenant = await ctx.db - .query("tenants") - .withIndex("by_account", (q) => q.eq("accountId", membership.accountId)) - .first(); + const tenantId = await getTenantIdFromJwt(ctx); + const tenant = await ctx.db.get(tenantId); if (!tenant) return null; return { @@ -99,20 +90,9 @@ export const updateGeneral = mutation({ description: v.optional(v.string()), }, handler: async (ctx, args) => { - const user = await getUser(ctx); - const membership = await ctx.db - .query("accountMembers") - .withIndex("by_user", (q) => q.eq("userId", user._id)) - .first(); - if (!membership) throw new Error("No account found"); - - const tenant = await ctx.db - .query("tenants") - .withIndex("by_account", (q) => q.eq("accountId", membership.accountId)) - .first(); - if (!tenant) throw new Error("Tenant not found"); + const tenantId = await getTenantIdFromJwt(ctx); - await ctx.db.patch(tenant._id, { + await ctx.db.patch(tenantId, { name: args.name, description: args.description ?? "", updatedAt: Date.now(),