@recursyve/nestjs-data-filter 11.3.2 → 11.4.0

package/lib/filter/filter.service.d.ts

@@ -45,12 +45,12 @@ export declare class FilterService<Data> {
     forData<T>(dataDef: Type<T>): FilterService<T>;
     getConfig(request: any, user?: DataFilterUserModel): Promise<FilterConfigurationModel[]>;
     searchConfigValues(request: any, search: FilterConfigurationSearchModel, user?: DataFilterUserModel): Promise<SelectFilterValue[]>;
-    private convertNumber;
     findResourceValueById(request: any, search: FilterResourceValueModel, user?: DataFilterUserModel): Promise<SelectFilterValue | null>;
     count<Users extends DataFilterUserModel>(params: CountParams<Users>): Promise<number>;
     filter<Request, Users extends DataFilterUserModel>(params: FilterParams<DataFilterUserModel, Request>): Promise<FilterResultModel<Data>>;
     downloadData<Request>(params: DownloadDataParams<DataFilterUserModel, Request>): Promise<Buffer | string>;
     getFindOptions(model: typeof M, query: QueryModel | undefined, data?: object): Promise<FindOptions>;
+    private convertNumber;
     private init;
     private getInclude;
     private getConditionInclude;
@@ -58,7 +58,6 @@ export declare class FilterService<Data> {
     private generateHavingOptions;
     private addSearchCondition;
     private addOrderCondition;
-    private addGroupOption;
     private countTotalValues;
     private findValues;
     private getAccessControlWhereCondition;

package/lib/filter/filter.service.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterService = void 0;
 const common_1 = require("@nestjs/common");
 const sequelize_1 = require("sequelize");
+const sequelize_typescript_1 = require("sequelize-typescript");
 const access_control_adapter_1 = require("../adapters/access-control.adapter");
 const translate_adapter_1 = require("../adapters/translate.adapter");
 const data_filter_service_1 = require("../data-filter.service");
@@ -70,18 +71,11 @@ let FilterService = FilterService_1 = class FilterService {
                 user,
                 request,
                 page: this.convertNumber(search.page),
-                pageSize: this.convertNumber(search.pageSize),
+                pageSize: this.convertNumber(search.pageSize)
             });
         }
         return [];
     }
-    convertNumber(value) {
-        if (!value) {
-            return null;
-        }
-        const parsedNumber = Number(value);
-        return isNaN(parsedNumber) ? null : parsedNumber;
-    }
     async findResourceValueById(request, search, user) {
         if (!this.definitions.hasOwnProperty(search.id)) {
             return null;
@@ -116,7 +110,9 @@ let FilterService = FilterService_1 = class FilterService {
         if (options.order) {
             this.addOrderCondition(options.order, countOptions, options.data);
         }
-        this.addGroupOption(options, countOptions);
+        if (options.groupBy) {
+            countOptions.group = [sequelize_utils_1.SequelizeUtils.getGroupLiteral(this.repository.model, options.groupBy)];
+        }
         const total = await this.countTotalValues({ options: countOptions, user });
         const values = await this.findValues({ filter: options, options: countOptions, request, user });
         return {
@@ -139,7 +135,13 @@ let FilterService = FilterService_1 = class FilterService {
             this.addOrderCondition(options.order, findOptions, options.data);
         }
         delete options.page;
-        const values = await this.findValues({ filter: options, options: findOptions, repository: this.exportRepository, request, user });
+        const values = await this.findValues({
+            filter: options,
+            options: findOptions,
+            repository: this.exportRepository,
+            request,
+            user
+        });
         const headers = await this.model.getExportedFieldsKeys(type);
         if (headers.length) {
             const data = await Promise.all(values.map((value) => { var _a; return this.model.getExportedFields(value, (_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : "fr", type); }));
@@ -176,6 +178,13 @@ let FilterService = FilterService_1 = class FilterService {
         }
         return option;
     }
+    convertNumber(value) {
+        if (!value) {
+            return null;
+        }
+        const parsedNumber = Number(value);
+        return isNaN(parsedNumber) ? null : parsedNumber;
+    }
     init() {
         var _a;
         this.repository = this.dataFilter.for(this.model.dataDefinition);
@@ -337,34 +346,6 @@ let FilterService = FilterService_1 = class FilterService {
             options.include = sequelize_utils_1.SequelizeUtils.mergeIncludes(options.include, includes);
         }
     }
-    addGroupOption(filter, options) {
-        const model = this.repository.model;
-        options.group = [`${model.name}.id`];
-        if (filter.groupBy) {
-            options.group.push(sequelize_utils_1.SequelizeUtils.getGroupLiteral(this.repository.model, filter.groupBy));
-        }
-        if (!filter.order || (filter.order instanceof Array && !filter.order.length)) {
-            return;
-        }
-        const orders = this.normalizeOrder(filter.order);
-        for (const order of orders) {
-            const rule = this.definitions[order.column];
-            if (rule && order_rule_1.OrderRule.validate(rule)) {
-                continue;
-            }
-            if (this.repository.hasCustomAttribute(order.column)) {
-                continue;
-            }
-            const values = order.column.split(".");
-            const column = values.pop();
-            if (!values.length) {
-                options.group.push(`${model.name}.${sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column)}`);
-            }
-            else {
-                options.group.push(...this.sequelizeModelScanner.getGroup(model, order));
-            }
-        }
-    }
     async countTotalValues(params) {
         var _a;
         const { options } = params;
@@ -394,7 +375,7 @@ let FilterService = FilterService_1 = class FilterService {
         }
     }
     async findValues(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const { filter, options, request } = params;
         const user = (_a = params.user) !== null && _a !== void 0 ? _a : null;
         const repository = (_b = params.repository) !== null && _b !== void 0 ? _b : this.repository;
@@ -402,27 +383,14 @@ let FilterService = FilterService_1 = class FilterService {
             options.where = await this.getAccessControlWhereCondition(options.where, user);
         }
         const order = this.getOrderOptions((_c = filter.order) !== null && _c !== void 0 ? _c : [], { request, user });
-        const nonNestedOrderColumns = (Array.isArray(filter.order) ? filter.order : [filter.order])
-            .filter((order) => !!order)
-            .map(order => {
-            var _a;
-            const rule = this.definitions[order.column];
-            if (!rule || !order_rule_1.OrderRule.validate(rule)) {
-                return order.column;
-            }
-            else {
-                return [(_a = rule.path) !== null && _a !== void 0 ? _a : "", rule.attribute].join(".");
-            }
-        })
-            .filter(column => column && !column.includes(".") && !repository.hasCustomAttribute(column));
         const customAttributes = filter.order ? this.getOrderCustomAttribute(filter.order, filter.data) : [];
         const values = await repository.model.findAll({
             ...options,
-            attributes: ["id", ...nonNestedOrderColumns, ...customAttributes],
+            attributes: [[sequelize_typescript_1.Sequelize.literal(`DISTINCT \`${this.repository.model.name}\`.\`id\``), "_id"], ...customAttributes],
             limit: (_d = filter.page) === null || _d === void 0 ? void 0 : _d.size,
             offset: filter.page ? filter.page.number * filter.page.size + ((_e = filter.page.offset) !== null && _e !== void 0 ? _e : 0) : undefined,
             subQuery: false,
-            group: (_f = filter.groupBy) !== null && _f !== void 0 ? _f : options.group,
+            raw: true,
             order
         });
         const group = this.generateRepositoryGroupBy(filter);
@@ -433,7 +401,7 @@ let FilterService = FilterService_1 = class FilterService {
             order,
             paranoid: options.paranoid,
             group
-        }, (_g = filter.data) !== null && _g !== void 0 ? _g : {});
+        }, (_f = filter.data) !== null && _f !== void 0 ? _f : {});
     }
     async getAccessControlWhereCondition(where, user) {
         var _a;
@@ -539,25 +507,6 @@ let FilterService = FilterService_1 = class FilterService {
             return group;
         }
         group.push(...groupBy);
-        if (!filter.order || (filter.order instanceof Array && !filter.order.length)) {
-            return group;
-        }
-        const orders = this.normalizeOrder(filter.order);
-        for (const order of orders) {
-            if (!(order === null || order === void 0 ? void 0 : order.column) || !order.direction) {
-                continue;
-            }
-            if (this.repository.hasCustomAttribute(order.column)) {
-                continue;
-            }
-            const rule = this.definitions[order.column];
-            if (!rule || !order_rule_1.OrderRule.validate(rule)) {
-                group.push(`${this.repository.model.name}.${sequelize_utils_1.SequelizeUtils.findColumnFieldName(this.repository.model, order.column)}`);
-            }
-            else {
-                group.push(...this.sequelizeModelScanner.getGroup(this.repository.model, order));
-            }
-        }
         return group;
     }
     addDefaultFilter(query) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "11.3.2",
+    "version": "11.4.0",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {