diff --git a/src/controller/admin/queryBuilderController.ts b/src/controller/admin/queryBuilderController.ts index fdf93a1..312de93 100644 --- a/src/controller/admin/queryBuilderController.ts +++ b/src/controller/admin/queryBuilderController.ts @@ -41,14 +41,16 @@ export async function executeQuery(req: Request, res: Response): Promise { let [rows, total] = await DynamicQueryBuilder.buildQuery(query, offset, count).getManyAndCount(); res.json({ + stats: "success", rows: rows, total: total, offset: offset, count: count, }); } catch (error) { - res.status(500).send({ - json: error.sql, + res.json({ + stats: "error", + sql: error.sql, code: error.code, msg: error.sqlMessage, }); diff --git a/src/type/dynamicQueries.ts b/src/type/dynamicQueries.ts index 5e69094..9e1f046 100644 --- a/src/type/dynamicQueries.ts +++ b/src/type/dynamicQueries.ts @@ -43,7 +43,9 @@ export type WhereOperation = | "notNull" // Is not null | "between" // Is between | "startsWith" // Starts with - | "endsWith"; // Ends with + | "endsWith" // Ends with + | "timespanEq"; // Date before x years (YYYY-01-01 YYYY-12-31) +// TODO: age between | age equals | age greater | age smaller export type OrderByStructure = { column: string;