@heyhru/business-dms-approval 0.7.0 → 0.7.2

package/dist/approvals.model.d.ts

@@ -1,9 +1,13 @@
-export declare function listApprovals(filters?: {
+interface ApprovalFilters {
     status?: string;
     submittedBy?: string;
-}): Promise<Record<string, unknown>[]>;
+    limit?: number;
+    offset?: number;
+}
+export declare function countApprovals(filters?: ApprovalFilters): Promise<number>;
+export declare function listApprovals(filters?: ApprovalFilters): Promise<Record<string, unknown>[]>;
 export declare function getApprovalById(id: string): Promise<Record<string, unknown> | undefined>;
-export declare function insertApproval(dataSourceId: string, sqlText: string, submittedBy: string): Promise<Record<string, unknown> | undefined>;
+export declare function insertApproval(dataSourceId: string, dbName: string | null, sqlText: string, submittedBy: string): Promise<Record<string, unknown> | undefined>;
 export declare function updateReview(id: string, status: string, reviewedBy: string, rejectReason: string | null): Promise<Record<string, unknown> | undefined>;
 export declare function setExecuting(id: string): Promise<{
     changes: number;
@@ -11,4 +15,5 @@ export declare function setExecuting(id: string): Promise<{
 export declare function setExecuteResult(id: string, status: string, result: string): Promise<{
     changes: number;
 }>;
+export {};
 //# sourceMappingURL=approvals.model.d.ts.map

package/dist/approvals.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approvals.model.d.ts","sourceRoot":"","sources":["../src/approvals.model.ts"],"names":[],"mappings":"AAGA,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,sCAgBtF;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,gDAEzC;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gDAExF;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GAAG,IAAI,gDAG5B;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM;;GAEtC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;GAE1E"}
+{"version":3,"file":"approvals.model.d.ts","sourceRoot":"","sources":["../src/approvals.model.ts"],"names":[],"mappings":"AAGA,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAgBD,wBAAsB,cAAc,CAAC,OAAO,CAAC,EAAE,eAAe,mBAO7D;AAED,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE,eAAe,sCAS5D;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,gDAEzC;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gDAE/G;AAED,wBAAgB,YAAY,CAC1B,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GAAG,IAAI,gDAG5B;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM;;GAEtC;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;GAE1E"}

package/dist/approvals.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approvals.service.d.ts","sourceRoot":"","sources":["../src/approvals.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAA0B,MAAM,SAAS,CAAC;AAYzF,UAAU,oBAAqB,SAAQ,cAAc;IACnD,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtB;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAQhF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAKzE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAQlF;AAkBD,wBAAsB,eAAe,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAUnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAUlF;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,IACrC,KAAK,oBAAoB,EAAE,OAAO,YAAY,oBAY7D"}
+{"version":3,"file":"approvals.service.d.ts","sourceRoot":"","sources":["../src/approvals.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAA0B,MAAM,SAAS,CAAC;AAazF,UAAU,oBAAqB,SAAQ,cAAc;IACnD,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtB;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAUhF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAKzE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAQlF;AAkBD,wBAAsB,eAAe,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAUnF;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAUlF;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,IACrC,KAAK,oBAAoB,EAAE,OAAO,YAAY,oBAY7D"}

package/dist/approvals.sql.d.ts

@@ -1,5 +1,5 @@
 export declare const FIND_BY_ID = "\nSELECT *\nFROM approvals\nWHERE id = ?";
-export declare const CREATE = "\nINSERT INTO approvals (data_source_id, sql_text, submitted_by)\nVALUES (?, ?, ?)\nRETURNING *";
+export declare const CREATE = "\nINSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by)\nVALUES (?, ?, ?, ?)\nRETURNING *";
 export declare const UPDATE_REVIEW: () => string;
 export declare const UPDATE_EXECUTING: () => string;
 export declare const UPDATE_RESULT: () => string;

package/dist/approvals.sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approvals.sql.d.ts","sourceRoot":"","sources":["../src/approvals.sql.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,6CAGV,CAAC;AAEd,eAAO,MAAM,MAAM,oGAGP,CAAC;AAEb,eAAO,MAAM,aAAa,cAId,CAAC;AAEb,eAAO,MAAM,gBAAgB,cAGhB,CAAC;AAEd,eAAO,MAAM,aAAa,cAGb,CAAC"}
+{"version":3,"file":"approvals.sql.d.ts","sourceRoot":"","sources":["../src/approvals.sql.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,6CAGV,CAAC;AAEd,eAAO,MAAM,MAAM,gHAGP,CAAC;AAEb,eAAO,MAAM,aAAa,cAId,CAAC;AAEb,eAAO,MAAM,gBAAgB,cAGhB,CAAC;AAEd,eAAO,MAAM,aAAa,cAGb,CAAC"}

package/dist/index.js

@@ -42,8 +42,8 @@ SELECT *
 FROM approvals
 WHERE id = ?`;
 var CREATE = `
-INSERT INTO approvals (data_source_id, sql_text, submitted_by)
-VALUES (?, ?, ?)
+INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by)
+VALUES (?, ?, ?, ?)
 RETURNING *`;
 var UPDATE_REVIEW = () => `
 UPDATE approvals
@@ -60,28 +60,42 @@ SET status = ?, execute_result = ?, updated_at = NOW()
 WHERE id = ?`;
 
 // src/approvals.model.ts
-async function listApprovals(filters) {
-  let query = `SELECT a.*, u.username AS submitter_name
-FROM approvals a
-LEFT JOIN users u ON u.id = a.submitted_by
-WHERE 1=1`;
+function buildWhereParams(filters) {
+  const clauses = [];
   const params = [];
   if (filters?.status) {
-    query += " AND a.status = ?";
+    clauses.push("a.status = ?");
     params.push(filters.status);
   }
   if (filters?.submittedBy) {
-    query += " AND a.submitted_by = ?";
+    clauses.push("a.submitted_by = ?");
     params.push(filters.submittedBy);
   }
-  query += " ORDER BY a.created_at DESC";
+  return { where: clauses.length ? " AND " + clauses.join(" AND ") : "", params };
+}
+async function countApprovals(filters) {
+  const { where, params } = buildWhereParams(filters);
+  const row = await (0, import_server_plugin_pg.getPgDb)().queryOne(
+    `SELECT COUNT(*) AS total FROM approvals a WHERE 1=1` + where,
+    params
+  );
+  return Number(row?.["total"] ?? 0);
+}
+async function listApprovals(filters) {
+  let query = `SELECT a.*, u.username AS submitter_name
+FROM approvals a
+LEFT JOIN users u ON u.id = a.submitted_by
+WHERE 1=1`;
+  const { where, params } = buildWhereParams(filters);
+  query += where + " ORDER BY a.created_at DESC LIMIT ? OFFSET ?";
+  params.push(filters?.limit ?? 50, filters?.offset ?? 0);
   return (0, import_server_plugin_pg.getPgDb)().query(query, params);
 }
 function getApprovalById(id) {
   return (0, import_server_plugin_pg.getPgDb)().queryOne(FIND_BY_ID, [id]);
 }
-function insertApproval(dataSourceId, sqlText, submittedBy) {
-  return (0, import_server_plugin_pg.getPgDb)().queryOne(CREATE, [dataSourceId, sqlText, submittedBy]);
+function insertApproval(dataSourceId, dbName, sqlText, submittedBy) {
+  return (0, import_server_plugin_pg.getPgDb)().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy]);
 }
 function updateReview(id, status, reviewedBy, rejectReason) {
   return (0, import_server_plugin_pg.getPgDb)().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
@@ -95,13 +109,15 @@ function setExecuteResult(id, status, result) {
 
 // src/approvals.service.ts
 async function approvalList(req, reply) {
-  const { status, mine } = req.body ?? {};
-  return reply.send(
-    await listApprovals({
-      status,
-      submittedBy: mine === "true" ? req.user.id : void 0
-    })
-  );
+  const { status, mine, limit, offset } = req.body ?? {};
+  const filters = {
+    status,
+    submittedBy: mine === "true" ? req.user.id : void 0,
+    limit: limit ? Number(limit) : void 0,
+    offset: offset ? Number(offset) : void 0
+  };
+  const [rows, total] = await Promise.all([listApprovals(filters), countApprovals(filters)]);
+  return reply.send({ rows, total });
 }
 async function approvalGet(req, reply) {
   const { id } = req.body ?? {};
@@ -110,11 +126,11 @@ async function approvalGet(req, reply) {
   return reply.send(approval);
 }
 async function approvalCreate(req, reply) {
-  const { dataSourceId, sql } = req.body ?? {};
+  const { dataSourceId, database, sql } = req.body ?? {};
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "Data source ID and SQL are required" });
   }
-  const approval = await insertApproval(dataSourceId, sql, req.user.id);
+  const approval = await insertApproval(dataSourceId, database ?? null, sql, req.user.id);
   req.log.info("Approval submitted (user=%s)", req.user.id);
   return reply.code(201).send(approval);
 }
@@ -170,19 +186,21 @@ async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
   }
   await setExecuting(id);
   try {
-    const ds = await (0, import_business_dms_datasource.getDataSourceWithPassword)(
-      approval["data_source_id"],
-      encryptionKey
-    );
-    if (!ds) throw new Error("Data source not found");
-    const pool = (0, import_business_dms_datasource.getPool)({ ...ds, database: ds.database ?? "" });
+    const dataSourceId = approval["data_source_id"];
+    const dbName = approval["db_name"];
+    const pool = dbName ? await (0, import_business_dms_datasource.getPoolForDatabase)(dataSourceId, dbName, encryptionKey) : await (async () => {
+      const ds = await (0, import_business_dms_datasource.getDataSourceWithPassword)(dataSourceId, encryptionKey);
+      if (!ds) throw new Error("Data source not found");
+      return (0, import_business_dms_datasource.getPool)({ ...ds, database: ds.database ?? "" });
+    })();
+    if (!pool) throw new Error("Data source not found");
     const rows = await pool.execute(approval["sql_text"]);
     const result = `${rows.length} rows affected`;
     await setExecuteResult(id, "executed", result);
     log.info("Approval executed (id=%s, user=%s)", id, userId);
     await (0, import_business_dms_audit.writeAuditLog)({
       userId,
-      dataSourceId: approval["data_source_id"],
+      dataSourceId,
       action: "DML_EXECUTE",
       sqlText: approval["sql_text"],
       resultSummary: result,

package/dist/index.mjs

@@ -1,5 +1,5 @@
 // src/approvals.service.ts
-import { getDataSourceWithPassword, getPool } from "@heyhru/business-dms-datasource";
+import { getDataSourceWithPassword, getPool, getPoolForDatabase } from "@heyhru/business-dms-datasource";
 import { writeAuditLog } from "@heyhru/business-dms-audit";
 
 // src/approvals.model.ts
@@ -11,8 +11,8 @@ SELECT *
 FROM approvals
 WHERE id = ?`;
 var CREATE = `
-INSERT INTO approvals (data_source_id, sql_text, submitted_by)
-VALUES (?, ?, ?)
+INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by)
+VALUES (?, ?, ?, ?)
 RETURNING *`;
 var UPDATE_REVIEW = () => `
 UPDATE approvals
@@ -29,28 +29,42 @@ SET status = ?, execute_result = ?, updated_at = NOW()
 WHERE id = ?`;
 
 // src/approvals.model.ts
-async function listApprovals(filters) {
-  let query = `SELECT a.*, u.username AS submitter_name
-FROM approvals a
-LEFT JOIN users u ON u.id = a.submitted_by
-WHERE 1=1`;
+function buildWhereParams(filters) {
+  const clauses = [];
   const params = [];
   if (filters?.status) {
-    query += " AND a.status = ?";
+    clauses.push("a.status = ?");
     params.push(filters.status);
   }
   if (filters?.submittedBy) {
-    query += " AND a.submitted_by = ?";
+    clauses.push("a.submitted_by = ?");
     params.push(filters.submittedBy);
   }
-  query += " ORDER BY a.created_at DESC";
+  return { where: clauses.length ? " AND " + clauses.join(" AND ") : "", params };
+}
+async function countApprovals(filters) {
+  const { where, params } = buildWhereParams(filters);
+  const row = await getPgDb().queryOne(
+    `SELECT COUNT(*) AS total FROM approvals a WHERE 1=1` + where,
+    params
+  );
+  return Number(row?.["total"] ?? 0);
+}
+async function listApprovals(filters) {
+  let query = `SELECT a.*, u.username AS submitter_name
+FROM approvals a
+LEFT JOIN users u ON u.id = a.submitted_by
+WHERE 1=1`;
+  const { where, params } = buildWhereParams(filters);
+  query += where + " ORDER BY a.created_at DESC LIMIT ? OFFSET ?";
+  params.push(filters?.limit ?? 50, filters?.offset ?? 0);
   return getPgDb().query(query, params);
 }
 function getApprovalById(id) {
   return getPgDb().queryOne(FIND_BY_ID, [id]);
 }
-function insertApproval(dataSourceId, sqlText, submittedBy) {
-  return getPgDb().queryOne(CREATE, [dataSourceId, sqlText, submittedBy]);
+function insertApproval(dataSourceId, dbName, sqlText, submittedBy) {
+  return getPgDb().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy]);
 }
 function updateReview(id, status, reviewedBy, rejectReason) {
   return getPgDb().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
@@ -64,13 +78,15 @@ function setExecuteResult(id, status, result) {
 
 // src/approvals.service.ts
 async function approvalList(req, reply) {
-  const { status, mine } = req.body ?? {};
-  return reply.send(
-    await listApprovals({
-      status,
-      submittedBy: mine === "true" ? req.user.id : void 0
-    })
-  );
+  const { status, mine, limit, offset } = req.body ?? {};
+  const filters = {
+    status,
+    submittedBy: mine === "true" ? req.user.id : void 0,
+    limit: limit ? Number(limit) : void 0,
+    offset: offset ? Number(offset) : void 0
+  };
+  const [rows, total] = await Promise.all([listApprovals(filters), countApprovals(filters)]);
+  return reply.send({ rows, total });
 }
 async function approvalGet(req, reply) {
   const { id } = req.body ?? {};
@@ -79,11 +95,11 @@ async function approvalGet(req, reply) {
   return reply.send(approval);
 }
 async function approvalCreate(req, reply) {
-  const { dataSourceId, sql } = req.body ?? {};
+  const { dataSourceId, database, sql } = req.body ?? {};
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "Data source ID and SQL are required" });
   }
-  const approval = await insertApproval(dataSourceId, sql, req.user.id);
+  const approval = await insertApproval(dataSourceId, database ?? null, sql, req.user.id);
   req.log.info("Approval submitted (user=%s)", req.user.id);
   return reply.code(201).send(approval);
 }
@@ -139,19 +155,21 @@ async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
   }
   await setExecuting(id);
   try {
-    const ds = await getDataSourceWithPassword(
-      approval["data_source_id"],
-      encryptionKey
-    );
-    if (!ds) throw new Error("Data source not found");
-    const pool = getPool({ ...ds, database: ds.database ?? "" });
+    const dataSourceId = approval["data_source_id"];
+    const dbName = approval["db_name"];
+    const pool = dbName ? await getPoolForDatabase(dataSourceId, dbName, encryptionKey) : await (async () => {
+      const ds = await getDataSourceWithPassword(dataSourceId, encryptionKey);
+      if (!ds) throw new Error("Data source not found");
+      return getPool({ ...ds, database: ds.database ?? "" });
+    })();
+    if (!pool) throw new Error("Data source not found");
     const rows = await pool.execute(approval["sql_text"]);
     const result = `${rows.length} rows affected`;
     await setExecuteResult(id, "executed", result);
     log.info("Approval executed (id=%s, user=%s)", id, userId);
     await writeAuditLog({
       userId,
-      dataSourceId: approval["data_source_id"],
+      dataSourceId,
       action: "DML_EXECUTE",
       sqlText: approval["sql_text"],
       resultSummary: result,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "DMS approval workflow domain logic: service, model, sql",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -26,7 +26,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@heyhru/business-dms-audit": "0.6.1",
+    "@heyhru/business-dms-audit": "0.6.2",
     "@heyhru/business-dms-datasource": "0.8.1",
     "@heyhru/server-plugin-pg": "0.7.0",
     "fastify": "^5.8.4"
@@ -36,5 +36,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "af454f60f3d63c4bcc171b7d1981e60e9babfb21"
+  "gitHead": "d06a1293647cb401ff35e86252c9e96154a7b070"
 }