pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-03 09:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move nessicary info to url params

Browse Source
This commit is contained in:
Owen Schwartz
2024-10-02 22:05:21 -04:00
parent 5dd860ef1c
commit afe3d0659c
8 changed files with 184 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/routers/resource/createResource.ts
View File

@@ -6,9 +6,13 @@ import response from "@server/utils/response";
import HttpCode from '@server/types/HttpCode';
import createHttpError from 'http-errors';
const createResourceParamsSchema = z.object({
siteId: z.number().int().positive(),
orgId: z.number().int().positive(),
});
// Define Zod schema for request body validation
const createResourceSchema = z.object({
siteId: z.number().int().positive(),
name: z.string().min(1).max(255),
subdomain: z.string().min(1).max(255).optional(),
});
@@ -26,7 +30,20 @@ export async function createResource(req: Request, res: Response, next: NextFunc
);
}
const { siteId, name, subdomain } = parsedBody.data;
const { name, subdomain } = parsedBody.data;
// Validate request params
const parsedParams = createResourceParamsSchema.safeParse(req.params);
if (!parsedParams.success) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
parsedParams.error.errors.map(e => e.message).join(', ')
)
);
}
const { siteId, orgId } = parsedParams.data;
// Generate a unique resourceId
const resourceId = "subdomain" // TODO: create the subdomain here
@@ -35,6 +52,7 @@ export async function createResource(req: Request, res: Response, next: NextFunc
const newResource = await db.insert(resources).values({
resourceId,
siteId,
orgId,
name,
subdomain,
}).returning();

32
server/routers/resource/listResources.ts
View File

@@ -7,10 +7,14 @@ import HttpCode from '@server/types/HttpCode';
import createHttpError from 'http-errors';
import { sql, eq } from 'drizzle-orm';
const listResourcesParamsSchema = z.object({
siteId: z.string().optional().transform(Number).pipe(z.number().int().positive()),
orgId: z.string().optional().transform(Number).pipe(z.number().int().positive()),
});
const listResourcesSchema = z.object({
limit: z.string().optional().transform(Number).pipe(z.number().int().positive().default(10)),
offset: z.string().optional().transform(Number).pipe(z.number().int().nonnegative().default(0)),
siteId: z.string().optional().transform(Number).pipe(z.number().int().positive()),
});
export async function listResources(req: Request, res: Response, next: NextFunction): Promise<any> {
@@ -24,10 +28,20 @@ export async function listResources(req: Request, res: Response, next: NextFunct
)
);
}
const { limit, offset } = parsedQuery.data;
const { limit, offset, siteId } = parsedQuery.data;
const parsedParams = listResourcesParamsSchema.safeParse(req.params);
if (!parsedParams.success) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
parsedParams.error.errors.map(e => e.message).join(', ')
)
);
}
const { siteId, orgId } = parsedParams.data;
let baseQuery = db
let baseQuery: any = db
.select({
resourceId: resources.resourceId,
name: resources.name,
@@ -37,11 +51,21 @@ export async function listResources(req: Request, res: Response, next: NextFunct
.from(resources)
.leftJoin(sites, eq(resources.siteId, sites.siteId));
let countQuery = db.select({ count: sql<number>`cast(count(*) as integer)` }).from(resources);
let countQuery: any = db.select({ count: sql<number>`cast(count(*) as integer)` }).from(resources);
if (siteId) {
baseQuery = baseQuery.where(eq(resources.siteId, siteId));
countQuery = countQuery.where(eq(resources.siteId, siteId));
} else if (orgId) {
baseQuery = baseQuery.where(eq(resources.orgId, orgId));
countQuery = countQuery.where(eq(resources.orgId, orgId));
} else {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
'Either siteId or orgId must be provided'
)
);
}
const resourcesList = await baseQuery.limit(limit).offset(offset);