Merge dev into fix/log-analytics-adjustments

This commit is contained in:
Fred KISSIE
2025-12-10 03:19:14 +01:00
parent 9db2feff77
commit d490cab48c
555 changed files with 9375 additions and 9287 deletions

View File

@@ -11,9 +11,9 @@ import logger from "@server/logger";
import { OpenAPITags, registry } from "@server/openApi";
const listSiteResourcesParamsSchema = z.strictObject({
siteId: z.string().transform(Number).pipe(z.int().positive()),
orgId: z.string()
});
siteId: z.string().transform(Number).pipe(z.int().positive()),
orgId: z.string()
});
const listSiteResourcesQuerySchema = z.object({
limit: z
@@ -52,7 +52,9 @@ export async function listSiteResources(
next: NextFunction
): Promise<any> {
try {
const parsedParams = listSiteResourcesParamsSchema.safeParse(req.params);
const parsedParams = listSiteResourcesParamsSchema.safeParse(
req.params
);
if (!parsedParams.success) {
return next(
createHttpError(
@@ -83,22 +85,19 @@ export async function listSiteResources(
.limit(1);
if (site.length === 0) {
return next(
createHttpError(
HttpCode.NOT_FOUND,
"Site not found"
)
);
return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
}
// Get site resources
const siteResourcesList = await db
.select()
.from(siteResources)
.where(and(
eq(siteResources.siteId, siteId),
eq(siteResources.orgId, orgId)
))
.where(
and(
eq(siteResources.siteId, siteId),
eq(siteResources.orgId, orgId)
)
)
.limit(limit)
.offset(offset);
@@ -111,6 +110,11 @@ export async function listSiteResources(
});
} catch (error) {
logger.error("Error listing site resources:", error);
return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "Failed to list site resources"));
return next(
createHttpError(
HttpCode.INTERNAL_SERVER_ERROR,
"Failed to list site resources"
)
);
}
}