pangea-server 1.0.60 → 1.0.62

package/README.md

@@ -1 +1 @@
-# PANGEA BACKEND
+# PANGEA SERVER

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

@@ -9,16 +9,16 @@ type Group = string[];
 type Order = Record<string, 'asc' | 'desc'>;
 type FindOneOptions = {
     scopes?: string[];
-    attributes?: Attributes;
     order?: Order;
     paranoid?: boolean;
 };
+type AggregateOneOptions = {
+    paranoid?: boolean;
+};
 type FindManyOptions<BM extends BaseModel> = {
-    attributes?: Attributes;
     where?: Where<BM>;
     searchFields?: string[];
     search?: string | null;
-    group?: Group;
     order?: Order;
     paranoid?: boolean;
 };
@@ -26,18 +26,25 @@ type FindManyPagedOptions<BM extends BaseModel> = FindManyOptions<BM> & {
     page?: number | null;
     pageSize?: number | null;
 };
+type AggregateManyConfig = {
+    attributes: Attributes;
+    group: Group;
+};
 type Target<BM extends BaseModel> = Filters<BM> | BM;
 export declare class Db {
     private __tx?;
     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>;
+    aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions): Promise<BM | null>;
+    private __getFindOneBaseOptions;
     findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
     count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;
     findManyWithCount<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
         instances: BM[];
         totalCount: number;
     }>;
+    aggregateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, config: AggregateManyConfig, options?: Omit<FindManyOptions<BM>, 'order'>): Promise<BM[]>;
     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>;

package/dist/database/db.class.js

@@ -13,20 +13,15 @@ class Db {
     }
     // find methods
     findOneOrNull(model, filters, options = {}) {
-        const { scopes, attributes, order, paranoid = true } = options;
+        const { scopes, order, paranoid = true } = options;
         const scopedModel = scopes?.length ? model.scope(...scopes) : model;
-        const baseOptions = {
-            attributes: getFinalAttributes(model, attributes),
-            paranoid,
-            subQuery: false,
-            transaction: this.__tx,
-        };
+        const baseOptions = this.__getFindOneBaseOptions(paranoid);
         if (typeof filters === 'number') {
             return scopedModel.findByPk(filters, { ...baseOptions, ...getInclude(model) });
         }
         return scopedModel.findOne({
             ...baseOptions,
-            ...getInclude(model, { attributes, where: filters }),
+            ...getInclude(model, { where: filters }),
             order: getFinalOrder(order),
         });
     }
@@ -36,6 +31,18 @@ class Db {
             helpers_1.AppError.ThrowEntityNotFound();
         return instance;
     }
+    aggregateOne(model, attributes, options = {}) {
+        const { paranoid = true } = options;
+        const baseOptions = this.__getFindOneBaseOptions(paranoid);
+        return model.findOne({
+            ...baseOptions,
+            attributes: getFinalAttributes(model, attributes),
+            ...getInclude(model, { attributes }),
+        });
+    }
+    __getFindOneBaseOptions(paranoid) {
+        return { paranoid, subQuery: false, transaction: this.__tx };
+    }
     async findMany(model, options = {}) {
         const baseOptions = this.__getFindManyBaseOptions(model, options);
         const { page, pageSize } = options;
@@ -66,8 +73,18 @@ class Db {
         const instances = await this.findMany(model, options);
         return { instances, totalCount: instances.length };
     }
+    async aggregateMany(model, config, options = {}) {
+        const baseOptions = this.__getFindManyBaseOptions(model, options);
+        return model.findAll({
+            ...baseOptions,
+            attributes: getFinalAttributes(model, config.attributes),
+            ...(config.group && {
+                group: config.group.map((field) => (field.includes('.') ? field : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(field)}`)),
+            }),
+        });
+    }
     __getFindManyBaseOptions(model, options = {}) {
-        const { attributes, where, searchFields, search, group, order, paranoid = true } = options;
+        const { where, searchFields, search, order, paranoid = true } = options;
         let searchWhere;
         if (searchFields?.length && search) {
             const searchWords = search.split(/\s+/).filter(Boolean);
@@ -81,9 +98,7 @@ class Db {
             };
         }
         return {
-            attributes: getFinalAttributes(model, attributes),
-            ...getInclude(model, { attributes, where: { ...where, ...searchWhere } }),
-            ...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
+            ...getInclude(model, { where: { ...where, ...searchWhere } }),
             order: getFinalOrder(order),
             paranoid,
             subQuery: false,

package/package.json

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