@recursyve/nestjs-data-filter 11.0.0 → 11.1.1

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

@@ -27,13 +27,14 @@ 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>;
-    search(search: string, options?: FindOptions, conditions?: object): Promise<Data[]>;
+    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;
     generateOrderInclude(order: OrderModel, conditions?: object): IncludeOptions[];
     generateSearchInclude(conditions?: object): Includeable[];
     reduceObject(result: any): Data;
     getSearchAttributes(): SearchAttributesModel[];
+    getSearchTranslationAttributes(): SearchAttributesModel[];
     hasCustomAttribute(name: string): boolean;
     getCustomAttribute(name: string): CustomAttributesConfig | null;
     getCustomAttributeGroupBy(): (string | Fn | Col)[];
@@ -45,7 +46,7 @@ export declare class DataFilterRepository<Data> {
     downloadPdf(headers: string[], data: any[], lang: string, options?: any): Promise<Buffer>;
     downloadZip(headers: string[], data: any[], lang: string, options?: any): Promise<Buffer>;
     private init;
-    addSearchCondition(search: string, options: FindOptions): void;
+    addSearchCondition(search: string, options: FindOptions, language?: string | null): void;
     private getExportsHeader;
     private getExportData;
     private getExportValue;

package/lib/data-filter.repository.js

@@ -92,9 +92,9 @@ let DataFilterRepository = class DataFilterRepository {
         const options = this.generateFindOptions({ where }, conditions);
         return this.model.count(options);
     }
-    async search(search, options, conditions) {
+    async search(search, language = null, options, conditions) {
         const findOptions = this.generateFindOptions(options, conditions);
-        this.addSearchCondition(search, findOptions);
+        this.addSearchCondition(search, findOptions, language);
         const result = await this.model.findAll(findOptions);
         if (!(result === null || result === void 0 ? void 0 : result.length)) {
             return result;
@@ -103,7 +103,7 @@ let DataFilterRepository = class DataFilterRepository {
     }
     async searchFromUser(user, search, options, conditions) {
         const findOptions = this.generateFindOptions(options, conditions);
-        this.addSearchCondition(search, findOptions);
+        this.addSearchCondition(search, findOptions, user.language);
         findOptions.where = await this.mergeAccessControlCondition(findOptions.where, user);
         const result = await this.model.findAll(findOptions);
         if (!(result === null || result === void 0 ? void 0 : result.length)) {
@@ -209,7 +209,7 @@ let DataFilterRepository = class DataFilterRepository {
         return data;
     }
     getSearchAttributes() {
-        var _a;
+        var _a, _b, _c;
         const attributes = [];
         const modelAttr = this._config.getSearchableAttributes();
         attributes.push(...modelAttr.map(a => ({
@@ -221,12 +221,34 @@ let DataFilterRepository = class DataFilterRepository {
             if (!definition.path) {
                 continue;
             }
-            const attr = definition.ignoreInSearch ? [] : (_a = definition.searchableAttributes) !== null && _a !== void 0 ? _a : definition.attributes;
+            const attr = (definition.ignoreInSearch || ((_a = definition.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.length) && !((_b = definition.searchableAttributes) === null || _b === void 0 ? void 0 : _b.length)) ? [] : (_c = definition.searchableAttributes) !== null && _c !== void 0 ? _c : definition.attributes;
             const additionalIncludes = definition.transformIncludesConfig({});
             attributes.push(...this.sequelizeModelScanner.getAttributes(this.model, definition.path, additionalIncludes, attr));
         }
         return attributes;
     }
+    getSearchTranslationAttributes() {
+        var _a;
+        if (!this._config.getSearchableTranslationAttributes().length) {
+            return [];
+        }
+        const attributes = [];
+        const modelAttr = this._config.getSearchableTranslationAttributes();
+        attributes.push(...modelAttr.map(attribute => ({
+            name: attribute,
+            key: attribute,
+            isJson: sequelize_utils_1.SequelizeUtils.isColumnJson(this.model, attribute),
+            isTranslationAttribute: true
+        })));
+        for (const definition of this._definitions) {
+            if (!definition.path || definition.ignoreInSearch || !((_a = definition.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.length)) {
+                continue;
+            }
+            const additionalIncludes = definition.transformIncludesConfig({});
+            attributes.push(...this.sequelizeModelScanner.getAttributes(this.model, definition.path, additionalIncludes, definition.searchableTranslationAttributes, true));
+        }
+        return attributes;
+    }
     hasCustomAttribute(name) {
         return !!this._config.customAttributes.find((x) => { var _a; return ((_a = x.config) === null || _a === void 0 ? void 0 : _a.name) === name; });
     }
@@ -305,7 +327,7 @@ let DataFilterRepository = class DataFilterRepository {
         this._config = this.dataFilterScanner.getDataFilter(this.dataDef);
         this._definitions = this.dataFilterScanner.getAttributes(this.dataDef);
     }
-    addSearchCondition(search, options) {
+    addSearchCondition(search, options, language = null) {
         if (!search) {
             return;
         }
@@ -318,10 +340,13 @@ let DataFilterRepository = class DataFilterRepository {
             options.where = { [sequelize_1.Op.and]: [options.where] };
         }
         const where = options.where;
-        const generateFieldsObject = (searchValue) => this.getSearchAttributes()
+        const generateFieldsObject = (searchValue) => [
+            ...this.getSearchAttributes(),
+            ...this.getSearchTranslationAttributes()
+        ]
             .map(a => {
-            var _a, _b;
-            if (a.isJson) {
+            var _a, _b, _c, _d;
+            if (a.isJson && !a.isTranslationAttribute) {
                 const field = (_a = a.literalKey) !== null && _a !== void 0 ? _a : `\`${this.model.name}\`.\`${a.key}\``;
                 /**
                  * literal function is not working of some reason...
@@ -330,6 +355,11 @@ let DataFilterRepository = class DataFilterRepository {
                 const value = (_b = this.model.sequelize) === null || _b === void 0 ? void 0 : _b.escape(`%${searchValue.toUpperCase()}%`);
                 return new sequelize_1.Utils.Literal(`UPPER(JSON_EXTRACT(${field}, '$')) LIKE ${value}`);
             }
+            if (a.isJson && a.isTranslationAttribute) {
+                const field = (_c = a.literalKey) !== null && _c !== void 0 ? _c : `\`${this.model.name}\`.\`${a.name}\``;
+                const value = (_d = this.model.sequelize) === null || _d === void 0 ? void 0 : _d.escape(`%${searchValue.toUpperCase()}%`);
+                return new sequelize_1.Utils.Literal(`UPPER(JSON_UNQUOTE(JSON_EXTRACT(${field}, '$.${language}'))) LIKE ${value}`);
+            }
             return {
                 [a.key]: {
                     [sequelize_1.Op.like]: `%${searchValue}%`

package/lib/decorators/index.d.ts

@@ -11,6 +11,7 @@ export * from "./paranoid.decorator";
 export * from "./path.decorator";
 export * from "./required.decorator";
 export * from "./seachable-attributes.decorator";
+export * from "./searchable-translation-attributes.decorator";
 export * from "./separate.decorator";
 export * from "./sum.decorator";
 export * from "./where.decorator";

package/lib/decorators/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./paranoid.decorator"), exports);
 __exportStar(require("./path.decorator"), exports);
 __exportStar(require("./required.decorator"), exports);
 __exportStar(require("./seachable-attributes.decorator"), exports);
+__exportStar(require("./searchable-translation-attributes.decorator"), exports);
 __exportStar(require("./separate.decorator"), exports);
 __exportStar(require("./sum.decorator"), exports);
 __exportStar(require("./where.decorator"), exports);

package/lib/decorators/searchable-translation-attributes.decorator.d.ts

@@ -0,0 +1 @@
+export declare function SearchableTranslationAttributes(attributes: string[]): PropertyDecorator & ClassDecorator;

package/lib/decorators/searchable-translation-attributes.decorator.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SearchableTranslationAttributes = SearchableTranslationAttributes;
+const attributes_handler_1 = require("../handlers/attributes.handler");
+const data_filter_handler_1 = require("../handlers/data-filter.handler");
+function SearchableTranslationAttributes(attributes) {
+    return (target, propertyKey) => {
+        defineSearchableTranslationAttributesMetadata(target, propertyKey, attributes);
+    };
+}
+function defineSearchableTranslationAttributesMetadata(target, propertyKey, attributes) {
+    if (!propertyKey) {
+        const dataFilter = data_filter_handler_1.DataFilterHandler.getDataFilter(target);
+        dataFilter.setSearchableTranslationAttributes(attributes);
+        data_filter_handler_1.DataFilterHandler.saveDataFilter(target, dataFilter);
+        return;
+    }
+    const attribute = attributes_handler_1.AttributesHandler.getAttribute(target, propertyKey);
+    attribute.setSearchableTranslationAttributes(attributes);
+    attributes_handler_1.AttributesHandler.saveAttribute(target, attribute);
+}

package/lib/filter/controllers/dynamic-filter.controller.d.ts

@@ -9,12 +9,12 @@ export declare abstract class DynamicFilterController<Data> {
     private readonly userUserDeserializer;
     private readonly option;
     protected constructor(filterService: FilterService<Data>);
-    filter(query: FilterQueryModel, req: any): Promise<FilterResultModel<Data>>;
-    filterCount(query: FilterQueryModel, req: any): Promise<number>;
-    downloadData(query: FilterQueryModel, type: ExportTypes, req: any): Promise<Buffer | string>;
-    getFilterConfig(req: any): Promise<FilterConfigurationModel[]>;
-    searchFilterResourceValue(search: FilterResourceValueModel, req: any): Promise<SelectFilterValue | null>;
-    searchFilterConfigValues(search: FilterConfigurationSearchModel, req: any): Promise<SelectFilterValue[]>;
-    protected getUser(req: any): Promise<DataFilterUserModel | null>;
-    protected abstract transformQuery(query: FilterQueryModel, req: any): FilterQueryModel;
+    filter(query: FilterQueryModel, request: any): Promise<FilterResultModel<Data>>;
+    filterCount(query: FilterQueryModel, request: any): Promise<number>;
+    downloadData(query: FilterQueryModel, type: ExportTypes, request: any): Promise<Buffer | string>;
+    getFilterConfig(request: any): Promise<FilterConfigurationModel[]>;
+    searchFilterResourceValue(search: FilterResourceValueModel, request: any): Promise<SelectFilterValue | null>;
+    searchFilterConfigValues(search: FilterConfigurationSearchModel, request: any): Promise<SelectFilterValue[]>;
+    protected getUser(request: any): Promise<DataFilterUserModel | null>;
+    protected abstract transformQuery(query: FilterQueryModel, request: any): FilterQueryModel;
 }

package/lib/filter/controllers/dynamic-filter.controller.js

@@ -19,42 +19,44 @@ const constant_1 = require("../../constant");
 const deserializers_1 = require("../../deserializers");
 const filter_query_guard_1 = require("../guards/filter-query.guard");
 const data_file_download_interceptor_1 = require("../interceptors/data-file-download.interceptor");
+const filter_configuration_search_model_1 = require("../models/filter-configuration-search.model");
+const filter_resource_value_model_1 = require("../models/filter-resource-value.model");
 class DynamicFilterController {
     constructor(filterService) {
         this.filterService = filterService;
     }
-    async filter(query, req) {
-        query = this.transformQuery(query, req);
-        const user = await this.getUser(req);
-        return user ? this.filterService.filter(user, query) : this.filterService.filter(query);
+    async filter(query, request) {
+        query = this.transformQuery(query, request);
+        const user = await this.getUser(request);
+        return this.filterService.filter({ options: query, request, user });
     }
-    async filterCount(query, req) {
-        query = this.transformQuery(query, req);
-        const user = await this.getUser(req);
-        return user ? this.filterService.count(user, query) : this.filterService.count(query);
+    async filterCount(query, request) {
+        query = this.transformQuery(query, request);
+        const user = await this.getUser(request);
+        return this.filterService.count({ options: query, user });
     }
-    async downloadData(query, type, req) {
-        query = this.transformQuery(query, req);
-        const user = await this.getUser(req);
-        return await this.filterService.downloadData(user, type, query);
+    async downloadData(query, type, request) {
+        query = this.transformQuery(query, request);
+        const user = await this.getUser(request);
+        return await this.filterService.downloadData({ options: query, request, type, user });
     }
-    async getFilterConfig(req) {
+    async getFilterConfig(request) {
         var _a;
-        return await this.filterService.getConfig(req, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.getConfig(request, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async searchFilterResourceValue(search, req) {
+    async searchFilterResourceValue(search, request) {
         var _a;
-        return await this.filterService.findResourceValueById(req, search, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.findResourceValueById(request, search, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async searchFilterConfigValues(search, req) {
+    async searchFilterConfigValues(search, request) {
         var _a;
-        return await this.filterService.searchConfigValues(req, search, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.searchConfigValues(request, search, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async getUser(req) {
+    async getUser(request) {
         if (!this.userUserDeserializer || this.option.disableAccessControl) {
             return null;
         }
-        return this.userUserDeserializer.deserializeUser(req);
+        return this.userUserDeserializer.deserializeUser(request);
     }
 }
 exports.DynamicFilterController = DynamicFilterController;
@@ -74,7 +76,7 @@ __decorate([
     __param(0, (0, common_1.Body)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
     __metadata("design:returntype", Promise)
 ], DynamicFilterController.prototype, "filter", null);
 __decorate([
@@ -83,7 +85,7 @@ __decorate([
     __param(0, (0, common_1.Body)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
     __metadata("design:returntype", Promise)
 ], DynamicFilterController.prototype, "filterCount", null);
 __decorate([
@@ -94,7 +96,7 @@ __decorate([
     __param(1, (0, common_1.Param)("type")),
     __param(2, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, String, Object]),
     __metadata("design:returntype", Promise)
 ], DynamicFilterController.prototype, "downloadData", null);
 __decorate([
@@ -109,7 +111,7 @@ __decorate([
     __param(0, (0, common_1.Query)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [filter_resource_value_model_1.FilterResourceValueModel, Object]),
     __metadata("design:returntype", Promise)
 ], DynamicFilterController.prototype, "searchFilterResourceValue", null);
 __decorate([
@@ -117,6 +119,6 @@ __decorate([
     __param(0, (0, common_1.Query)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [filter_configuration_search_model_1.FilterConfigurationSearchModel, Object]),
     __metadata("design:returntype", Promise)
 ], DynamicFilterController.prototype, "searchFilterConfigValues", null);

package/lib/filter/controllers/filter.controller.d.ts

@@ -9,11 +9,11 @@ export declare class FilterController<Data> {
     private readonly userUserDeserializer;
     private readonly option;
     constructor(filterService: FilterService<Data>);
-    filter(query: FilterQueryModel, req: any): Promise<FilterResultModel<Data>>;
-    filterCount(query: FilterQueryModel, req: any): Promise<number>;
-    downloadData(query: FilterQueryModel, type: ExportTypes, req: any): Promise<Buffer | string>;
-    getFilterConfig(req: any): Promise<FilterConfigurationModel[]>;
-    searchFilterResourceValue(search: FilterResourceValueModel, req: any): Promise<SelectFilterValue | null>;
-    searchFilterConfigValues(search: FilterConfigurationSearchModel, req: any): Promise<SelectFilterValue[]>;
-    protected getUser(req: any): Promise<DataFilterUserModel | null>;
+    filter(query: FilterQueryModel, request: any): Promise<FilterResultModel<Data>>;
+    filterCount(query: FilterQueryModel, request: any): Promise<number>;
+    downloadData(query: FilterQueryModel, type: ExportTypes, request: any): Promise<Buffer | string>;
+    getFilterConfig(request: any): Promise<FilterConfigurationModel[]>;
+    searchFilterResourceValue(search: FilterResourceValueModel, request: any): Promise<SelectFilterValue | null>;
+    searchFilterConfigValues(search: FilterConfigurationSearchModel, request: any): Promise<SelectFilterValue[]>;
+    protected getUser(request: any): Promise<DataFilterUserModel | null>;
 }

package/lib/filter/controllers/filter.controller.js

@@ -19,39 +19,41 @@ const constant_1 = require("../../constant");
 const deserializers_1 = require("../../deserializers");
 const filter_query_guard_1 = require("../guards/filter-query.guard");
 const data_file_download_interceptor_1 = require("../interceptors/data-file-download.interceptor");
+const filter_configuration_search_model_1 = require("../models/filter-configuration-search.model");
+const filter_resource_value_model_1 = require("../models/filter-resource-value.model");
 class FilterController {
     constructor(filterService) {
         this.filterService = filterService;
     }
-    async filter(query, req) {
-        const user = await this.getUser(req);
-        return user ? this.filterService.filter(user, query) : this.filterService.filter(query);
+    async filter(query, request) {
+        const user = await this.getUser(request);
+        return this.filterService.filter({ options: query, request, user });
     }
-    async filterCount(query, req) {
-        const user = await this.getUser(req);
-        return user ? this.filterService.count(user, query) : this.filterService.count(query);
+    async filterCount(query, request) {
+        const user = await this.getUser(request);
+        return this.filterService.count({ options: query, user });
     }
-    async downloadData(query, type, req) {
-        const user = await this.getUser(req);
-        return await this.filterService.downloadData(user, type, query);
+    async downloadData(query, type, request) {
+        const user = await this.getUser(request);
+        return await this.filterService.downloadData({ options: query, request, type, user });
     }
-    async getFilterConfig(req) {
+    async getFilterConfig(request) {
         var _a;
-        return await this.filterService.getConfig(req, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.getConfig(request, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async searchFilterResourceValue(search, req) {
+    async searchFilterResourceValue(search, request) {
         var _a;
-        return await this.filterService.findResourceValueById(req, search, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.findResourceValueById(request, search, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async searchFilterConfigValues(search, req) {
+    async searchFilterConfigValues(search, request) {
         var _a;
-        return await this.filterService.searchConfigValues(req, search, (_a = await this.getUser(req)) !== null && _a !== void 0 ? _a : {});
+        return await this.filterService.searchConfigValues(request, search, (_a = await this.getUser(request)) !== null && _a !== void 0 ? _a : {});
     }
-    async getUser(req) {
+    async getUser(request) {
         if (!this.userUserDeserializer || this.option.disableAccessControl) {
             return null;
         }
-        return this.userUserDeserializer.deserializeUser(req);
+        return this.userUserDeserializer.deserializeUser(request);
     }
 }
 exports.FilterController = FilterController;
@@ -71,7 +73,7 @@ __decorate([
     __param(0, (0, common_1.Body)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "filter", null);
 __decorate([
@@ -80,7 +82,7 @@ __decorate([
     __param(0, (0, common_1.Body)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "filterCount", null);
 __decorate([
@@ -91,7 +93,7 @@ __decorate([
     __param(1, (0, common_1.Param)("type")),
     __param(2, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String, Object]),
+    __metadata("design:paramtypes", [__1.FilterQueryModel, String, Object]),
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "downloadData", null);
 __decorate([
@@ -106,7 +108,7 @@ __decorate([
     __param(0, (0, common_1.Query)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [filter_resource_value_model_1.FilterResourceValueModel, Object]),
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "searchFilterResourceValue", null);
 __decorate([
@@ -114,6 +116,6 @@ __decorate([
     __param(0, (0, common_1.Query)()),
     __param(1, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [filter_configuration_search_model_1.FilterConfigurationSearchModel, Object]),
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "searchFilterConfigValues", null);

package/lib/filter/controllers/open-api-filter.controller.d.ts

@@ -0,0 +1,4 @@
+import { Type } from "@nestjs/common";
+import { FilterController } from "../..";
+import { FilterService } from "../filter.service";
+export declare function OpenApiFilterController<T extends Type, D>(Base: T): Type<FilterController<D>> & (new (filterService: FilterService<D>) => FilterController<D>);

package/lib/filter/controllers/open-api-filter.controller.js

@@ -0,0 +1,123 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenApiFilterController = OpenApiFilterController;
+const common_1 = require("@nestjs/common");
+const __1 = require("../..");
+const filter_query_guard_1 = require("../guards/filter-query.guard");
+const data_file_download_interceptor_1 = require("../interceptors/data-file-download.interceptor");
+const swagger_1 = require("@nestjs/swagger");
+const filter_resource_value_model_1 = require("../models/filter-resource-value.model");
+function OpenApiFilterController(Base) {
+    const _FilterResultModel = (0, __1.FilterResultModelMixin)(Base);
+    class _FilterController extends __1.FilterController {
+        async filter(query, req) {
+            return super.filter(query, req);
+        }
+        async filterCount(query, req) {
+            return super.filterCount(query, req);
+        }
+        async downloadData(query, type, req) {
+            return super.downloadData(query, type, req);
+        }
+        async getFilterConfig(req) {
+            return super.getFilterConfig(req);
+        }
+        async searchFilterResourceValue(search, req) {
+            return super.searchFilterResourceValue(search, req);
+        }
+        async searchFilterConfigValues(search, req) {
+            return super.searchFilterConfigValues(search, req);
+        }
+    }
+    __decorate([
+        (0, common_1.Post)("filter"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, common_1.UseGuards)(filter_query_guard_1.FilterQueryGuard),
+        (0, swagger_1.ApiOkResponse)({ type: () => _FilterResultModel }),
+        (0, swagger_1.ApiOperation)({ operationId: `filter${Base.name}` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "filter", null);
+    __decorate([
+        (0, common_1.Post)("filter-count"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, swagger_1.ApiOkResponse)({ schema: { type: "number" } }),
+        (0, swagger_1.ApiOperation)({ operationId: `filter${Base.name}Count` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "filterCount", null);
+    __decorate([
+        (0, common_1.Post)("download/:type"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, common_1.UseInterceptors)(data_file_download_interceptor_1.DataFileDownloadInterceptor),
+        (0, swagger_1.ApiOkResponse)({
+            description: 'Returns file data as binary (Buffer) or as text (string) depending on the export type.',
+            content: {
+                'application/octet-stream': {
+                    schema: {
+                        oneOf: [
+                            { type: 'string', format: 'binary' },
+                            { type: 'string' }
+                        ]
+                    }
+                }
+            }
+        }),
+        (0, swagger_1.ApiParam)({ name: "type", enum: __1.ExportTypes, enumName: "ExportTypes" }),
+        (0, swagger_1.ApiOperation)({ operationId: `download${Base.name}Data` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Param)("type")),
+        __param(2, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, String, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "downloadData", null);
+    __decorate([
+        (0, common_1.Post)("filter/config"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.FilterConfigurationModel, isArray: true }),
+        (0, swagger_1.ApiOperation)({ operationId: `get${Base.name}FilterConfig` }),
+        __param(0, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "getFilterConfig", null);
+    __decorate([
+        (0, common_1.Post)("filter/config/id"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.SelectFilterValue }),
+        (0, swagger_1.ApiOperation)({ operationId: `search${Base.name}FilterResourceValue` }),
+        __param(0, (0, common_1.Query)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [filter_resource_value_model_1.FilterResourceValueModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "searchFilterResourceValue", null);
+    __decorate([
+        (0, common_1.Post)("filter/config/value"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.SelectFilterValue, isArray: true }),
+        (0, swagger_1.ApiOperation)({ operationId: `search${Base.name}FilterConfigValues` }),
+        __param(0, (0, common_1.Query)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterConfigurationSearchModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "searchFilterConfigValues", null);
+    return _FilterController;
+}

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

@@ -13,6 +13,22 @@ import { QueryModel } from "./models";
 import { FilterConfigurationSearchModel } from "./models/filter-configuration-search.model";
 import { FilterConfigurationModel } from "./models/filter-configuration.model";
 import { FilterResourceValueModel } from "./models/filter-resource-value.model";
+interface CountParams<Users extends DataFilterUserModel> {
+    options: FilterQueryModel;
+    user?: Users | null;
+}
+interface DownloadDataParams<Users extends DataFilterUserModel, Request> {
+    exportOptions?: object;
+    options: FilterQueryModel;
+    request: Request;
+    type: ExportTypes;
+    user: Users | null;
+}
+interface FilterParams<Users extends DataFilterUserModel, Request> {
+    options: FilterQueryModel;
+    request: Request;
+    user?: Users | null;
+}
 export declare class FilterService<Data> {
     private accessControlAdapter;
     private translateAdapter;
@@ -31,11 +47,9 @@ export declare class FilterService<Data> {
     searchConfigValues(request: any, search: FilterConfigurationSearchModel, user?: DataFilterUserModel): Promise<SelectFilterValue[]>;
     private convertNumber;
     findResourceValueById(request: any, search: FilterResourceValueModel, user?: DataFilterUserModel): Promise<SelectFilterValue | null>;
-    count(user: DataFilterUserModel, options: FilterQueryModel): Promise<number>;
-    count(options: FilterQueryModel): Promise<number>;
-    filter(user: DataFilterUserModel, options: FilterQueryModel): Promise<FilterResultModel<Data>>;
-    filter(options: FilterQueryModel): Promise<FilterResultModel<Data>>;
-    downloadData(user: DataFilterUserModel | null, type: ExportTypes, options: FilterQueryModel, exportOptions?: object): Promise<Buffer | string>;
+    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 init;
     private getInclude;
@@ -56,3 +70,4 @@ export declare class FilterService<Data> {
     private normalizeOrder;
     private getNonNestedOrderColumns;
 }
+export {};