@recursyve/nestjs-data-filter 11.5.1 → 11.5.3

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/scanners/sequelize-model.scanner.js

@@ -28,6 +28,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
                 as: association.getAs(),
                 model: association.getAssociatedClass(),
                 attributes: ignoreAttributes ? [] : { include: [] },
+                through: association.getAssociation() === sequelize_typescript_1.Association.BelongsToMany ? { attributes: [] } : undefined,
                 include: [],
                 required: false
             });

package/lib/sequelize.utils.js

@@ -22,6 +22,7 @@ class SequelizeUtils {
         }
         return arr.map((include) => ({
             ...include,
+            ...(include.through != null ? { through: { ...include.through, attributes: [] } } : {}),
             attributes: [],
             include: include.include ? this.stripIncludeAttributes(include.include) : [],
         }));

package/package.json

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