@recursyve/nestjs-data-filter 11.5.0 → 11.5.2

package/lib/data-filter.repository.d.ts

@@ -27,6 +27,7 @@ export declare class DataFilterRepository<Data> {
     findAll(options?: FindOptions, conditions?: object): Promise<Data[]>;
     findAllFromUser(user: DataFilterUserModel, options?: FindOptions, conditions?: object): Promise<Data[]>;
     count(where?: WhereOptions, conditions?: object): Promise<number>;
+    countFromUser(user: DataFilterUserModel, where?: WhereOptions, conditions?: object): Promise<number>;
     search(search: string, language?: string | null, options?: FindOptions, conditions?: object): Promise<Data[]>;
     searchFromUser(user: DataFilterUserModel, search: string, options?: FindOptions, conditions?: object): Promise<Data[]>;
     generateFindOptions(options?: FindOptions, conditions?: object): FindOptions;

package/lib/data-filter.repository.js

@@ -92,6 +92,11 @@ let DataFilterRepository = class DataFilterRepository {
         const options = this.generateFindOptions({ where }, conditions);
         return this.model.count(options);
     }
+    async countFromUser(user, where, conditions) {
+        const options = this.generateFindOptions({ where }, conditions);
+        options.where = await this.mergeAccessControlCondition(options.where, user);
+        return this.model.count(options);
+    }
     async search(search, language = null, options, conditions) {
         const findOptions = this.generateFindOptions(options, conditions);
         this.addSearchCondition(search, findOptions, language);

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

@@ -59,6 +59,7 @@ export declare class FilterService<Data> {
     private generateHavingOptions;
     private addSearchCondition;
     private addOrderCondition;
+    private getOptionsForCountAndIds;
     private countTotalValues;
     private findValues;
     private getAccessControlWhereCondition;

package/lib/filter/filter.service.js

@@ -113,8 +113,9 @@ let FilterService = FilterService_1 = class FilterService {
         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 });
+        const optionsForCountAndIds = this.getOptionsForCountAndIds(countOptions);
+        const total = await this.countTotalValues({ options: optionsForCountAndIds, user });
+        const values = await this.findValues({ filter: options, options: optionsForCountAndIds, request, user });
         return {
             total,
             page: options.page,
@@ -346,6 +347,16 @@ let FilterService = FilterService_1 = class FilterService {
             options.include = sequelize_utils_1.SequelizeUtils.mergeIncludes(options.include, includes);
         }
     }
+    getOptionsForCountAndIds(options) {
+        const include = options.include;
+        if (!include || (Array.isArray(include) && include.length === 0)) {
+            return options;
+        }
+        return {
+            ...options,
+            include: sequelize_utils_1.SequelizeUtils.stripIncludeAttributes(include)
+        };
+    }
     async countTotalValues(params) {
         var _a;
         const { options } = params;
@@ -354,9 +365,12 @@ let FilterService = FilterService_1 = class FilterService {
             options.where = await this.getAccessControlWhereCondition(options.where, user);
         }
         if (options.having) {
+            const modelName = this.repository.model.name;
             const data = await this.repository.model.findAll({
                 ...options,
-                subQuery: false
+                attributes: [[sequelize_typescript_1.Sequelize.literal(`DISTINCT \`${modelName}\`.\`id\``), "id"]],
+                subQuery: false,
+                raw: true
             });
             return data.length;
         }

package/lib/sequelize.utils.d.ts

@@ -11,6 +11,7 @@ export declare class M extends Model {
 }
 export declare class SequelizeUtils {
     static reduceIncludes(includes: Array<IncludeOptions | IncludeOptions[]>, ignoreAttributes?: boolean): Includeable[];
+    static stripIncludeAttributes(includes: IncludeOptions[] | IncludeOptions): IncludeOptions[];
     static mergeIncludes(a?: IncludeOptions | IncludeOptions[], b?: IncludeOptions | IncludeOptions[], ignoreAttributes?: boolean): IncludeOptions[];
     static mergeAttributes(a: FindAttributeOptions | undefined, b: FindAttributeOptions | undefined): FindAttributeOptions | undefined;
     static ensureAttributesValidity(attribute: FindAttributeOptions): FindAttributeOptions;

package/lib/sequelize.utils.js

@@ -15,6 +15,18 @@ class SequelizeUtils {
         }
         return include;
     }
+    static stripIncludeAttributes(includes) {
+        const arr = !includes ? [] : Array.isArray(includes) ? includes : [includes];
+        if (!arr.length) {
+            return [];
+        }
+        return arr.map((include) => ({
+            ...include,
+            attributes: [],
+            through: { attributes: [] },
+            include: include.include ? this.stripIncludeAttributes(include.include) : [],
+        }));
+    }
     static mergeIncludes(a = [], b = [], ignoreAttributes = false) {
         var _a, _b, _c, _d;
         if (!Array.isArray(a)) {

package/package.json

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