feat: refactor organization handling by introducing organization context, updating project routes, and removing deprecated container routes

Author: SkidGod4444

apps/api/app/v1/[[...route]]/route.ts

@@ -17,7 +17,7 @@ import notifications from "../routes/notifications";
 import domain from "../routes/domain";
 import envs from "../routes/environments";
 import file from "../routes/file";
-import containers from "../routes/containers";
+// import containers from "../routes/containers";
 import telementryEvents from "../routes/telemetry";
 import auditLogs from "../routes/logger";
 import { rateLimitHandler } from "@/middleware/ratelimit";
@@ -27,6 +27,7 @@ import vectorizer from "../routes/webhooks/vectorizer";
 import clerk from "../routes/webhooks/clerk";
 import { clerkMiddleware } from "@hono/clerk-auth";
 import inbox from "../routes/inbox";
+import store from "../routes/store";
 
 export const runtime = "edge";
 const app = new Hono().basePath("/v1");
@@ -66,6 +67,7 @@ app.use(rateLimitHandler);
 // Import routes
 app.route("/health", health);
 app.route("/auth", auth);
+app.route("/store", store);
 app.route("/ai", ai);
 app.route("/user", user);
 app.route("/project", project);
@@ -75,7 +77,7 @@ app.route("/notification", notifications);
 app.route("/api", api);
 app.route("/context", cntxt);
 app.route("/link", link);
-app.route("/container", containers);
+// app.route("/container", containers);
 app.route("/file", file);
 app.route("/telementry", telementryEvents);
 app.route("/logger", auditLogs);

apps/api/app/v1/routes/containers.ts

@@ -12,9 +12,9 @@ project.use(checkUser);
 // project.use(auditLogs);
 
 project.post("/create", async (c) => {
-  const { name, userId, description, slug } = await c.req.json();
-  if (!name || !userId) {
-    return c.json({ message: "Name and UserId are required" }, 400);
+  const { name, orgId, description, slug } = await c.req.json();
+  if (!name || !orgId) {
+    return c.json({ message: "Name and OrgId are required" }, 400);
   }
 
   const pod = await MailClient.pods.create({
@@ -24,7 +24,7 @@ project.post("/create", async (c) => {
   const newProject = await prisma.project.create({
     data: {
       name: name,
-      userId: userId,
+      orgId: orgId,
       slug: slug,
       description: description || null,
       podId: pod.podId,
@@ -54,12 +54,20 @@ project.delete("/delete", async (c) => {
 
     const proj = await prisma.project.findUnique({
       where: { id },
-      select: { id: true, userId: true },
+      select: { id: true, orgId: true },
     });
     if (!proj) {
       return c.json({ message: "Not found" }, 404);
     }
-    if (proj.userId !== user.id) {
+    // Authorize by checking org's creator
+    const org = await prisma.organization.findUnique({
+      where: { id: proj.orgId },
+      select: { createdBy: true },
+    });
+    if (!org) {
+      return c.json({ message: "Organization not found" }, 404);
+    }
+    if (org.createdBy !== user.id) {
       return c.json({ message: "Forbidden" }, 403);
     }
 
@@ -106,19 +114,9 @@ project.post("/update", async (c) => {
 project.get("/all", async (c) => {
   const userId = c.get("userId");
 
-  if (!userId) {
-    return c.json(
-      {
-        message: "Oops! seems like your session is expired",
-        status: 400,
-      },
-      400,
-    );
-  }
-
   try {
     const projects = await prisma.project.findMany({
-      where: { userId },
+      where: { org: { createdBy: userId } },
       orderBy: { createdAt: "desc" },
       cacheStrategy: {
         ttl: 60,

apps/api/app/v1/routes/project.ts

@@ -0,0 +1,48 @@
+import { checkUser } from "@/middleware/check.user";
+import { Variables } from "@/types";
+import { prisma } from "@prexo/db";
+import { Hono } from "hono";
+import { cache } from "@prexo/cache";
+
+const store = new Hono<{ Variables: Variables }>();
+store.use(checkUser);
+
+store.get("/", async (c) => {
+  const userId = c.get("userId");
+  const cacheKey = `@prexo/store_${userId}`;
+
+  // Return cached response if available
+  const cached = await cache.get(cacheKey);
+  if (cached) {
+    console.log("Store cache hit for user:", userId);
+    return c.json(cached, 200);
+  }
+
+  const orgs = await prisma.organization.findMany({
+    where: { createdBy: userId },
+    orderBy: { createdAt: "desc" },
+    cacheStrategy: {
+      ttl: 29,
+      swr: 29,
+      tags: ["store_orgs"],
+    },
+  });
+
+  const projects = await prisma.project.findMany({
+    where: { org: { createdBy: userId } },
+    orderBy: { createdAt: "desc" },
+    cacheStrategy: {
+      ttl: 29,
+      swr: 29,
+      tags: ["store_projects"],
+    },
+  });
+
+  const payload = { userId, orgs, projects };
+  // Store in cache for a short TTL
+  await cache.set(cacheKey, payload, { ex: 30 });
+  console.log("Store cache set for user:", userId);
+  return c.json(payload, 200);
+});
+
+export default store;

apps/api/app/v1/routes/store.ts

@@ -50,24 +50,6 @@ clerk.post("/", async (c) => {
         });
         if (existingByEmail && existingByEmail.id !== id) {
           // Migrate related records to new Clerk id, then update the user id
-          await prisma.$transaction([
-            prisma.session.updateMany({
-              where: { userId: existingByEmail.id },
-              data: { userId: id },
-            }),
-            prisma.account.updateMany({
-              where: { userId: existingByEmail.id },
-              data: { userId: id },
-            }),
-            prisma.passkey.updateMany({
-              where: { userId: existingByEmail.id },
-              data: { userId: id },
-            }),
-            prisma.project.updateMany({
-              where: { userId: existingByEmail.id },
-              data: { userId: id },
-            }),
-          ]);
 
           user = await prisma.user.update({
             where: { id: existingByEmail.id },
@@ -147,6 +129,26 @@ clerk.post("/", async (c) => {
     if (eventType === "organization.created") {
       console.log("New org created:", id);
       // Handle user creation logic here
+      if (!evt.data.created_by) {
+        throw new Error(
+          "Organization created event missing created_by user id",
+        );
+      }
+      const org = await prisma.organization.create({
+        data: {
+          id: evt.data.id,
+          name: evt.data.name,
+          slug: evt.data.slug,
+          imgUrl: evt.data.image_url,
+          status: "ACTIVE",
+          membersCount: evt.data.members_count,
+          maxAllowedMembers: evt.data.max_allowed_memberships,
+          user: {
+            connect: { id: evt.data.created_by },
+          },
+        },
+      });
+      console.log("Organization created in DB:", org);
       await logTelegram({
         logTitle: "Clerk Webhook - Organization Created",
         logSummary: `A new organization has been created with ID: ${id}`,
@@ -160,11 +162,27 @@ clerk.post("/", async (c) => {
     if (eventType === "organization.updated") {
       console.log("New org updated:", id);
       // Handle user creation logic here
+      const org = await prisma.organization.updateMany({
+        where: { id: evt.data.id },
+        data: {
+          name: evt.data.name,
+          slug: evt.data.slug,
+          imgUrl: evt.data.image_url,
+          membersCount: evt.data.members_count,
+          maxAllowedMembers: evt.data.max_allowed_memberships,
+          updatedAt: new Date(),
+        },
+      });
     }
 
     if (eventType === "organization.deleted") {
       console.log("New org deleted:", id);
       // Handle user creation logic here
+      const org = await prisma.organization.updateMany({
+        where: { id: evt.data.id },
+        data: { status: "DELETED", deletedAt: new Date() },
+      });
+      console.log("Organization marked as deleted in DB:", org);
       await logTelegram({
         logTitle: "Clerk Webhook - Organization Deleted",
         logSummary: `An organization has been deleted with ID: ${evt.data.id}`,

apps/api/app/v1/routes/webhooks/clerk.ts

@@ -1,8 +1,8 @@
 "use client";
 
-import { useProjectsStore } from "@prexo/store";
+import { useOrganizationStore, useProjectsStore } from "@prexo/store";
 import { useRouter } from "next/navigation";
-import { use, useEffect } from "react";
+import { use, useEffect, useMemo } from "react";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -19,12 +19,24 @@ export default function page({ params }: { params: Promise<{ id: string }> }) {
   const { id } = use(params);
   const router = useRouter();
   const { projects } = useProjectsStore();
+  const { orgs } = useOrganizationStore();
   const [_, setSelectedApp, removeSelectedApp] = useLocalStorage(
     "@prexo-#selectedApp",
     "",
   );
+  const [ selectedOrgSlug ] =
+    useLocalStorage("@prexo-#selectedOrgSlug", "");
 
-  if (!projects.find((proj) => proj.slug === id)) {
+  const selectedOrg = useMemo(() => { {
+    return orgs.find((o) => o.slug === selectedOrgSlug);
+  }}, [orgs, selectedOrgSlug]);
+
+  const appsOfSelectedOrg = useMemo(() => {
+    if (!selectedOrg) return [];
+    return projects.filter((p) => p.orgId === selectedOrg.id);
+  }, [projects, selectedOrg]);
+
+  if (!appsOfSelectedOrg.find((proj) => proj.slug === id)) {
     return (
       <Dialog open={true}>
         <DialogPopup>
@@ -56,7 +68,7 @@ export default function page({ params }: { params: Promise<{ id: string }> }) {
   }
 
   useEffect(() => {
-    const matchedProj = projects.find((proj) => proj.slug === id);
+    const matchedProj = appsOfSelectedOrg.find((proj) => proj.slug === id);
     if (matchedProj) {
       setSelectedApp(matchedProj.id);
     } else {