@dwtechs/antity-pgsql 0.11.1 → 0.13.0

package/README.md

@@ -208,6 +208,13 @@ class SQLEntity {
         query: string;
         args: unknown[];
     };
+    archive: (
+      rows: Record<string, unknown>[],
+      consumerId?: number | string,
+      consumerName?: string) => {
+        query: string;
+        args: unknown[];
+    };
     insert: (
       rows: Record<string, unknown>[],
       consumerId?: number | string,
@@ -278,6 +285,7 @@ Using substacks simplifies your route definitions and ensures consistent data pr
 ### Query Methods
 
 - **query.select()**: Generates a SELECT query. When the `rows` parameter is provided (not null), pagination is automatically enabled and the query includes `COUNT(*) OVER () AS total` to return the total number of rows. The total count is extracted from results and returned separately from the row data.
+- **query.archive()**: Generates a simplified `UPDATE ... SET archived = true WHERE id IN (...)` query. Accepts an array of objects with `id` property. Optionally appends `consumerId` and `consumerName` for history tracking. Does not require an `archived` field in the rows — it is set directly in the SQL.
 - **delete()**: Deletes rows by their IDs. Expects `req.body.rows` to be an array of objects with `id` property: `[{id: 1}, {id: 2}]`
 - **deleteArchive()**: Deletes archived rows that were archived before a specific date using a PostgreSQL SECURITY DEFINER function. Expects `req.body.date` to be a Date object.
 - **getHistory()**: Retrieves modification history for rows from the `log.history` table. Expects `req.body.rows` to be an array of objects with `id` property. Returns all historical records for the specified entity IDs.

package/dist/antity-pgsql.d.ts

@@ -98,6 +98,7 @@ export declare class SQLEntity extends Entity {
   private sel: unknown;
   private ins: unknown;
   private upd: unknown;
+  private arc: unknown;
   
   constructor(name: string, properties: Property[], schema?: string);
   
@@ -106,7 +107,9 @@ export declare class SQLEntity extends Entity {
   
   get schema(): string;
   set schema(schema: string);
-  
+
+  get properties(): Property[];
+
   get addArraySubstack(): SubstackTuple;
   get addOneSubstack(): SubstackTuple;
   get updateArraySubstack(): SubstackTuple;
@@ -133,6 +136,15 @@ export declare class SQLEntity extends Entity {
       args: unknown[];
     };
     
+    archive: (
+      rows: Record<string, unknown>[],
+      consumerId?: number | string,
+      consumerName?: string
+    ) => {
+      query: string;
+      args: unknown[];
+    };
+    
     insert: (
       rows: Record<string, unknown>[],
       consumerId?: number | string,

package/dist/antity-pgsql.js

@@ -320,7 +320,7 @@ class Insert {
     }
 }
 
-var __awaiter$2 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+var __awaiter$3 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -362,7 +362,7 @@ class Update {
         return { query, args };
     }
     execute(query, args, client) {
-        return __awaiter$2(this, void 0, void 0, function* () {
+        return __awaiter$3(this, void 0, void 0, function* () {
             return execute(query, args, client);
         });
     }
@@ -372,6 +372,35 @@ class Update {
     }
 }
 
+var __awaiter$2 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+class Archive {
+    query(schema, table, rows, consumerId, consumerName) {
+        log.debug(`${LOGS_PREFIX}Archive query input rows: ${JSON.stringify(rows, null, 2)}`);
+        const l = rows.length;
+        const args = rows.map(row => row.id);
+        let query = `UPDATE ${quoteIfUppercase(schema)}.${quoteIfUppercase(table)} SET archived = true`;
+        if (consumerId !== undefined && consumerName !== undefined) {
+            query += `, ${quoteIfUppercase("consumerId")} = $${l + 1}, ${quoteIfUppercase("consumerName")} = $${l + 2}`;
+            args.push(consumerId, consumerName);
+        }
+        query += ` WHERE id IN ${$i(l, 0)}`;
+        return { query, args };
+    }
+    execute(query, args, client) {
+        return __awaiter$2(this, void 0, void 0, function* () {
+            return execute(query, args, client);
+        });
+    }
+}
+
 var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -584,6 +613,7 @@ class SQLEntity extends Entity {
         this.sel = new Select();
         this.ins = new Insert();
         this.upd = new Update();
+        this.arc = new Archive();
         this.query = {
             select: (first = 0, rows = null, sortField = null, sortOrder = null, filters = null) => {
                 return this.sel.query(this.schema, this.table, first, rows, sortField, sortOrder, filters);
@@ -597,6 +627,9 @@ class SQLEntity extends Entity {
             delete: (ids) => {
                 return queryById(this.schema, this.table, ids);
             },
+            archive: (rows, consumerId, consumerName) => {
+                return this.arc.query(this.schema, this.table, rows, consumerId, consumerName);
+            },
             deleteArchive: () => {
                 return queryByDate();
             },
@@ -612,7 +645,7 @@ class SQLEntity extends Entity {
             const rows = b.rows || null;
             const sortField = b.sortField || null;
             const sortOrder = b.sortOrder === -1 || b.sortOrder === "DESC" ? "DESC" : "ASC";
-            const filters = cleanFilters(b.filters, this.properties || []) || null;
+            const filters = cleanFilters(b.filters, this.properties) || null;
             const pagination = b.pagination || false;
             const dbClient = l.dbClient || null;
             log.debug(`get(first='${first}', rows='${rows}', 
@@ -655,12 +688,12 @@ class SQLEntity extends Entity {
         });
         this.update = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
-            const rows = req.body.rows;
+            const r = req.body.rows;
             const dbClient = l.dbClient || null;
             const cId = l.consumerId;
             const cName = l.consumerName;
-            log.debug(`${LOGS_PREFIX}update(rows=${rows.length}, consumerId=${cId})`);
-            const chunks = chunk(rows);
+            log.debug(`${LOGS_PREFIX}update(rows=${r.length}, consumerId=${cId})`);
+            const chunks = chunk(r);
             for (const c of chunks) {
                 const { query, args } = this.upd.query(this._schema, this._table, c, cId, cName);
                 try {
@@ -670,19 +703,19 @@ class SQLEntity extends Entity {
                     return next(err);
                 }
             }
+            l.rows = r;
             next();
         });
         this.archive = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
-            let rows = req.body.rows;
+            let r = req.body.rows;
             const dbClient = l.dbClient || null;
             const cId = l.consumerId;
             const cName = l.consumerName;
-            log.debug(`${LOGS_PREFIX}archive(rows=${rows.length}, consumerId=${cId})`);
-            rows = rows.map((id) => (Object.assign(Object.assign({}, id), { archived: true })));
-            const chunks = chunk(rows);
+            log.debug(`${LOGS_PREFIX}archive(rows=${r.length}, consumerId=${cId})`);
+            const chunks = chunk(r);
             for (const c of chunks) {
-                const { query, args } = this.upd.query(this._schema, this._table, c, cId, cName);
+                const { query, args } = this.arc.query(this._schema, this._table, c, cId, cName);
                 try {
                     yield execute(query, args, dbClient);
                 }
@@ -765,6 +798,9 @@ class SQLEntity extends Entity {
             throw new Error(`${LOGS_PREFIX}schema must be a string of length > 0`);
         this._schema = schema;
     }
+    get properties() {
+        return super.properties;
+    }
     get addArraySubstack() {
         return [this.normalizeArray, this.validateArray, this.add];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.11.1",
+  "version": "0.13.0",
   "description": "Open source library to add PostgreSQL support to @dwtechs/Antity entities.",
   "keywords": [
     "entities"