@recursyve/nestjs-data-filter 10.1.2 → 10.2.0

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

@@ -23,35 +23,35 @@ 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;
@@ -118,4 +118,4 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], FilterController.prototype, "searchFilterConfigValues", null);
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/controllers/filter.controller.ts"],"names":[],"mappings":"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","file":"lib/filter/controllers/filter.controller.js","sourcesContent":["import {\n    Body,\n    Get,\n    HttpCode,\n    HttpStatus,\n    Inject,\n    Optional,\n    Param,\n    Post,\n    Query,\n    Req,\n    UseGuards,\n    UseInterceptors\n} from \"@nestjs/common\";\nimport { ExportTypes, FilterQueryModel, FilterResultModel, SelectFilterValue } from \"../..\";\nimport { FILTER_OPTION } from \"../../constant\";\nimport { UserDeserializer } from \"../../deserializers\";\nimport { DataFilterUserModel } from \"../../models/user.model\";\nimport { FilterOptionConfig } from \"../filter.config\";\nimport { FilterService } from \"../filter.service\";\nimport { FilterQueryGuard } from \"../guards/filter-query.guard\";\nimport { DataFileDownloadInterceptor } from \"../interceptors/data-file-download.interceptor\";\nimport { FilterConfigurationSearchModel } from \"../models/filter-configuration-search.model\";\nimport { FilterConfigurationModel } from \"../models/filter-configuration.model\";\nimport { FilterResourceValueModel } from \"../models/filter-resource-value.model\";\n\nexport class FilterController<Data> {\n    @Inject()\n    @Optional()\n    private readonly userUserDeserializer!: UserDeserializer<DataFilterUserModel>;\n\n    @Inject(FILTER_OPTION)\n    private readonly option!: FilterOptionConfig;\n\n    constructor(protected readonly filterService: FilterService<Data>) {}\n\n    @Post(\"filter\")\n    @HttpCode(HttpStatus.OK)\n    @UseGuards(FilterQueryGuard)\n    public async filter(@Body() query: FilterQueryModel, @Req() req: any): Promise<FilterResultModel<Data>> {\n        const user = await this.getUser(req);\n        return user ? this.filterService.filter(user, query) : this.filterService.filter(query);\n    }\n\n    @Post(\"filter-count\")\n    @HttpCode(HttpStatus.OK)\n    public async filterCount(@Body() query: FilterQueryModel, @Req() req: any): Promise<number> {\n        const user = await this.getUser(req);\n        return user ? this.filterService.count(user, query) : this.filterService.count(query);\n    }\n\n    @Post(\"download/:type\")\n    @HttpCode(HttpStatus.OK)\n    @UseInterceptors(DataFileDownloadInterceptor)\n    public async downloadData(\n        @Body() query: FilterQueryModel,\n        @Param(\"type\") type: ExportTypes,\n        @Req() req: any\n    ): Promise<Buffer | string> {\n        const user = await this.getUser(req);\n        return await this.filterService.downloadData(user, type, query);\n    }\n\n    @Get(\"filter/config\")\n    public async getFilterConfig(@Req() req: any): Promise<FilterConfigurationModel[]> {\n        return await this.filterService.getConfig(req, await this.getUser(req) ?? {} as DataFilterUserModel);\n    }\n\n    @Get(\"filter/config/id\")\n    public async searchFilterResourceValue(\n        @Query() search: FilterResourceValueModel,\n        @Req() req: any\n    ): Promise<SelectFilterValue | null> {\n        return await this.filterService.findResourceValueById(req, search, await this.getUser(req) ?? {} as DataFilterUserModel);\n    }\n\n    @Get(\"filter/config/value\")\n    public async searchFilterConfigValues(\n        @Query() search: FilterConfigurationSearchModel,\n        @Req() req: any\n    ): Promise<SelectFilterValue[]> {\n        return await this.filterService.searchConfigValues(req, search, await this.getUser(req) ?? {} as DataFilterUserModel);\n    }\n\n    protected async getUser(req: any): Promise<DataFilterUserModel | null> {\n        if (!this.userUserDeserializer || this.option.disableAccessControl) {\n            return null;\n        }\n\n        return this.userUserDeserializer.deserializeUser(req);\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/controllers/filter.controller.ts"],"names":[],"mappings":"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","file":"lib/filter/controllers/filter.controller.js","sourcesContent":["import {\n    Body,\n    Get,\n    HttpCode,\n    HttpStatus,\n    Inject,\n    Optional,\n    Param,\n    Post,\n    Query,\n    Req,\n    UseGuards,\n    UseInterceptors\n} from \"@nestjs/common\";\nimport { ExportTypes, FilterQueryModel, FilterResultModel, SelectFilterValue } from \"../..\";\nimport { FILTER_OPTION } from \"../../constant\";\nimport { UserDeserializer } from \"../../deserializers\";\nimport { DataFilterUserModel } from \"../../models/user.model\";\nimport { FilterOptionConfig } from \"../filter.config\";\nimport { FilterService } from \"../filter.service\";\nimport { FilterQueryGuard } from \"../guards/filter-query.guard\";\nimport { DataFileDownloadInterceptor } from \"../interceptors/data-file-download.interceptor\";\nimport { FilterConfigurationSearchModel } from \"../models/filter-configuration-search.model\";\nimport { FilterConfigurationModel } from \"../models/filter-configuration.model\";\nimport { FilterResourceValueModel } from \"../models/filter-resource-value.model\";\n\nexport class FilterController<Data> {\n    @Inject()\n    @Optional()\n    private readonly userUserDeserializer!: UserDeserializer<DataFilterUserModel>;\n\n    @Inject(FILTER_OPTION)\n    private readonly option!: FilterOptionConfig;\n\n    constructor(protected readonly filterService: FilterService<Data>) {}\n\n    @Post(\"filter\")\n    @HttpCode(HttpStatus.OK)\n    @UseGuards(FilterQueryGuard)\n    public async filter(@Body() query: FilterQueryModel, @Req() request: any): Promise<FilterResultModel<Data>> {\n        const user = await this.getUser(request);\n        return this.filterService.filter({ options: query, request, user });\n    }\n\n    @Post(\"filter-count\")\n    @HttpCode(HttpStatus.OK)\n    public async filterCount(@Body() query: FilterQueryModel, @Req() request: any): Promise<number> {\n        const user = await this.getUser(request);\n        return this.filterService.count({ options: query, user });\n    }\n\n    @Post(\"download/:type\")\n    @HttpCode(HttpStatus.OK)\n    @UseInterceptors(DataFileDownloadInterceptor)\n    public async downloadData(\n        @Body() query: FilterQueryModel,\n        @Param(\"type\") type: ExportTypes,\n        @Req() request: any\n    ): Promise<Buffer | string> {\n        const user = await this.getUser(request);\n        return await this.filterService.downloadData({ options: query, request, type, user });\n    }\n\n    @Get(\"filter/config\")\n    public async getFilterConfig(@Req() request: any): Promise<FilterConfigurationModel[]> {\n        return await this.filterService.getConfig(request, await this.getUser(request) ?? {} as DataFilterUserModel);\n    }\n\n    @Get(\"filter/config/id\")\n    public async searchFilterResourceValue(\n        @Query() search: FilterResourceValueModel,\n        @Req() request: any\n    ): Promise<SelectFilterValue | null> {\n        return await this.filterService.findResourceValueById(request, search, await this.getUser(request) ?? {} as DataFilterUserModel);\n    }\n\n    @Get(\"filter/config/value\")\n    public async searchFilterConfigValues(\n        @Query() search: FilterConfigurationSearchModel,\n        @Req() request: any\n    ): Promise<SelectFilterValue[]> {\n        return await this.filterService.searchConfigValues(request, search, await this.getUser(request) ?? {} as DataFilterUserModel);\n    }\n\n    protected async getUser(request: any): Promise<DataFilterUserModel | null> {\n        if (!this.userUserDeserializer || this.option.disableAccessControl) {\n            return null;\n        }\n\n        return this.userUserDeserializer.deserializeUser(request);\n    }\n}\n"]}

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

@@ -14,6 +14,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;
@@ -30,12 +46,11 @@ 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(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 +71,4 @@ export declare class FilterService<Data> {
     private normalizeOrder;
     private getNonNestedOrderColumns;
 }
+export {};