pangea-server 1.0.64 → 1.0.66

package/dist/database/db.class.js

@@ -74,15 +74,16 @@ class Db {
         return { instances, totalCount: instances.length };
     }
     async aggregateMany(model, config, options = {}) {
-        const baseOptions = this.__getFindManyBaseOptions(model, options);
+        const { attributes, group } = config;
+        const baseOptions = this.__getFindManyBaseOptions(model, { ...options, attributes });
         return model.findAll({
             ...baseOptions,
-            attributes: getFinalAttributes(model, config.attributes),
-            ...(config.group && { group: config.group.map((field) => formatField(model.name, field)) }),
+            attributes: getFinalAttributes(model, attributes),
+            ...(group && { group: group.map((field) => formatField(model.name, field)) }),
         });
     }
     __getFindManyBaseOptions(model, options = {}) {
-        const { where, searchFields, search, order, paranoid = true } = options;
+        const { attributes, where, searchFields, search, order, paranoid = true } = options;
         let searchWhere;
         if (searchFields?.length && search) {
             const searchWords = search.split(/\s+/).filter(Boolean);
@@ -96,7 +97,7 @@ class Db {
             };
         }
         return {
-            ...getInclude(model, { where: { ...where, ...searchWhere } }),
+            ...getInclude(model, { attributes, where: { ...where, ...searchWhere } }),
             order: getFinalOrder(order),
             paranoid,
             subQuery: false,
@@ -252,8 +253,6 @@ function getInclude(model, config = {}, relDepth = new Map()) {
         const maxDepth = rel.joinDepth;
         if (currentDepth >= maxDepth)
             continue;
-        if (!rel.eager)
-            continue;
         const relWhere = cleanWhere[relName];
         delete cleanWhere[relName];
         const newRelDepth = new Map(relDepth);

package/dist/database/decorators/relations.d.ts

@@ -1,6 +1,5 @@
 import type { GetModelFn } from '../database.types';
 type RelationOptions = {
-    eager?: boolean;
     required?: boolean;
     paranoid?: boolean;
     joinDepth?: number;

package/dist/database/decorators/relations.js

@@ -35,8 +35,8 @@ function getRelation(relationFn) {
             const { foreignKey, ...relOptions } = options;
             relationFn(getModelFn, { as: propertyName, ...(foreignKey && { foreignKey }) })(target, propertyName);
             const model = target.constructor;
-            const { eager = relationFn !== seq.HasMany, required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
-            model.AddRelation(propertyName, { getModelFn, eager, required, paranoid, joinDepth, ...restOptions });
+            const { required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
+            model.AddRelation(propertyName, { getModelFn, required, paranoid, joinDepth, ...restOptions });
         };
     };
 }

package/dist/database/models/base-model.class.d.ts

@@ -7,7 +7,6 @@ type Column = {
 type Columns = Record<string, Column>;
 type Relation = {
     getModelFn: GetModelFn;
-    eager: boolean;
     required: boolean;
     paranoid: boolean;
     joinDepth: number;

package/dist/router/call-controller.js

@@ -13,16 +13,22 @@ const validate_request_1 = require("../validator/validate-request");
 function callController(controller, validate, authConfig) {
     const { authMap, authCtor, accessToken } = authConfig;
     return async function (req, res) {
+        console.log('a');
         const headers = req.headers;
         const inputs = (0, validate_request_1.validateRequest)(validate, req);
         const ctx = { headers, ...inputs, file: req.file, files: req.files };
+        console.log('bb');
         const tx = await (0, database_1.getDbClient)().transaction();
         const db = new database_1.Db(tx);
+        console.log('ccc');
         try {
             const authUsers = await (0, authentication_1.getUsersFromToken)(headers.authorization, db, accessToken, authMap);
             const auth = new authCtor(authUsers);
+            console.log('dddd');
             const result = await controller(ctx, db, auth);
+            console.log('eeeee');
             await tx.commit();
+            console.log('ffff');
             let data = result;
             let totalCount;
             if (hasInstancesAndTotalCount(result)) {
@@ -34,9 +40,11 @@ function callController(controller, validate, authConfig) {
                 totalCount: typeof totalCount === 'number' ? totalCount : null,
                 successCode: (0, pangea_helpers_1.camelToUpperSnake)(controller.name),
             };
+            console.log('ggggggg');
             res.status(http_status_codes_1.StatusCodes.OK).json(jsonBody);
         }
         catch (err) {
+            console.log('error');
             await tx.rollback();
             throw err;
         }

package/package.json

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