pangea-server 1.0.70 → 1.0.72

package/dist/authentication/base-auth.class.d.ts

@@ -5,6 +5,7 @@ export declare abstract class BaseAuth<AM extends AuthMap> {
     free(): void;
     notSetYet(): void;
     notAllowed(): void;
+    isUserAuth<T extends UserType<AM>>(type: T): boolean;
     getUserAuth<T extends UserType<AM>>(type: T): NonNullable<AuthUsers<AM>[T]>;
     getUsersAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: InstanceType<AM[T[I]]> | null; };
 }

package/dist/authentication/base-auth.class.js

@@ -16,6 +16,9 @@ class BaseAuth {
     notAllowed() {
         helpers_1.AppError.ThrowUnauthorized();
     }
+    isUserAuth(type) {
+        return !!this.__authUsers[type];
+    }
     getUserAuth(type) {
         const user = this.__authUsers[type];
         if (!user)

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

@@ -29,15 +29,17 @@ type FindManyPagedOptions<BM extends BaseModel> = FindManyOptions<BM> & {
 };
 type AggregateManyConfig = {
     attributes: Attributes;
+    relations?: Record<string, BaseModelCtor>;
     group: Group;
 };
+type AggregateManyOptions<BM extends BaseModel> = Omit<FindManyOptions<BM>, 'order'>;
 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<BM>): Promise<BM | null>;
+    aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions<BM>): Promise<unknown>;
     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>;
@@ -45,7 +47,7 @@ export declare class Db {
         instances: BM[];
         totalCount: number;
     }>;
-    aggregateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, config: AggregateManyConfig, options?: Omit<FindManyOptions<BM>, 'order'>): Promise<BM[]>;
+    aggregateMany<BM extends BaseModel>(model: BaseModelCtor<BM>, config: AggregateManyConfig, options?: AggregateManyOptions<BM>): Promise<unknown[]>;
     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

@@ -38,6 +38,7 @@ class Db {
             ...baseOptions,
             attributes: getFinalAttributes(model, attributes),
             ...getInclude(model, { attributes, where: options.where }),
+            raw: true,
         });
     }
     __getFindOneBaseOptions(paranoid) {
@@ -74,13 +75,27 @@ class Db {
         return { instances, totalCount: instances.length };
     }
     async aggregateMany(model, config, options = {}) {
-        const { attributes, group } = config;
+        const { attributes, relations = {}, group } = config;
         const baseOptions = this.__getFindManyBaseOptions(model, { ...options, attributes });
-        return model.findAll({
+        const result = (await model.findAll({
             ...baseOptions,
             attributes: getFinalAttributes(model, attributes),
             ...(group && { group: group.map((field) => formatField(model.name, field)) }),
-        });
+            raw: true,
+        }));
+        const relationKeys = Object.keys(relations);
+        if (!relationKeys.length)
+            return result;
+        for (const key of relationKeys) {
+            const keyId = `${key}Id`;
+            const ids = [...new Set(result.map((item) => item[keyId]).filter(Boolean))];
+            if (!ids.length)
+                continue;
+            const model = relations[key];
+            const instances = await this.findMany(model, { where: { id: { [_1.Ops.in]: ids } } });
+            result.forEach((item) => (item[key] = instances.find((instance) => instance.id === item[keyId]) || null));
+        }
+        return result;
     }
     __getFindManyBaseOptions(model, options = {}) {
         const { attributes, where, searchFields, search, order, paranoid = true } = options;

package/package.json

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