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

♻️ make code cleanrer

Browse Source
This commit is contained in:
Fred KISSIE
2026-02-06 04:52:21 +01:00
parent 4a31a7b84b
commit 67b63d3084
5 changed files with 81 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/routers/siteResource/listAllSiteResourcesByOrg.ts
View File

@@ -9,6 +9,7 @@ import { eq, and, asc, ilike, or } from "drizzle-orm";
import { fromError } from "zod-validation-error";
import logger from "@server/logger";
import { OpenAPITags, registry } from "@server/openApi";
import type { PaginatedResponse } from "@server/types/Pagination";
const listAllSiteResourcesByOrgParamsSchema = z.strictObject({
orgId: z.string()
@@ -33,14 +34,13 @@ const listAllSiteResourcesByOrgQuerySchema = z.object({
mode: z.enum(["host", "cidr"]).optional().catch(undefined)
});
export type ListAllSiteResourcesByOrgResponse = {
export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
siteResources: (SiteResource & {
siteName: string;
siteNiceId: string;
siteAddress: string | null;
})[];
pagination: { total: number; pageSize: number; page: number };
};
}>;
function querySiteResourcesBase() {
return db
@@ -114,10 +114,9 @@ export async function listAllSiteResourcesByOrg(
const { orgId } = parsedParams.data;
const { page, pageSize, query, mode } = parsedQuery.data;
let conditions = and(eq(siteResources.orgId, orgId));
const conditions = [and(eq(siteResources.orgId, orgId))];
if (query) {
conditions = and(
conditions,
conditions.push(
or(
ilike(siteResources.name, "%" + query + "%"),
ilike(siteResources.destination, "%" + query + "%"),
@@ -129,16 +128,15 @@ export async function listAllSiteResourcesByOrg(
}
if (mode) {
conditions = and(conditions, eq(siteResources.mode, mode));
conditions.push(eq(siteResources.mode, mode));
}
const baseQuery = querySiteResourcesBase().where(conditions);
const baseQuery = querySiteResourcesBase().where(and(...conditions));
const countQuery = db.$count(
querySiteResourcesBase().where(conditions)
querySiteResourcesBase().where(and(...conditions))
);
// Get all site resources for the org with site names
const [siteResourcesList, totalCount] = await Promise.all([
baseQuery
.limit(pageSize)