pangea-server 1.0.34 → 1.0.36

package/dist/database/db.class.d.ts

@@ -27,9 +27,11 @@ type FindManyOptions<BM extends BaseModel> = {
     search?: string | null;
     group?: Group;
     order?: Order;
+    paranoid?: 'active' | 'all' | 'deleted';
+};
+type FindManyPagedOptions<BM extends BaseModel> = FindManyOptions<BM> & {
     page?: number | null;
     pageSize?: number | null;
-    paranoid?: 'active' | 'all' | 'deleted';
 };
 type Target<BM extends BaseModel> = Filters<BM> | BM;
 export declare class Db {
@@ -37,24 +39,27 @@ export declare class Db {
     constructor(tx: Tx);
     findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM | null>;
     findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM>;
-    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<{
+    findManyInstances<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
+    count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;
+    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
         instances: BM[];
         totalCount: number;
     }>;
+    private __getFindManyBaseOptions;
     insertOne<BM extends BaseModel>(model: BaseModelCtor<BM>, params: InsertParams<BM>): Promise<BM>;
     insertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, data: InsertParams<BM>[]): Promise<number>;
-    UpsertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, fieldsToUpdate: (keyof BM)[], data: InsertParams<BM>[]): Promise<number>;
+    upsertMany<BM extends BaseModel>(model: BaseModelCtor<BM>, fieldsToUpdate: (keyof BM)[], data: InsertParams<BM>[]): Promise<number>;
     updateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>, params: UpdateParams<BM>): Promise<BM>;
     updateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>, params: UpdateParams<BM>): Promise<number>;
     deleteOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>): Promise<BM | null>;
     deleteMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
     destroyOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>): Promise<BM | null>;
     destroyMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<number>;
+    private __deleteOne;
+    private __deleteMany;
     restoreOne<BM extends BaseModel>(model: BaseModelCtor<BM>, target: Target<BM>): Promise<BM>;
     restoreMany<BM extends BaseModel>(model: BaseModelCtor<BM>, where: Where<BM>): Promise<void>;
     private __getInstance;
-    private __deleteOne;
-    private __deleteMany;
     enableForeignKeyChecks(): Promise<[unknown[], unknown]>;
     disableForeignKeyChecks(): Promise<[unknown[], unknown]>;
 }

package/dist/database/db.class.js

@@ -36,8 +36,41 @@ class Db {
             helpers_1.AppError.ThrowEntityNotFound();
         return instance;
     }
+    async findManyInstances(model, options = {}) {
+        const baseOptions = this.__getFindManyBaseOptions(model, options);
+        const { page, pageSize } = options;
+        if (page && pageSize) {
+            const idRows = await model.findAll({
+                ...baseOptions,
+                attributes: [[(0, sequelize_1.col)(`${model.name}.id`), 'id']],
+                group: [`${model.name}.id`],
+                raw: true,
+                offset: (page - 1) * pageSize,
+                limit: pageSize,
+            });
+            const ids = idRows.map((row) => row.id);
+            return model.findAll({ ...baseOptions, where: { id: { [_1.Ops.in]: ids } } });
+        }
+        return model.findAll(baseOptions);
+    }
+    async count(model, options = {}) {
+        const baseOptions = this.__getFindManyBaseOptions(model, options);
+        return model.count({ ...baseOptions, col: 'id', distinct: true });
+    }
     async findMany(model, options = {}) {
-        const { attributes, include = [], where, searchFields, search, group, order, page, pageSize, paranoid = 'active', } = options;
+        const { page, pageSize } = options;
+        if (page && pageSize) {
+            const [instances, totalCount] = await Promise.all([
+                this.findManyInstances(model, options),
+                this.count(model, options),
+            ]);
+            return { instances, totalCount };
+        }
+        const instances = await this.findManyInstances(model, options);
+        return { instances, totalCount: instances.length };
+    }
+    __getFindManyBaseOptions(model, options = {}) {
+        const { attributes, include = [], where, searchFields, search, group, order, paranoid = 'active' } = options;
         let searchWhere;
         if (searchFields?.length && search) {
             const searchWords = search.split(/\s+/).filter(Boolean);
@@ -51,7 +84,7 @@ class Db {
             };
         }
         const deletedAtWhere = paranoid === 'deleted' ? { deletedAt: { [_1.Ops.not]: null } } : {};
-        const baseOptions = {
+        return {
             attributes: getFinalAttributes(attributes),
             ...getIncludeAndWhere(model, include, { ...where, ...searchWhere, ...deletedAtWhere }),
             ...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
@@ -60,26 +93,6 @@ class Db {
             subQuery: false,
             transaction: this.__tx,
         };
-        if (page && pageSize) {
-            const [instances, totalCount] = await Promise.all([
-                (async () => {
-                    const idRows = await model.findAll({
-                        ...baseOptions,
-                        attributes: [[(0, sequelize_1.col)(`${model.name}.id`), 'id']],
-                        group: [`${model.name}.id`],
-                        raw: true,
-                        offset: (page - 1) * pageSize,
-                        limit: pageSize,
-                    });
-                    const ids = idRows.map((row) => row.id);
-                    return model.findAll({ ...baseOptions, where: { id: { [_1.Ops.in]: ids } } });
-                })(),
-                model.count({ ...baseOptions, col: 'id', distinct: true }),
-            ]);
-            return { instances, totalCount };
-        }
-        const instances = await model.findAll(baseOptions);
-        return { instances, totalCount: instances.length };
     }
     // insert methods
     insertOne(model, params) {
@@ -94,7 +107,7 @@ class Db {
             return newInstances.length;
         });
     }
-    UpsertMany(model, fieldsToUpdate, data) {
+    upsertMany(model, fieldsToUpdate, data) {
         return handleDbError(async () => {
             const newInstances = await model.bulkCreate(data, {
                 updateOnDuplicate: fieldsToUpdate,
@@ -125,13 +138,24 @@ class Db {
     deleteMany(model, where) {
         return this.__deleteMany(model, where, false);
     }
-    // destroy methods
     destroyOne(model, target) {
         return this.__deleteOne(model, target, true);
     }
     destroyMany(model, where) {
         return this.__deleteMany(model, where, true);
     }
+    __deleteOne(model, target, force) {
+        return handleDbError(async () => {
+            const instance = await this.__getInstance(model, target);
+            await instance.destroy({ force, transaction: this.__tx });
+            return this.findOneOrNull(model, instance.id, { paranoid: false });
+        });
+    }
+    __deleteMany(model, where, force) {
+        return handleDbError(() => {
+            return model.destroy({ where, force, transaction: this.__tx });
+        });
+    }
     // restore methods
     restoreOne(model, target) {
         return handleDbError(async () => {
@@ -151,18 +175,6 @@ class Db {
             return target;
         return this.findOne(model, target, { paranoid });
     }
-    __deleteOne(model, target, force) {
-        return handleDbError(async () => {
-            const instance = await this.__getInstance(model, target);
-            await instance.destroy({ force, transaction: this.__tx });
-            return this.findOneOrNull(model, instance.id, { paranoid: false });
-        });
-    }
-    __deleteMany(model, where, force) {
-        return handleDbError(() => {
-            return model.destroy({ where, force, transaction: this.__tx });
-        });
-    }
     // foreign key methods
     enableForeignKeyChecks() {
         const dbClient = (0, db_client_1.getDbClient)();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "files": [
     "dist"
   ],