Merge pull request #280 from daostack/support_not_in

support scheme - not_in queries

Author: jellegerbrandy

package-lock.json

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

package.json

@@ -98,10 +98,15 @@ export class Scheme implements IStateful<ISchemeState> {
       if (key === 'address' || key === 'dao') {
         const option = options.where[key] as string
         isAddress(option)
-        options.where[key] = option.toLowerCase()
+        options.where[key] = `"${option.toLowerCase()}"`
+      } else if (key.endsWith('_in') || key.endsWith('_not_in')) {
+        const option = options.where[key] as string[]
+        options.where[key] = JSON.stringify(option)
+      } else {
+        const option = options.where[key] as string
+        options.where[key] = `"${option}"`
       }
-
-      where += `${key}: "${options.where[key] as string}"\n`
+      where += `${key}: ${options.where[key] as string}\n`
     }
 
     const query = gql`{
@@ -113,7 +118,7 @@ export class Scheme implements IStateful<ISchemeState> {
           dao { id }
           paramsHash
       }
-    }`
+    }   `
     const itemMap = (item: any): Scheme|null => {
       if (!options.where) { options.where = {}}
 
@@ -173,7 +178,7 @@ export class Scheme implements IStateful<ISchemeState> {
 
   public state(): Observable < ISchemeState > {
     const query = gql`
-      {
+        {
         controllerScheme (id: "${this.id}") {
           id
           address
@@ -256,7 +261,7 @@ export class Scheme implements IStateful<ISchemeState> {
           }
         }
       }
-    `
+        `
 
     const itemMap = (item: any): ISchemeState|null => {
       if (!item) {
@@ -323,7 +328,7 @@ export class Scheme implements IStateful<ISchemeState> {
             break
 
           default:
-            msg = `Unknown proposal scheme: "${state.name}"`
+            msg = `Unknown proposal scheme: '${state.name}'`
             throw Error(msg)
         }
 

src/scheme.ts

@@ -26,7 +26,7 @@ describe('Scheme', () => {
     expect(scheme).toBeInstanceOf(Scheme)
   })
 
-  it('Scheme are searchable', async () => {
+  it('Schemes are searchable', async () => {
     const dao = await getTestDAO()
     let result: Scheme[]
     result = await Scheme.search(arc, {where: {dao: dao.id, name_not: null}})
@@ -64,7 +64,13 @@ describe('Scheme', () => {
     result = await Scheme.search(arc, {where: {dao: dao.id, name: 'SchemeRegistrar'}})
         .pipe(first()).toPromise()
     expect(result.length).toEqual(1)
-  })
+    result = await Scheme.search(arc, {where: {dao: dao.id, name_in: ['SchemeRegistrar', 'GenericScheme']}})
+        .pipe(first()).toPromise()
+    expect(result.length).toEqual(2)
+    result = await Scheme.search(arc, {where: {dao: dao.id, name_not_in: ['GenericScheme']}})
+        .pipe(first()).toPromise()
+    expect(result.length).toBeGreaterThan(1)
+    })
 
   it('Scheme.state() is working for SchemeRegistrar schemes', async () => {
     const dao = await getTestDAO()