@heyhru/business-dms-approval 0.6.5 → 0.7.1

package/dist/approvals.model.d.ts

@@ -3,7 +3,7 @@ export declare function listApprovals(filters?: {
     submittedBy?: string;
 }): 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;

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,sCAatF;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,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,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.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
@@ -61,24 +61,27 @@ WHERE id = ?`;
 
 // src/approvals.model.ts
 async function listApprovals(filters) {
-  let query = "SELECT * FROM approvals WHERE 1=1";
+  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 params = [];
   if (filters?.status) {
-    query += " AND status = ?";
+    query += " AND a.status = ?";
     params.push(filters.status);
   }
   if (filters?.submittedBy) {
-    query += " AND submitted_by = ?";
+    query += " AND a.submitted_by = ?";
     params.push(filters.submittedBy);
   }
-  query += " ORDER BY created_at DESC";
+  query += " ORDER BY a.created_at DESC";
   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]);
@@ -107,11 +110,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);
 }
@@ -167,19 +170,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
@@ -30,24 +30,27 @@ WHERE id = ?`;
 
 // src/approvals.model.ts
 async function listApprovals(filters) {
-  let query = "SELECT * FROM approvals WHERE 1=1";
+  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 params = [];
   if (filters?.status) {
-    query += " AND status = ?";
+    query += " AND a.status = ?";
     params.push(filters.status);
   }
   if (filters?.submittedBy) {
-    query += " AND submitted_by = ?";
+    query += " AND a.submitted_by = ?";
     params.push(filters.submittedBy);
   }
-  query += " ORDER BY created_at DESC";
+  query += " ORDER BY a.created_at DESC";
   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]);
@@ -76,11 +79,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);
 }
@@ -136,19 +139,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.6.5",
+  "version": "0.7.1",
   "description": "DMS approval workflow domain logic: service, model, sql",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -36,5 +36,5 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },
-  "gitHead": "8e00760abe8e7497a79f25f559dd353a9746bcaa"
+  "gitHead": "6bd2092d7f1dd2bc23d5252e2be4136792ddec4f"
 }