fix filters

Signed-off-by: simvalery <[email protected]> Signed-off-by: simvalery <[email protected]>
InternetOfPeers · Aug 13, 2024 · 8a04c36 · 8a04c36
1 parent 7f9a37c
commit 8a04c36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/policy-service/src/policy-engine/blocks/filters-addon-block.ts b/policy-service/src/policy-engine/blocks/filters-addon-block.ts
@@ -123,8 +123,6 @@ export class FiltersAddonBlock {
                 await this.getData(user);
             }
 
-            console.log('value', value);
-
             if (value) {
                 filter[ref.options.field] = value;
             }

diff --git a/policy-service/src/policy-engine/helpers/decorators/data-source-block.ts b/policy-service/src/policy-engine/helpers/decorators/data-source-block.ts
@@ -147,10 +147,10 @@ export function DataSourceBlock(options: Partial<PolicyBlockDecoratorOptions>) {
                             _globalFilters.$or = [];
                         }
                         const filter1 = {} as any;
-                        filter1[key] = {eq: String(globalFilters[key].$eq)};
+                        filter1[key] = {$eq: String(globalFilters[key].$eq)};
                         _globalFilters.$or.push(filter1);
                         const filter2 = {} as any;
-                        filter2[key] = {eq: Number(globalFilters[key].$eq)};
+                        filter2[key] = {$eq: Number(globalFilters[key].$eq)};
                         _globalFilters.$or.push(filter2);
                     } else {
                         _globalFilters[key] = globalFilters[key];
@@ -175,7 +175,7 @@ export function DataSourceBlock(options: Partial<PolicyBlockDecoratorOptions>) {
 
                     // If pagination block is not set
                     if (!paginationData) {
-                        for (const item of await currentSource.getFromSource(user, globalFilters, false, null)) {
+                        for (const item of await currentSource.getFromSource(user, _globalFilters, false, null)) {
                             (data as any[]).push(item);
                         }
                         continue;
@@ -200,7 +200,7 @@ export function DataSourceBlock(options: Partial<PolicyBlockDecoratorOptions>) {
                     skip = Math.max(start - previousCount, 0);
                     limit = paginationData.itemsPerPage - Math.min((previousCount - start), 0);
 
-                    const childData = await currentSource.getFromSource(user, globalFilters, false, {
+                    const childData = await currentSource.getFromSource(user, _globalFilters, false, {
                         offset: skip,
                         limit: limit - currentPosition
                     });