Fix query filter to work with 0. Adjusted type CredentialIssuanceRequestMessage (#55)

* Fix query filter to work with 0. Adjusted type CredentialIssuanceRequestMessage

* Patch version

* Remove console.log. Increase test timeout in ci

Author: Kolezhniuk

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xpolygonid/js-sdk",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "SDK to work with Polygon ID",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -22,7 +22,7 @@
     "doc:build": "npm run doc:extract && npm run doc:documenter",
     "doc:watch:website": "ts-node ./scripts/doc-watch.ts",
     "tsc:declaration:watch": "tsc --watch --module commonjs --emitDeclarationOnly",
-    "test": "mocha --require ts-node/register tests/**/*.ts -t 30000",
+    "test": "mocha --require ts-node/register tests/**/*.ts -t 60000",
     "test:watch": "mocha -p --require ts-node/register tests/**/*.ts -t 60000 --watch",
     "lint": "eslint --fix --ext .js,.ts src/**",
     "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\"",

package.json

@@ -3,24 +3,24 @@ import { JSONObject } from '../index';
 import { W3CCredential } from '../../../verifiable';
 import { MediaType } from '../../constants';
 
+/** CredentialIssuanceRequestMessageBody represents data for credential issuance request */
+export type CredentialIssuanceRequestMessageBody = {
+  schema: Schema;
+  data: JSONObject;
+  expiration: number;
+};
+
 /** CredentialIssuanceRequestMessage represent Iden3message for credential request */
 export type CredentialIssuanceRequestMessage = {
   id: string;
   typ?: MediaType;
   type: ProtocolMessage;
   thid?: string;
-  body?: CredentialIssuanceRequestMessage;
+  body?: CredentialIssuanceRequestMessageBody;
   from?: string;
   to?: string;
 };
 
-/** CredentialIssuanceRequestMessageBody represents data for credential issuance request */
-export type CredentialIssuanceRequestMessageBody = {
-  schema: Schema;
-  data: JSONObject;
-  expiration: number;
-};
-
 /** CredentialsOfferMessage represent Iden3message for credential offer */
 export type CredentialsOfferMessage = {
   id: string;

src/iden3comm/types/protocol/credentials.ts

@@ -109,7 +109,7 @@ export class FilterQuery implements IFilterQuery {
       throw new Error(SearchError.NotDefinedComparator);
     }
     const credentialPathValue = resolvePath(credential, this.path);
-    if (!credentialPathValue) {
+    if (credentialPathValue === null || credentialPathValue === undefined) {
       return false;
     }
     if (this.isReverseParams) {

src/storage/filters/jsonQuery.ts

@@ -3,7 +3,7 @@ import { CredentialStorage } from './../../src/storage/shared/credential-storage
 import { IDataStorage } from './../../src/storage/interfaces/data-storage';
 import { CredentialWallet } from '../../src/credentials';
 import { SearchError } from '../../src/storage/filters/jsonQuery';
-import { cred1, cred2, cred3 } from './mock';
+import { cred1, cred2, cred3, cred4 } from './mock';
 import { ProofQuery, W3CCredential } from '../../src/verifiable';
 import { BrowserDataSource } from '../../src/storage/local-storage/data-source';
 import chaiAsPromised from 'chai-as-promised';
@@ -45,8 +45,9 @@ const credentialFlow = async (storage: IDataStorage) => {
   expect(credentials.length).to.equal(2);
 
   await credentialWallet.save(cred3);
+  await credentialWallet.save(cred4);
   const credentialAll = await credentialWallet.list();
-  expect(credentialAll.length).to.equal(3);
+  expect(credentialAll.length).to.equal(4);
 
   // present id
   const credById = await credentialWallet.findById(cred2.id);
@@ -143,6 +144,50 @@ const credentialFlow = async (storage: IDataStorage) => {
         }
       },
       expected: [cred3]
+    },
+    {
+      query: {
+        allowedIssuers: ['*'],
+        credentialSubject: {
+          countOfFines: {
+            $nin: [1, 2]
+          }
+        }
+      },
+      expected: [cred4]
+    },
+    {
+      query: {
+        allowedIssuers: ['*'],
+        credentialSubject: {
+          countOfFines: {
+            $in: [0]
+          }
+        }
+      },
+      expected: [cred4]
+    },
+    {
+      query: {
+        allowedIssuers: ['*'],
+        credentialSubject: {
+          countOfFines: {
+            $eq: 0
+          }
+        }
+      },
+      expected: [cred4]
+    },
+    {
+      query: {
+        allowedIssuers: ['*'],
+        credentialSubject: {
+          countOfFines: {
+            $eq: 1
+          }
+        }
+      },
+      expected: []
     }
   ];
 
@@ -182,7 +227,7 @@ const credentialFlow = async (storage: IDataStorage) => {
 
   await credentialWallet.remove('test1');
   const finalList = await credentialWallet.list();
-  expect(finalList.length).to.equal(2);
+  expect(finalList.length).to.equal(3);
 };
 
 describe('credential-wallet', () => {
@@ -192,7 +237,7 @@ describe('credential-wallet', () => {
     } as unknown as IDataStorage;
     await credentialFlow(storage);
   });
-  it('run in local storage with 3 credential', async () => {
+  it('run in local storage with 4 credential', async () => {
     const storage = {
       credential: new CredentialStorage(
         new BrowserDataSource<W3CCredential>(CredentialStorage.storageKey)

tests/credentials/credential-wallet.test.ts

@@ -59,3 +59,21 @@ export const cred3 = createTestCredential({
   expirationDate: '2023-11-11',
   issuanceDate: '2022-11-11'
 });
+
+export const cred4 = createTestCredential({
+  id: 'test4',
+  '@context': ['context4'],
+  credentialSchema: {
+    id: 'credentialSchemaId',
+    type: 'credentialSchemaType'
+  },
+  proof: ['some proof4'],
+  type: ['type4'],
+  credentialStatus: {},
+  issuer: 'issuer4',
+  credentialSubject: {
+    countOfFines: 0
+  },
+  expirationDate: '2023-11-11',
+  issuanceDate: '2022-11-11'
+});