Merge pull request #637 from trycompai/claudio/comp-121-enable-database-synced-frameworks

[dev] [claudfuen] claudio/comp-121-enable-database-synced-frameworks

Author: claudfuen

apps/app/next.config.ts

@@ -17,7 +17,7 @@ const config: NextConfig = {
 			},
 		],
 	},
-	transpilePackages: ["@comp/ui", "@comp/data"],
+	transpilePackages: ["@comp/ui"],
 	logging: {
 		fetches: {
 			fullUrl: process.env.LOG_FETCHES === "true",

apps/app/package.json

@@ -25,7 +25,6 @@
 		"@browserbasehq/sdk": "^2.5.0",
 		"@calcom/atoms": "^1.0.102-framer",
 		"@calcom/embed-react": "^1.5.3",
-		"@comp/data": "workspace:*",
 		"@comp/db": "workspace:*",
 		"@comp/notifications": "workspace:*",
 		"@date-fns/tz": "^1.2.0",
@@ -58,6 +57,7 @@
 		"@vercel/sdk": "^1.7.1",
 		"ai": "^4.3.10",
 		"argon2": "^0.43.0",
+		"axios": "^1.9.0",
 		"better-auth": "^1.2.7",
 		"bun": "^1.2.10",
 		"crypto": "^1.0.1",
@@ -67,7 +67,6 @@
 		"geist": "^1.3.1",
 		"highlight.js": "^11.11.1",
 		"immer": "^10.1.1",
-		"ky": "^1.8.1",
 		"languine": "^3.1.4",
 		"marked": "^15.0.11",
 		"motion": "^12.9.2",

apps/app/src/actions/organization/create-organization-action.ts

@@ -1,25 +1,17 @@
 "use server";
 
-import { performance } from "node:perf_hooks";
+import type { newOrgSequence } from "@/jobs/tasks/marketing/new-org-sequence";
 import { auth } from "@/utils/auth";
 import { db } from "@comp/db";
+import { tasks } from "@trigger.dev/sdk/v3";
 import { revalidatePath } from "next/cache";
 import { headers } from "next/headers";
+import { performance } from "node:perf_hooks";
 import { Resend } from "resend";
 import { authActionClient } from "../safe-action";
 import { organizationSchema } from "../schema";
 import { createStripeCustomer } from "./lib/create-stripe-customer";
-import {
-	createControlArtifacts,
-	createFrameworkInstance,
-	createOrganizationPolicies,
-	createOrganizationTasks,
-	getRelevantControls,
-} from "./lib/utils";
-import { env } from "@/env.mjs";
-import ky from "ky";
-import { tasks } from "@trigger.dev/sdk/v3";
-import type { newOrgSequence } from "@/jobs/tasks/marketing/new-org-sequence";
+import { initializeOrganization } from "./lib/initialize-organization";
 
 export const createOrganizationAction = authActionClient
 	.schema(organizationSchema)
@@ -31,7 +23,7 @@ export const createOrganizationAction = authActionClient
 		},
 	})
 	.action(async ({ parsedInput, ctx }) => {
-		const { name, frameworks, website } = parsedInput;
+		const { name, frameworkIds, website } = parsedInput;
 		const { id: userId } = ctx.user;
 
 		if (!name) {
@@ -109,109 +101,25 @@ export const createOrganizationAction = authActionClient
 			}
 
 			start = performance.now();
+
+			// Update stripe ID and website
 			await db.organization.update({
 				where: { id: organizationId },
 				data: { stripeCustomerId, website },
 			});
+
+
 			timings.updateOrganizationWithStripeId =
 				(performance.now() - start) / 1000;
 
 			// --- Main Creation Logic (Inside Transaction) ---
 			const transactionStart = performance.now();
-			const result = await db.$transaction(
-				async (tx) => {
-					// REVISIT: Consider if more granular error handling/logging is needed within the transaction
 
-					start = performance.now();
-					const relevantControls = getRelevantControls(frameworks);
-					const getRelevantControlsTime =
-						(performance.now() - start) / 1000;
 
-					start = performance.now();
-					// Pass the transaction client `tx` to the helper
-					const organizationFrameworks = await Promise.all(
-						frameworks.map(
-							(frameworkId) =>
-								createFrameworkInstance(
-									organizationId,
-									frameworkId,
-									tx,
-								), // Pass tx
-						),
-					);
-					const createFrameworkInstancesTime =
-						(performance.now() - start) / 1000;
+			// Initialize Organization
+			await initializeOrganization({frameworkIds, organizationId});
 
-					// Fetch DB controls needed for Task creation
-					const dbControlsList = await tx.control.findMany({
-						where: {
-							organizationId,
-							name: { in: relevantControls.map((c) => c.name) },
-						},
-						select: { id: true, name: true },
-					});
-					const dbControlsMap = new Map<string, { id: string }>();
-					for (const control of dbControlsList) {
-						dbControlsMap.set(control.name, control);
-					}
-
-					// Run policy and task creation in parallel
-					start = performance.now();
-					const [policiesForFrameworks, tasksCreationResult] =
-						await Promise.all([
-							createOrganizationPolicies(
-								organizationId,
-								relevantControls,
-								userId,
-								tx,
-							), // Pass tx
-							createOrganizationTasks(
-								organizationId,
-								relevantControls,
-								dbControlsMap, // Pass the map
-								userId,
-								tx,
-							),
-						]);
-					const createPoliciesAndTasksParallelTime =
-						(performance.now() - start) / 1000;
-
-					start = performance.now();
-					// Pass the transaction client `tx` to the helper
-					await createControlArtifacts(
-						organizationId,
-						organizationFrameworks.map((framework) => framework.id),
-						relevantControls,
-						policiesForFrameworks,
-						tx, // Pass tx
-					);
-					const createControlArtifactsTime =
-						(performance.now() - start) / 1000;
-
-					// Return timings calculated inside the transaction scope
-					return {
-						getRelevantControlsTime,
-						createFrameworkInstancesTime,
-						createPoliciesAndTasksParallelTime,
-						createControlArtifactsTime,
-						organizationFrameworks, // Need this for the final return value potentially
-					};
-				},
-				{
-					maxWait: 15000,
-					timeout: 40000,
-				},
-			);
 			timings.transaction = (performance.now() - transactionStart) / 1000;
-
-			// Assign timings from the transaction result
-			timings.getRelevantControls = result.getRelevantControlsTime;
-			timings.createFrameworkInstances =
-				result.createFrameworkInstancesTime;
-			timings.createPoliciesAndTasksParallel =
-				result.createPoliciesAndTasksParallelTime;
-			timings.createControlArtifacts = result.createControlArtifactsTime;
-
 			timings.total = (performance.now() - totalStart) / 1000;
 			console.log("createOrganizationAction timings (s):", timings);
 			console.warn(