GraphQL Patch (#70)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arweave/gateway",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "dist/src/Gateway.js",
   "repository": "[email protected]:ArweaveTeam/gateway.git",
   "author": "Arweave <[email protected]>",

src/graphql/query.graphql.ts

@@ -76,6 +76,8 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
 
   if (tags) {
     const tagsConverted = tagToB64(tags);
+    const names: Array<string> = [];
+    const values: Array<string> = [];
 
     const subQuery = connection
         .queryBuilder()
@@ -93,17 +95,21 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
 
         if (tag.name === index) {
           indexed = true;
-          query.orWhereIn(`transactions.${index}`, tag.values);
+          query.whereIn(`transactions.${index}`, tag.values);
         }
       }
 
       if (indexed === false) {
-        subQuery.orWhere('name', tag.name);
-        subQuery.orWhereIn('value', tag.values);
+        names.push(tag.name);
+        values.push.apply(values, tag.values);
+
         runSubQuery = true;
       }
     }
 
+    subQuery.whereIn('name', names);
+    subQuery.whereIn('value', values);
+
     if (runSubQuery) {
       const results = await subQuery
           .limit(limit)
@@ -135,6 +141,8 @@ export async function generateQuery(params: QueryParams): Promise<QueryBuilder>
     query.orderByRaw(orderByClauses[sortOrder]);
   }
 
+  query.orderByRaw(`transactions.created_at DESC`);
+
   return query;
 }