Fix resource new id number

server/routers/resource/createResource.ts

@@ -11,7 +11,7 @@ import { eq, and } from 'drizzle-orm';
 import stoi from '@server/utils/stoi';
 
 const createResourceParamsSchema = z.object({
-            siteId: z.string().optional().transform(stoi).pipe(z.number().int().positive().optional()),
+    siteId: z.string().optional().transform(stoi).pipe(z.number().int().positive().optional()),
     orgId: z.string()
 });
 
@@ -64,7 +64,7 @@ export async function createResource(req: Request, res: Response, next: NextFunc
             .from(orgs)
             .where(eq(orgs.orgId, orgId))
             .limit(1);
-        
+
         if (org.length === 0) {
             return next(
                 createHttpError(
@@ -75,11 +75,11 @@ export async function createResource(req: Request, res: Response, next: NextFunc
         }
 
         // Generate a unique resourceId
-        const resourceId = `${subdomain}.${org[0].orgId}.${org[0].domain}`;
+        const fullDomain = `${subdomain}.${org[0].orgId}.${org[0].domain}`;
 
         // Create new resource in the database
         const newResource = await db.insert(resources).values({
-            resourceId,
+            fullDomain,
             siteId,
             orgId,
             name,

server/routers/resource/deleteResource.ts

@@ -11,7 +11,7 @@ import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const deleteResourceSchema = z.object({
-    resourceId: z.string()
+    resourceId: z.string().transform(Number).pipe(z.number().int().positive()),
 });
 
 export async function deleteResource(req: Request, res: Response, next: NextFunction): Promise<any> {

server/routers/resource/getResource.ts

@@ -11,11 +11,11 @@ import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const getResourceSchema = z.object({
-    resourceId: z.string()
+    resourceId: z.string().transform(Number).pipe(z.number().int().positive()),
 });
 
 export type GetResourceResponse = {
-    resourceId: string;
+    resourceId: number;
     siteId: number;
     orgId: string;
     name: string;

server/routers/resource/listResourceRoles.ts

@@ -10,7 +10,7 @@ import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
 import logger from '@server/logger';
 
 const listResourceRolesSchema = z.object({
-    resourceId: z.string(),
+    resourceId: z.string().transform(Number).pipe(z.number().int().positive()),
 });
 
 export async function listResourceRoles(req: Request, res: Response, next: NextFunction): Promise<any> {

server/routers/resource/listResources.ts

@@ -41,7 +41,7 @@ const listResourcesSchema = z.object({
 });
 
 function queryResources(
-    accessibleResourceIds: string[],
+    accessibleResourceIds: number[],
     siteId?: number,
     orgId?: string,
 ) {
@@ -141,7 +141,7 @@ export async function listResources(
         // Get the list of resources the user has access to
         const accessibleResources = await db
             .select({
-                resourceId: sql<string>`COALESCE(${userResources.resourceId}, ${roleResources.resourceId})`,
+                resourceId: sql<number>`COALESCE(${userResources.resourceId}, ${roleResources.resourceId})`,
             })
             .from(userResources)
             .fullJoin(

server/routers/resource/updateResource.ts

@@ -11,7 +11,7 @@ import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const updateResourceParamsSchema = z.object({
-    resourceId: z.string()
+    resourceId: z.string().transform(Number).pipe(z.number().int().positive()),
 });
 
 // Define Zod schema for request body validation