Merge pull request #173 from UniqueNetwork/feature/SCAN-fix-attribute…

…s-filter andWhere
UniqueNetwork · Nov 30, 2022 · c57cf45 · c57cf45
2 parents 46502fe + ddf0d19
commit c57cf45
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/apps/web-api/src/tokens/token.service.ts b/apps/web-api/src/tokens/token.service.ts
@@ -213,10 +213,12 @@ export class TokenService extends BaseService<Tokens, TokenDTO> {
 
           if (typeof rawValueParsed === 'object') {
             // Text field in format {_: "value"}
-            qb.orWhere(`attributes->'${key}'->'rawValue'='${rawValue}'::jsonb`);
+            qb.andWhere(
+              `attributes->'${key}'->'rawValue'='${rawValue}'::jsonb`,
+            );
           } else {
             // Select and multiselect field
-            qb.orWhere(
+            qb.andWhere(
               new Brackets((qb) => {
                 qb.where(
                   `attributes->'${key}'->>'rawValue'='${String(rawValue)}'`,