refactoring and more work with clerk

apps/web/src/server/api/routers/dashboard.ts

@@ -1,5 +1,5 @@
 import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
-import { db } from '@/server/db';
+import { db, getId } from '@/server/db';
 import { PrismaError } from 'prisma-error-enum';
 import { z } from 'zod';
 
@@ -61,12 +61,15 @@ export const dashboardRouter = createTRPCRouter({
       z.object({
         name: z.string(),
         projectId: z.string(),
+        organizationSlug: z.string(),
       })
     )
-    .mutation(async ({ input: { projectId, name } }) => {
+    .mutation(async ({ input: { organizationSlug, projectId, name } }) => {
       return db.dashboard.create({
         data: {
+          id: await getId('dashboard', name),
           project_id: projectId,
+          organization_slug: organizationSlug,
           name,
         },
       });

apps/web/src/server/api/routers/organization.ts

@@ -1,8 +1,6 @@
 import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
-import {
-  getCurrentOrganization,
-  getOrganizationBySlug,
-} from '@/server/services/organization.service';
+import { getOrganizationBySlug } from '@/server/services/organization.service';
+import { zInviteUser } from '@/utils/validation';
 import { clerkClient } from '@clerk/nextjs';
 import { z } from 'zod';
 
@@ -10,7 +8,7 @@ export const organizationRouter = createTRPCRouter({
   list: protectedProcedure.query(() => {
     return clerkClient.organizations.getOrganizationList();
   }),
-  first: protectedProcedure.query(() => getCurrentOrganization()),
+  // first: protectedProcedure.query(() => getCurrentOrganization()),
   get: protectedProcedure
     .input(
       z.object({
@@ -32,4 +30,20 @@ export const organizationRouter = createTRPCRouter({
         name: input.name,
       });
     }),
+  inviteUser: protectedProcedure
+    .input(zInviteUser)
+    .mutation(async ({ input, ctx }) => {
+      const organization = await getOrganizationBySlug(input.organizationSlug);
+
+      if (!organization) {
+        throw new Error('Organization not found');
+      }
+
+      return clerkClient.organizations.createOrganizationInvitation({
+        organizationId: organization.id,
+        emailAddress: input.email,
+        role: input.role,
+        inviterUserId: ctx.session.userId,
+      });
+    }),
 });

apps/web/src/server/api/routers/user.ts

@@ -28,19 +28,4 @@ export const userRouter = createTRPCRouter({
         })
         .then(transformUser);
     }),
-  invite: protectedProcedure
-    .input(
-      z.object({
-        email: z.string().email(),
-        organizationId: z.string(),
-      })
-    )
-    .mutation(async ({ input, ctx }) => {
-      await db.invite.create({
-        data: {
-          organization_id: input.organizationId,
-          email: input.email,
-        },
-      });
-    }),
 });