Fix tag operations

ArweaveTeam · Apr 8, 2021 · 5b0369a · 5b0369a
1 parent 10d8c3a
commit 5b0369a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/src/graphql/query.graphql.ts b/src/graphql/query.graphql.ts
@@ -71,6 +71,7 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
 
   if (tags) {
     const tagsConverted = tagToB64(tags);
+
     for (let i = 0; i < tagsConverted.length; i++) {
       const tag = tagsConverted[i];
       const tagAlias = `${i}_${i}`;
@@ -81,14 +82,7 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
 
         if (tag.name === index) {
           indexed = true;
-
-          if (tag.op === 'EQ') {
-            query.whereIn(`transactions.${index}`, tag.values);
-          }
-
-          if (tag.op === 'NEQ') {
-            query.whereNotIn(`transactions.${index}`, tag.values);
-          }
+          query.whereIn(`transactions.${index}`, tag.values);
         }
       }
 
@@ -97,14 +91,7 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
           join.on('transactions.id', `${tagAlias}.tx_id`);
 
           join.andOnIn(`${tagAlias}.name`, [tag.name]);
-
-          if (tag.op === 'EQ') {
-            join.andOnIn(`${tagAlias}.value`, tag.values);
-          }
-
-          if (tag.op === 'NEQ') {
-            join.andOnNotIn(`${tagAlias}.value`, tag.values);
-          }
+          join.andOnIn(`${tagAlias}.value`, tag.values);
         });
       }
     }

diff --git a/src/query/transaction.query.ts b/src/query/transaction.query.ts
@@ -87,7 +87,7 @@ export function tagToB64(tags: Array<TagFilter>): Array<TagFilter> {
     const tag = tags[i];
     conversion.push({
       name: toB64url(tag.name),
-      values: tag.values.map(v => toB64url(v)),
+      values: tag.values.map((v) => toB64url(v)),
     });
   }