From b5b126f05ddef36a5d659d84279403821ff95d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Fri, 30 Aug 2024 15:18:06 +0200 Subject: [PATCH] fix invites --- packages/db/src/services/project.service.ts | 4 ++++ packages/trpc/src/routers/organization.ts | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.ts index 7f05ac56..41d574bf 100644 --- a/packages/db/src/services/project.service.ts +++ b/packages/db/src/services/project.service.ts @@ -63,6 +63,9 @@ export async function getCurrentProjects(organizationSlug: string) { where: { organizationSlug, }, + orderBy: { + eventsCount: 'desc', + }, }), db.member.findMany({ where: { @@ -73,6 +76,7 @@ export async function getCurrentProjects(organizationSlug: string) { db.projectAccess.findMany({ where: { userId: session.userId, + organizationId: organizationSlug, }, }), ]); diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.ts index bd13402b..dbe0c4f6 100644 --- a/packages/trpc/src/routers/organization.ts +++ b/packages/trpc/src/routers/organization.ts @@ -29,9 +29,13 @@ export const organizationRouter = createTRPCRouter({ inviteUser: protectedProcedure .input(zInviteUser) .mutation(async ({ input, ctx }) => { - const userExists = await db.user.findUnique({ + const email = input.email.toLowerCase(); + const userExists = await db.user.findFirst({ where: { - email: input.email, + email: { + equals: email, + mode: 'insensitive', + }, }, }); @@ -39,7 +43,7 @@ export const organizationRouter = createTRPCRouter({ if (!userExists) { const ticket = await clerkClient.invitations.createInvitation({ - emailAddress: input.email, + emailAddress: email, notify: true, }); invitationId = ticket.id; @@ -47,7 +51,7 @@ export const organizationRouter = createTRPCRouter({ return db.member.create({ data: { - email: input.email, + email, organizationId: input.organizationSlug, role: input.role, invitedById: ctx.session.userId,