Merge branch 'dev' into clients-pops

server/routers/org/checkId.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { orgs } from "@server/db/schemas";
+import { orgs } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/org/createOrg.ts

@@ -12,13 +12,13 @@ import {
     roleActions,
     roles,
     userOrgs,
-    users
-} from "@server/db/schemas";
+    users,
+    actions
+} from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
 import logger from "@server/logger";
-import { createAdminRole } from "@server/setup/ensureActions";
 import config from "@server/lib/config";
 import { fromError } from "zod-validation-error";
 import { defaultRoleAllowedActions } from "../role";
@@ -159,14 +159,40 @@ export async function createOrg(
 
             org = newOrg[0];
 
-            const roleId = await createAdminRole(newOrg[0].orgId);
+            // Create admin role within the same transaction
+            const [insertedRole] = await trx
+                .insert(roles)
+                .values({
+                    orgId: newOrg[0].orgId,
+                    isAdmin: true,
+                    name: "Admin",
+                    description: "Admin role with the most permissions"
+                })
+                .returning({ roleId: roles.roleId });
 
-            if (!roleId) {
+            if (!insertedRole || !insertedRole.roleId) {
                 error = "Failed to create Admin role";
                 trx.rollback();
                 return;
             }
 
+            const roleId = insertedRole.roleId;
+
+            // Get all actions and create role actions
+            const actionIds = await trx.select().from(actions).execute();
+            
+            if (actionIds.length > 0) {
+                await trx
+                    .insert(roleActions)
+                    .values(
+                        actionIds.map((action) => ({
+                            roleId,
+                            actionId: action.actionId,
+                            orgId: newOrg[0].orgId
+                        }))
+                    );
+            }
+
             await trx.insert(orgDomains).values(
                 allDomains.map((domain) => ({
                     orgId: newOrg[0].orgId,
@@ -236,7 +262,7 @@ export async function createOrg(
             return next(
                 createHttpError(
                     HttpCode.INTERNAL_SERVER_ERROR,
-                    "Failed to createo org"
+                    "Failed to create org"
                 )
             );
         }

server/routers/org/deleteOrg.ts

@@ -7,7 +7,7 @@ import {
     orgs,
     sites,
     userActions
-} from "@server/db/schemas";
+} from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/org/getOrg.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { Org, orgs } from "@server/db/schemas";
+import { Org, orgs } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/org/getOrgOverview.ts

@@ -10,7 +10,7 @@ import {
     userResources,
     users,
     userSites
-} from "@server/db/schemas";
+} from "@server/db";
 import { and, count, eq, inArray } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";

server/routers/org/listOrgs.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { Org, orgs, userOrgs } from "@server/db/schemas";
+import { Org, orgs, userOrgs } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";

server/routers/org/listUserOrgs.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { Org, orgs, userOrgs } from "@server/db/schemas";
+import { Org, orgs, userOrgs } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";

server/routers/org/updateOrg.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { orgs } from "@server/db/schemas";
+import { orgs } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";