Allow for searching DAOs with id_in where queries (#443)

Author: tibetsprague

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@daostack/client",
-  "version": "0.2.66",
+  "version": "0.2.67",
   "description": "",
   "keywords": [],
   "main": "dist/lib/index.js",

package.json

@@ -46,21 +46,20 @@ export interface IDAOQueryOptions extends ICommonQueryOptions {
   }
 }
 
+export const DAOFieldsFragment = gql`
+  fragment DAOFields on DAO {
+    id
+    name
+    nativeReputation { id, totalSupply }
+    nativeToken { id, name, symbol, totalSupply }
+    numberOfQueuedProposals
+    numberOfPreBoostedProposals
+    numberOfBoostedProposals
+    register
+    reputationHoldersCount
+}`
+
 export class DAO implements IStateful<IDAOState> {
-  public static fragments = {
-    DAOFields: gql`
-      fragment DAOFields on DAO {
-        id
-        name
-        nativeReputation { id, totalSupply }
-        nativeToken { id, name, symbol, totalSupply }
-        numberOfQueuedProposals
-        numberOfPreBoostedProposals
-        numberOfBoostedProposals
-        register
-        reputationHoldersCount
-    }`
-  }
 
   /**
    * DAO.search(context, options) searches for DAO entities
@@ -88,7 +87,13 @@ export class DAO implements IStateful<IDAOState> {
         options.where[key] = option.toLowerCase()
       }
 
-      where += `${key}: "${options.where[key] as string}"\n`
+      if (Array.isArray(options.where[key])) {
+        // Support for operators like _in
+        const values = options.where[key].map((val: number) => '"' + val + '"')
+        where += `${key}: [${values.join(',')}]\n`
+      } else {
+        where += `${key}: "${options.where[key] as string}"\n`
+      }
     }
 
     let query
@@ -98,14 +103,13 @@ export class DAO implements IStateful<IDAOState> {
           ...DAOFields
           }
         }
-        ${DAO.fragments.DAOFields}`
+        ${DAOFieldsFragment}`
     } else {
       query = gql`query SearchDaoIds {
         daos ${createGraphQlQuery(options, where)} {
           id
         }
       }`
-
     }
 
     return context.getObservableList(
@@ -121,8 +125,8 @@ export class DAO implements IStateful<IDAOState> {
             register: r.register,
             reputation,
             token,
-            tokenName: r.tokenName,
-            tokenSymbol: r.tokenSymbol
+            tokenName: r.nativeToken.name,
+            tokenSymbol: r.nativeToken.symbol
           }, context)
         } else {
           return new DAO(r.id, context)
@@ -178,7 +182,7 @@ export class DAO implements IStateful<IDAOState> {
           ...DAOFields
         }
       }
-      ${DAO.fragments.DAOFields}
+      ${DAOFieldsFragment}
      `
 
     const itemMap = (item: any): IDAOState => {

src/dao.ts

@@ -1,5 +1,5 @@
 export { Arc, IContractInfo } from './arc'
-export { DAO, IDAOState, IDAOStaticState, IDAOQueryOptions } from './dao'
+export { DAO, DAOFieldsFragment, IDAOState, IDAOStaticState, IDAOQueryOptions } from './dao'
 export { IGenesisProtocolParams } from './genesisProtocol'
 export { createApolloClient } from './graphnode'
 export { Event, IEventState, IEventStaticState, IEventQueryOptions } from './event'

src/index.ts

@@ -115,7 +115,7 @@ export function createGraphQlQuery(options: ICommonQueryOptions, where: string =
   if (where) {
     queryString += `where: {
       ${where}
-    }`
+    }\n`
   }
   if (options.first) {
     queryString += `first: ${options.first}\n`

src/utils.ts

@@ -37,6 +37,11 @@ describe('DAO', () => {
     expect(result.length).toEqual(0)
     result = await DAO.search(arc, {where: { register: 'registered'}}).pipe(first()).toPromise()
     expect(result.length).toBeGreaterThan(0)
+
+    // test _in queries
+    const dao = await getTestDAO()
+    result = await DAO.search(arc, {where: { id_in: [dao.id] }}).pipe(first()).toPromise()
+    expect(result.length).toBeGreaterThan(0)
   })
 
   it('fetchAllData in DAO.search works', async () => {