diff --git a/src/server/controllers/guild/api/dt.module.ts b/src/server/controllers/guild/api/dt.module.ts index 4782e89..1c19887 100644 --- a/src/server/controllers/guild/api/dt.module.ts +++ b/src/server/controllers/guild/api/dt.module.ts @@ -24,7 +24,8 @@ export const datatableRequest = async ( response: Response, model: ModelDelegate, defaultOrderBy: TOrderBy, - include?: object + include?: object, + where?: object ) => { const query = request.body as unknown as DatatableQuery; @@ -32,7 +33,7 @@ export const datatableRequest = async ( ? { [query.columns[query.order[0].column].data]: query.order[0].dir } as unknown as TOrderBy : defaultOrderBy; - const where = query.search?.value + const searchWhere = query.search?.value ? { OR: Object.values(query.columns) .filter(col => col.searchable) @@ -42,6 +43,8 @@ export const datatableRequest = async ( } : {}; + where = { ...where, ...searchWhere }; + const data = await model.findMany({ skip: query.start, take: query.length, diff --git a/src/server/controllers/guild/api/feed.controller.ts b/src/server/controllers/guild/api/feed.controller.ts index a5c072a..f177fdb 100644 --- a/src/server/controllers/guild/api/feed.controller.ts +++ b/src/server/controllers/guild/api/feed.controller.ts @@ -83,7 +83,8 @@ export const datatable = async (request: Request, response: Response) => { response, prisma.feed, { id: "asc" }, - { channels: true } + { channels: true }, + { guild_id: request.params.guildId } ); };