@heyhru/business-dms-approval 0.7.2 → 0.8.1

package/dist/approvals.model.d.ts

@@ -7,7 +7,14 @@ interface ApprovalFilters {
 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, dbName: string | null, sqlText: string, submittedBy: string): Promise<Record<string, unknown> | undefined>;
+interface InsertApprovalParams {
+    dataSourceId: string;
+    dbName: string | null;
+    sqlText: string;
+    submittedBy: string;
+    sqlType?: string;
+}
+export declare function insertApproval({ dataSourceId, dbName, sqlText, submittedBy, sqlType }: InsertApprovalParams): 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,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"}
+{"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,UAAU,oBAAoB;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAe,EAAE,EAAE,oBAAoB,gDAEnH;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

@@ -2,6 +2,7 @@ import { type FastifyRequest, type FastifyReply } from "fastify";
 interface AuthenticatedRequest extends FastifyRequest {
     user: {
         id: string;
+        role: string;
     };
 }
 export declare function approvalList(req: AuthenticatedRequest, reply: FastifyReply): Promise<never>;

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;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"}
+{"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,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAYhF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,kBAKzE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,kBAWlF;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, db_name, sql_text, submitted_by)\nVALUES (?, ?, ?, ?)\nRETURNING *";
+export declare const CREATE = "\nINSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by, sql_type)\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,gHAGP,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,6HAGP,CAAC;AAEb,eAAO,MAAM,aAAa,cAId,CAAC;AAEb,eAAO,MAAM,gBAAgB,cAGhB,CAAC;AAEd,eAAO,MAAM,aAAa,cAGb,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { approvalList, approvalGet, approvalCreate, approvalApprove, approvalReject, approvalExecute, } from "./approvals.service.js";
+export { getApprovalById, setExecuting, setExecuteResult } from "./approvals.model.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,GAChB,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/index.js

@@ -25,7 +25,10 @@ __export(index_exports, {
   approvalExecute: () => approvalExecute,
   approvalGet: () => approvalGet,
   approvalList: () => approvalList,
-  approvalReject: () => approvalReject
+  approvalReject: () => approvalReject,
+  getApprovalById: () => getApprovalById,
+  setExecuteResult: () => setExecuteResult,
+  setExecuting: () => setExecuting
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -42,8 +45,8 @@ SELECT *
 FROM approvals
 WHERE id = ?`;
 var CREATE = `
-INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by)
-VALUES (?, ?, ?, ?)
+INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by, sql_type)
+VALUES (?, ?, ?, ?, ?)
 RETURNING *`;
 var UPDATE_REVIEW = () => `
 UPDATE approvals
@@ -94,8 +97,8 @@ WHERE 1=1`;
 function getApprovalById(id) {
   return (0, import_server_plugin_pg.getPgDb)().queryOne(FIND_BY_ID, [id]);
 }
-function insertApproval(dataSourceId, dbName, sqlText, submittedBy) {
-  return (0, import_server_plugin_pg.getPgDb)().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy]);
+function insertApproval({ dataSourceId, dbName, sqlText, submittedBy, sqlType = "DML" }) {
+  return (0, import_server_plugin_pg.getPgDb)().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy, sqlType]);
 }
 function updateReview(id, status, reviewedBy, rejectReason) {
   return (0, import_server_plugin_pg.getPgDb)().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
@@ -110,9 +113,11 @@ function setExecuteResult(id, status, result) {
 // src/approvals.service.ts
 async function approvalList(req, reply) {
   const { status, mine, limit, offset } = req.body ?? {};
+  const isDeveloper = req.user.role === "developer";
+  const ownOnly = isDeveloper || String(mine) === "true";
   const filters = {
     status,
-    submittedBy: mine === "true" ? req.user.id : void 0,
+    submittedBy: ownOnly ? req.user.id : void 0,
     limit: limit ? Number(limit) : void 0,
     offset: offset ? Number(offset) : void 0
   };
@@ -126,12 +131,19 @@ async function approvalGet(req, reply) {
   return reply.send(approval);
 }
 async function approvalCreate(req, reply) {
-  const { dataSourceId, database, sql } = req.body ?? {};
+  const { dataSourceId, database, sql, sqlType } = req.body ?? {};
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "Data source ID and SQL are required" });
   }
-  const approval = await insertApproval(dataSourceId, database ?? null, sql, req.user.id);
-  req.log.info("Approval submitted (user=%s)", req.user.id);
+  const type = sqlType === "EXPORT" ? "EXPORT" : "DML";
+  const approval = await insertApproval({
+    dataSourceId,
+    dbName: database ?? null,
+    sqlText: sql,
+    submittedBy: req.user.id,
+    sqlType: type
+  });
+  req.log.info("Approval submitted (user=%s, type=%s)", req.user.id, type);
   return reply.code(201).send(approval);
 }
 async function reviewApproval(id, reviewerId, decision, rejectReason) {
@@ -221,5 +233,8 @@ async function doExecuteApproval({ id, userId, ip, encryptionKey }, log) {
   approvalExecute,
   approvalGet,
   approvalList,
-  approvalReject
+  approvalReject,
+  getApprovalById,
+  setExecuteResult,
+  setExecuting
 });

package/dist/index.mjs

@@ -11,8 +11,8 @@ SELECT *
 FROM approvals
 WHERE id = ?`;
 var CREATE = `
-INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by)
-VALUES (?, ?, ?, ?)
+INSERT INTO approvals (data_source_id, db_name, sql_text, submitted_by, sql_type)
+VALUES (?, ?, ?, ?, ?)
 RETURNING *`;
 var UPDATE_REVIEW = () => `
 UPDATE approvals
@@ -63,8 +63,8 @@ WHERE 1=1`;
 function getApprovalById(id) {
   return getPgDb().queryOne(FIND_BY_ID, [id]);
 }
-function insertApproval(dataSourceId, dbName, sqlText, submittedBy) {
-  return getPgDb().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy]);
+function insertApproval({ dataSourceId, dbName, sqlText, submittedBy, sqlType = "DML" }) {
+  return getPgDb().queryOne(CREATE, [dataSourceId, dbName, sqlText, submittedBy, sqlType]);
 }
 function updateReview(id, status, reviewedBy, rejectReason) {
   return getPgDb().queryOne(UPDATE_REVIEW(), [status, reviewedBy, rejectReason, id]);
@@ -79,9 +79,11 @@ function setExecuteResult(id, status, result) {
 // src/approvals.service.ts
 async function approvalList(req, reply) {
   const { status, mine, limit, offset } = req.body ?? {};
+  const isDeveloper = req.user.role === "developer";
+  const ownOnly = isDeveloper || String(mine) === "true";
   const filters = {
     status,
-    submittedBy: mine === "true" ? req.user.id : void 0,
+    submittedBy: ownOnly ? req.user.id : void 0,
     limit: limit ? Number(limit) : void 0,
     offset: offset ? Number(offset) : void 0
   };
@@ -95,12 +97,19 @@ async function approvalGet(req, reply) {
   return reply.send(approval);
 }
 async function approvalCreate(req, reply) {
-  const { dataSourceId, database, sql } = req.body ?? {};
+  const { dataSourceId, database, sql, sqlType } = req.body ?? {};
   if (!dataSourceId || !sql) {
     return reply.code(400).send({ error: "Data source ID and SQL are required" });
   }
-  const approval = await insertApproval(dataSourceId, database ?? null, sql, req.user.id);
-  req.log.info("Approval submitted (user=%s)", req.user.id);
+  const type = sqlType === "EXPORT" ? "EXPORT" : "DML";
+  const approval = await insertApproval({
+    dataSourceId,
+    dbName: database ?? null,
+    sqlText: sql,
+    submittedBy: req.user.id,
+    sqlType: type
+  });
+  req.log.info("Approval submitted (user=%s, type=%s)", req.user.id, type);
   return reply.code(201).send(approval);
 }
 async function reviewApproval(id, reviewerId, decision, rejectReason) {
@@ -189,5 +198,8 @@ export {
   approvalExecute,
   approvalGet,
   approvalList,
-  approvalReject
+  approvalReject,
+  getApprovalById,
+  setExecuteResult,
+  setExecuting
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.2",
+  "version": "0.8.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": "d06a1293647cb401ff35e86252c9e96154a7b070"
+  "gitHead": "ba1108598de594155e02b0800796d13a4e7b7449"
 }