anote-server-libs 0.2.7 → 0.2.8

package/models/repository/ModelDao.ts

@@ -1,259 +1,259 @@
-
-import { ConnectionPool, Request, Transaction } from 'mssql';
-import {ClientBase, Pool} from 'pg';
-import {Logger} from 'winston';
-
-declare const Promise: PromiseConstructor & {
-    allConcurrent: <T>(n: number) => ((promiseProxies: (() => Promise<T>)[]) => Promise<T[]>);
-};
-
-export function promiseAllStepN<T>(n: number, list: (() => Promise<T>)[]): Promise<T[]> {
-    if(!list || !list.length) return Promise.resolve([]);
-    const tail = list.splice(n);
-    const head = list;
-    const resolved: any[] = [];
-    let processed = 0;
-    return new Promise(resolve => {
-        head.forEach(x => {
-            const res = x();
-            resolved.push(res);
-            res.then((y: any) => {
-                runNext();
-                return y;
-            });
-        });
-        function runNext() {
-            if(processed === tail.length) {
-                resolve(Promise.all(resolved));
-            } else {
-                resolved.push(tail[processed]().then((x: any) => {
-                    runNext();
-                    return x;
-                }));
-                processed++;
-            }
-        }
-    });
-}
-Promise.allConcurrent = <T>(n: number) => (list: (() => Promise<T>)[]) => promiseAllStepN(n, list);
-
-export interface Model<T> {
-    id?: T;
-    updatedOn?: Date;
-}
-
-export interface ArchivedModel<T> extends Model<T> {
-    createdOn?: Date;
-    archivedOn?: Date;
-    replaced_id?: T;
-    replaced_by_id?: T;
-}
-
-export interface ModelRepr {
-    table: string;
-}
-
-export interface ViewCount<T> {
-    views: T[];
-    count: number;
-}
-
-export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
-    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger, public table: string, protected nFields: number,
-                protected updateDefinition: string) {
-    }
-
-    groupResultSet(q: any[], key: string): any[][] {
-        const storage = {};
-        for(let i = 0; i < q.length; i++) {
-            storage[q[i][key]] = storage[q[i][key]] || [];
-            storage[q[i][key]].push(q[i]);
-        }
-        return Object.getOwnPropertyNames(storage).map(k => storage[k]);
-    }
-
-    groupResultSetBy(q: any[], key: (qs: any) => string): any[][] {
-        const storage = {};
-        for(let i = 0; i < q.length; i++) {
-            storage[key(q[i])] = storage[key(q[i])] || [];
-            storage[key(q[i])].push(q[i]);
-        }
-        return Object.getOwnPropertyNames(storage).map(k => storage[k]);
-    }
-
-    update(instance: T, client: ClientBase | ConnectionPool | Transaction): Promise<R> {
-        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
-        instance.updatedOn = new Date();
-        if(this.pool) {
-            const props = this.serialize(instance);
-            props.push(instance.id);
-            return (<ClientBase>client).query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=$' + (this.nFields + 1), props).then(() => instance.id);
-        } else {
-            const request = (<ConnectionPool | Transaction>client).request();
-            this.serialize(instance, request);
-            request.input(String(this.nFields + 1), instance.id);
-            return request.query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=@' + (this.nFields + 1)).then(() => instance.id);
-        }
-    }
-
-    create(instance: T, client?: ClientBase | Transaction): Promise<R> {
-        (<any>instance).createdOn = instance.updatedOn = new Date();
-        if(this.pool) {
-            const props = this.serialize(instance);
-            return (<ClientBase | Pool>(client || this.pool)).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
-                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '$' + (i + 1)).join(',') + ') RETURNING id',
-                props).then(q => {
-                    const idNum = parseInt(q.rows[0].id, 10);
-                    if(String(idNum) !== q.rows[0].id) return q.rows[0].id;
-                    return idNum;
-                });
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            this.serialize(instance, request);
-            return request.query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=@\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
-                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then(q => {
-                    return q.recordsets[0][0].id || instance.id;
-                });
-        }
-    }
-
-    createSeveral(instances: T[], client?: ClientBase): Promise<R[]> {
-        if(!instances.length) return Promise.resolve([]);
-        const now = new Date();
-        instances.forEach(instance => instance.updatedOn = now);
-        const props = [].concat.apply([], instances.map(instance => this.serialize(instance)));
-        return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
-            + ' VALUES' + instances.map((_, j) =>
-                ('(' + new Array(this.nFields).fill(undefined).map((__, i: number) => '$' + (j * this.nFields + i + 1)).join(', ') + ')')).join(',') + ' RETURNING id',
-            props).then(q => q.rows.map(r => {
-                const idNum = parseInt(r.id, 10);
-                if(String(idNum) !== q.rows[0].id) return r.id;
-                return idNum;
-            }));
-    }
-
-    protected abstract buildObject(q: any): T;
-
-    protected abstract serialize(instance: T, request?: Request): any[];
-}
-
-export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
-    get(id: R, client?: ClientBase | Transaction, lock = true): Promise<T> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + ' WHERE id=$1' + ((client && lock) ? ' FOR UPDATE' : ''), [id]).then(q => this.buildObject(q.rows[0]));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            request.input('1', id);
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
-        }
-    }
-
-    count(where?: string, inputs: any[] = [], client?: ClientBase | Transaction): Promise<number> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''), inputs).then(q => parseInt(q.rows[0].cnt, 10));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then(q => q.recordsets[0][0].cnt);
-        }
-    }
-
-    getList(ids: R[], client?: ClientBase | Transaction, lock = true): Promise<T[]> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + ' WHERE id=ANY($1)' + ((client && lock) ? ' FOR UPDATE' : ''), [ids])
-                .then(q => q.rows.map(r => this.buildObject(r)));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id IN ('
-                + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
-                .then(q => q.recordsets[0].map(r => this.buildObject(r)));
-        }
-    }
-
-    getAllBy(order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<T[]> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
-                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
-                .then(q => q.rows.map(r => this.buildObject(r)));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
-                + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
-                .then(q => q.recordsets[0].map(r => this.buildObject(r)));
-        }
-    }
-
-    getViewCountBy(order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<ViewCount<T>> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT *, COUNT(*) OVER() AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
-                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
-                .then(q => ({
-                    views: q.rows.map(r => this.buildObject(r)),
-                    count: q.rows.length ? parseInt(q.rows[0].cnt, 10) : 0
-                }));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return Promise.allConcurrent(1)([
-                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
-                    + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
-                () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
-            ]).then(([q1, q2]: [any, any]) => ({
-                views: q1.recordsets[0].map((r: any) => this.buildObject(r)),
-                count: q2.recordsets.length ? q2.recordsets[0].reduce((p: number, n: any) => p + n.cnt, 0) : 0
-            }));
-        }
-    }
-
-    getRowsViewCountBy(rows: string[], order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<ViewCount<any>> {
-        if(this.pool) {
-            return (<ClientBase | Pool>(client || this.pool)).query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ', COUNT(*) OVER() AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
-                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
-                .then(q => ({
-                    views: q.rows.map(r => this.buildObject(r)),
-                    count: q.rows.length ? parseInt(q.rows[0].cnt, 10) : 0
-                }));
-        } else {
-            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
-            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return Promise.allConcurrent(1)([
-                () => request.query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ' FROM ' + this.table
-                    + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
-                    + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
-                () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
-            ]).then(([q1, q2]: [any, any]) => ({
-                views: q1.recordsets[0].map((r: any) => this.buildObject(r)),
-                count: q2.recordsets.length ? q2.recordsets[0].reduce((p: number, n: any) => p + n.cnt, 0) : 0
-            }));
-        }
-    }
-
-    archive(id: R, replacedById: R, client: ClientBase | Transaction): Promise<any> {
-        if(this.pool) {
-            return (<ClientBase>client).query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=$1 WHERE id=$2', [replacedById, id]);
-        } else {
-            const request = (<Transaction>client).request();
-            request.input('1', replacedById);
-            request.input('2', id);
-            return request.query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=@1 WHERE id=@2');
-        }
-    }
-
-    replace(instance: T, client: ClientBase | Transaction): Promise<R> {
-        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
-        return this.create({...instance, replaced_id: instance.id}, client).then(id => {
-            return this.archive(instance.id, id, client).then(() => id);
-        });
-    }
-
-    delete(id: R, client: ClientBase | Transaction): Promise<any> {
-        if(this.pool) {
-            return (<ClientBase>client).query('DELETE FROM ' + this.table + ' WHERE id=$1', [id]);
-        } else {
-            const request = (<Transaction>client).request();
-            request.input('1', id);
-            return request.query('DELETE FROM ' + this.table + ' WHERE id=@1');
-        }
-    }
-}
+
+import { ConnectionPool, Request, Transaction } from 'mssql';
+import {ClientBase, Pool} from 'pg';
+import {Logger} from 'winston';
+
+declare const Promise: PromiseConstructor & {
+    allConcurrent: <T>(n: number) => ((promiseProxies: (() => Promise<T>)[]) => Promise<T[]>);
+};
+
+export function promiseAllStepN<T>(n: number, list: (() => Promise<T>)[]): Promise<T[]> {
+    if(!list || !list.length) return Promise.resolve([]);
+    const tail = list.splice(n);
+    const head = list;
+    const resolved: any[] = [];
+    let processed = 0;
+    return new Promise(resolve => {
+        head.forEach(x => {
+            const res = x();
+            resolved.push(res);
+            res.then((y: any) => {
+                runNext();
+                return y;
+            });
+        });
+        function runNext() {
+            if(processed === tail.length) {
+                resolve(Promise.all(resolved));
+            } else {
+                resolved.push(tail[processed]().then((x: any) => {
+                    runNext();
+                    return x;
+                }));
+                processed++;
+            }
+        }
+    });
+}
+Promise.allConcurrent = <T>(n: number) => (list: (() => Promise<T>)[]) => promiseAllStepN(n, list);
+
+export interface Model<T> {
+    id?: T;
+    updatedOn?: Date;
+}
+
+export interface ArchivedModel<T> extends Model<T> {
+    createdOn?: Date;
+    archivedOn?: Date;
+    replaced_id?: T;
+    replaced_by_id?: T;
+}
+
+export interface ModelRepr {
+    table: string;
+}
+
+export interface ViewCount<T> {
+    views: T[];
+    count: number;
+}
+
+export abstract class Dao<R, T extends Model<R>> implements ModelRepr {
+    constructor(protected pool: Pool, protected poolMssql: ConnectionPool, protected logger: Logger, public table: string, protected nFields: number,
+                protected updateDefinition: string) {
+    }
+
+    groupResultSet(q: any[], key: string): any[][] {
+        const storage = {};
+        for(let i = 0; i < q.length; i++) {
+            storage[q[i][key]] = storage[q[i][key]] || [];
+            storage[q[i][key]].push(q[i]);
+        }
+        return Object.getOwnPropertyNames(storage).map(k => storage[k]);
+    }
+
+    groupResultSetBy(q: any[], key: (qs: any) => string): any[][] {
+        const storage = {};
+        for(let i = 0; i < q.length; i++) {
+            storage[key(q[i])] = storage[key(q[i])] || [];
+            storage[key(q[i])].push(q[i]);
+        }
+        return Object.getOwnPropertyNames(storage).map(k => storage[k]);
+    }
+
+    update(instance: T, client: ClientBase | ConnectionPool | Transaction): Promise<R> {
+        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
+        instance.updatedOn = new Date();
+        if(this.pool) {
+            const props = this.serialize(instance);
+            props.push(instance.id);
+            return (<ClientBase>client).query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=$' + (this.nFields + 1), props).then(() => instance.id);
+        } else {
+            const request = (<ConnectionPool | Transaction>client).request();
+            this.serialize(instance, request);
+            request.input(String(this.nFields + 1), instance.id);
+            return request.query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=@' + (this.nFields + 1)).then(() => instance.id);
+        }
+    }
+
+    create(instance: T, client?: ClientBase | Transaction): Promise<R> {
+        (<any>instance).createdOn = instance.updatedOn = new Date();
+        if(this.pool) {
+            const props = this.serialize(instance);
+            return (<ClientBase | Pool>(client || this.pool)).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
+                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '$' + (i + 1)).join(',') + ') RETURNING id',
+                props).then(q => {
+                    const idNum = parseInt(q.rows[0].id, 10);
+                    if(String(idNum) !== q.rows[0].id) return q.rows[0].id;
+                    return idNum;
+                });
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            this.serialize(instance, request);
+            return request.query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=@\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
+                + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i: number) => '@' + (i + 1)).join(',') + '); SELECT SCOPE_IDENTITY() AS id').then(q => {
+                    return q.recordsets[0][0].id || instance.id;
+                });
+        }
+    }
+
+    createSeveral(instances: T[], client?: ClientBase): Promise<R[]> {
+        if(!instances.length) return Promise.resolve([]);
+        const now = new Date();
+        instances.forEach(instance => instance.updatedOn = now);
+        const props = [].concat.apply([], instances.map(instance => this.serialize(instance)));
+        return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
+            + ' VALUES' + instances.map((_, j) =>
+                ('(' + new Array(this.nFields).fill(undefined).map((__, i: number) => '$' + (j * this.nFields + i + 1)).join(', ') + ')')).join(',') + ' RETURNING id',
+            props).then(q => q.rows.map(r => {
+                const idNum = parseInt(r.id, 10);
+                if(String(idNum) !== q.rows[0].id) return r.id;
+                return idNum;
+            }));
+    }
+
+    protected abstract buildObject(q: any): T;
+
+    protected abstract serialize(instance: T, request?: Request): any[];
+}
+
+export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
+    get(id: R, client?: ClientBase | Transaction, lock = true): Promise<T> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + ' WHERE id=$1' + ((client && lock) ? ' FOR UPDATE' : ''), [id]).then(q => this.buildObject(q.rows[0]));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            request.input('1', id);
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
+        }
+    }
+
+    count(where?: string, inputs: any[] = [], client?: ClientBase | Transaction): Promise<number> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''), inputs).then(q => parseInt(q.rows[0].cnt, 10));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
+            return request.query('SELECT count(*) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '')).then(q => q.recordsets[0][0].cnt);
+        }
+    }
+
+    getList(ids: R[], client?: ClientBase | Transaction, lock = true): Promise<T[]> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + ' WHERE id=ANY($1)' + ((client && lock) ? ' FOR UPDATE' : ''), [ids])
+                .then(q => q.rows.map(r => this.buildObject(r)));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id IN ('
+                + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
+                .then(q => q.recordsets[0].map(r => this.buildObject(r)));
+        }
+    }
+
+    getAllBy(order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<T[]> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT * FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
+                .then(q => q.rows.map(r => this.buildObject(r)));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+                + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
+                .then(q => q.recordsets[0].map(r => this.buildObject(r)));
+        }
+    }
+
+    getViewCountBy(order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<ViewCount<T>> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT *, COUNT(*) OVER() AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
+                .then(q => ({
+                    views: q.rows.map(r => this.buildObject(r)),
+                    count: q.rows.length ? parseInt(q.rows[0].cnt, 10) : 0
+                }));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
+            return Promise.allConcurrent(1)([
+                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+                    + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
+                () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
+            ]).then(([q1, q2]: [any, any]) => ({
+                views: q1.recordsets[0].map((r: any) => this.buildObject(r)),
+                count: q2.recordsets.length ? q2.recordsets[0].reduce((p: number, n: any) => p + n.cnt, 0) : 0
+            }));
+        }
+    }
+
+    getRowsViewCountBy(rows: string[], order?: string, offset?: number, limit?: number, where?: string, inputs: any[] = [], client?: ClientBase | Transaction, lock = true): Promise<ViewCount<any>> {
+        if(this.pool) {
+            return (<ClientBase | Pool>(client || this.pool)).query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ', COUNT(*) OVER() AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                + (offset ? (' OFFSET ' + offset) : '') + (limit !== undefined ? (' LIMIT ' + limit) : '') + ((client && lock) ? ' FOR UPDATE' : ''), inputs)
+                .then(q => ({
+                    views: q.rows.map(r => this.buildObject(r)),
+                    count: q.rows.length ? parseInt(q.rows[0].cnt, 10) : 0
+                }));
+        } else {
+            const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
+            if(where) where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
+            return Promise.allConcurrent(1)([
+                () => request.query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ' FROM ' + this.table
+                    + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                    + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
+                () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
+            ]).then(([q1, q2]: [any, any]) => ({
+                views: q1.recordsets[0].map((r: any) => this.buildObject(r)),
+                count: q2.recordsets.length ? q2.recordsets[0].reduce((p: number, n: any) => p + n.cnt, 0) : 0
+            }));
+        }
+    }
+
+    archive(id: R, replacedById: R, client: ClientBase | Transaction): Promise<any> {
+        if(this.pool) {
+            return (<ClientBase>client).query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=$1 WHERE id=$2', [replacedById, id]);
+        } else {
+            const request = (<Transaction>client).request();
+            request.input('1', replacedById);
+            request.input('2', id);
+            return request.query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=@1 WHERE id=@2');
+        }
+    }
+
+    replace(instance: T, client: ClientBase | Transaction): Promise<R> {
+        if((<any>instance).archivedOn) return Promise.reject('Record archived!');
+        return this.create({...instance, replaced_id: instance.id}, client).then(id => {
+            return this.archive(instance.id, id, client).then(() => id);
+        });
+    }
+
+    delete(id: R, client: ClientBase | Transaction): Promise<any> {
+        if(this.pool) {
+            return (<ClientBase>client).query('DELETE FROM ' + this.table + ' WHERE id=$1', [id]);
+        } else {
+            const request = (<Transaction>client).request();
+            request.input('1', id);
+            return request.query('DELETE FROM ' + this.table + ' WHERE id=@1');
+        }
+    }
+}

package/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "anote-server-libs",
-  "version": "0.2.7",
-  "description": "Helpers for express-TS servers",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc -p tsconfig.json"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitlab.anotemusic.com/anote/anote-server-libs.git"
-  },
-  "keywords": [
-    "Express"
-  ],
-  "author": "Mathonet Gregoire",
-  "license": "MIT",
-  "dependencies": {
-    "@types/memcached": "2.2.7",
-    "@types/mssql": "7.1.4",
-    "@types/pg": "8.6.4",
-    "memcached": "2.2.2",
-    "mssql": "8.0.2",
-    "pg": "8.7.3"
-  },
-  "peerDependencies": {
-    "express": "^4.17.3",
-    "jsonschema": "^1.4.0",
-    "node-forge": "^1.2.1",
-    "winston": "3.6.0"
-  },
-  "devDependencies": {
-    "@types/express": "4.17.13",
-    "@types/node": "14.18.2",
-    "@types/node-forge": "1.0.0",
-    "typescript": "4.5.5"
-  }
-}
+{
+  "name": "anote-server-libs",
+  "version": "0.2.8",
+  "description": "Helpers for express-TS servers",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc -p tsconfig.json"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.anotemusic.com/anote/anote-server-libs.git"
+  },
+  "keywords": [
+    "Express"
+  ],
+  "author": "Mathonet Gregoire",
+  "license": "MIT",
+  "dependencies": {
+    "@types/memcached": "2.2.7",
+    "@types/mssql": "7.1.4",
+    "@types/pg": "8.6.4",
+    "memcached": "2.2.2",
+    "mssql": "8.0.2",
+    "pg": "8.7.3"
+  },
+  "peerDependencies": {
+    "express": "^4.17.3",
+    "jsonschema": "^1.4.0",
+    "node-forge": "^1.2.1",
+    "winston": "3.6.0"
+  },
+  "devDependencies": {
+    "@types/express": "4.17.13",
+    "@types/node": "14.18.2",
+    "@types/node-forge": "1.0.0",
+    "typescript": "4.5.5"
+  }
+}