Fix integration site resource lookup

This commit is contained in:
Shubham Singh
2026-07-30 15:34:00 +05:30
parent 146c287aba
commit c11fc86b63
2 changed files with 69 additions and 13 deletions
+11 -13
View File
@@ -10,7 +10,7 @@ import { fromError } from "zod-validation-error";
import logger from "@server/logger";
import { OpenAPITags, registry } from "@server/openApi";
const getSiteResourceParamsSchema = z.strictObject({
export const getSiteResourceParamsSchema = z.strictObject({
siteResourceId: z
.string()
.optional()
@@ -18,19 +18,21 @@ const getSiteResourceParamsSchema = z.strictObject({
.pipe(z.int().positive().optional())
.optional(),
niceId: z.string().optional(),
orgId: z.string()
orgId: z.string().optional()
});
async function query(siteResourceId?: number, niceId?: string, orgId?: string) {
if (siteResourceId && orgId) {
if (siteResourceId) {
const [siteResource] = await db
.select()
.from(siteResources)
.where(
and(
eq(siteResources.siteResourceId, siteResourceId),
eq(siteResources.orgId, orgId)
)
orgId
? and(
eq(siteResources.siteResourceId, siteResourceId),
eq(siteResources.orgId, orgId)
)
: eq(siteResources.siteResourceId, siteResourceId)
)
.limit(1);
return siteResource;
@@ -60,9 +62,7 @@ registry.registerPath({
tags: [OpenAPITags.PrivateResourceLegacy],
request: {
params: z.object({
siteResourceId: z.number(),
siteId: z.number(),
orgId: z.string()
siteResourceId: z.number()
})
},
responses: {
@@ -90,9 +90,7 @@ registry.registerPath({
tags: [OpenAPITags.PrivateResource],
request: {
params: z.object({
siteResourceId: z.number(),
siteId: z.number(),
orgId: z.string()
siteResourceId: z.number()
})
},
responses: {