Added fromHeight & toHeight filter in transactionSearch (#676)

* Fixed #675
- Added fromHeight & toHeight filter in transactionSearch

* Updated pckage-lock

Author: rg911

e2e/infrastructure/ReceiptHttp.spec.ts

@@ -16,7 +16,6 @@
 
 import { expect } from 'chai';
 import { toArray } from 'rxjs/operators';
-import { ReceiptHttp } from '../../src/infrastructure/infrastructure';
 import { ReceiptPaginationStreamer } from '../../src/infrastructure/paginationStreamer/ReceiptPaginationStreamer';
 import { ReceiptRepository } from '../../src/infrastructure/ReceiptRepository';
 import { ReceiptType, UInt64 } from '../../src/model/model';

package-lock.json

@@ -87,7 +87,8 @@
         "ts-node": "^8.6.2",
         "typescript": "^3.7.5",
         "typedoc": "^0.18.0",
-        "typescript-require": "^0.2.10"
+        "typescript-require": "^0.2.10",
+        "node-forge": ">=0.10.0"
     },
     "dependencies": {
         "bluebird": "^3.7.2",
@@ -108,7 +109,7 @@
         "ripemd160": "^2.0.2",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3",
-        "symbol-openapi-typescript-fetch-client": "0.9.7-SNAPSHOT.202009141633",
+        "symbol-openapi-typescript-fetch-client": "0.9.7-SNAPSHOT.202009171123",
         "tweetnacl": "^1.0.3",
         "utf8": "^3.0.0",
         "ws": "^7.2.3"

package.json

@@ -224,6 +224,8 @@ export class TransactionHttp extends Http implements TransactionRepository {
                     criteria.recipientAddress?.plain(),
                     criteria.signerPublicKey,
                     criteria.height?.toString(),
+                    criteria.fromHeight?.toString(),
+                    criteria.toHeight?.toString(),
                     criteria.type?.map((type) => type.valueOf()),
                     criteria.embedded,
                     criteria.pageSize,
@@ -237,6 +239,8 @@ export class TransactionHttp extends Http implements TransactionRepository {
                     criteria.recipientAddress?.plain(),
                     criteria.signerPublicKey,
                     criteria.height?.toString(),
+                    criteria.fromHeight?.toString(),
+                    criteria.toHeight?.toString(),
                     criteria.type?.map((type) => type.valueOf()),
                     criteria.embedded,
                     criteria.pageSize,
@@ -250,6 +254,8 @@ export class TransactionHttp extends Http implements TransactionRepository {
                     criteria.recipientAddress?.plain(),
                     criteria.signerPublicKey,
                     criteria.height?.toString(),
+                    criteria.fromHeight?.toString(),
+                    criteria.toHeight?.toString(),
                     criteria.type?.map((type) => type.valueOf()),
                     criteria.embedded,
                     criteria.pageSize,

src/infrastructure/TransactionHttp.ts

@@ -67,4 +67,14 @@ export interface TransactionSearchCriteria extends SearchCriteria {
      * returned.  (optional, default to false)
      */
     embedded?: boolean;
+
+    /*
+     * Only blocks with height greater or equal than this one are returned.
+     */
+    fromHeight?: UInt64;
+
+    /*
+     * Only blocks with height smaller or equal than this one are returned.
+     */
+    toHeight?: UInt64;
 }

src/infrastructure/searchCriteria/TransactionSearchCriteria.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { UInt64 } from '../UInt64';
 /**
  * Account link voting key
  */

src/model/account/AccountLinkVotingKey.ts

@@ -130,6 +130,8 @@ describe('TransactionHttp', () => {
                 undefined,
                 undefined,
                 undefined,
+                undefined,
+                undefined,
             ),
         ).thenReturn(Promise.resolve(page));
 
@@ -145,6 +147,8 @@ describe('TransactionHttp', () => {
                 undefined,
                 undefined,
                 undefined,
+                undefined,
+                undefined,
             ),
         ).thenReturn(Promise.resolve(page));
 
@@ -160,6 +164,8 @@ describe('TransactionHttp', () => {
                 undefined,
                 undefined,
                 undefined,
+                undefined,
+                undefined,
             ),
         ).thenReturn(Promise.resolve(page));
 

test/infrastructure/TransactionHttp.spec.ts

@@ -36,6 +36,8 @@ describe('TransactionSearchCriteria', () => {
             embedded: true,
             group: TransactionGroup.Confirmed,
             height: UInt64.fromUint(1),
+            fromHeight: UInt64.fromUint(1),
+            toHeight: UInt64.fromUint(1),
             offset: '6789',
             recipientAddress: account.address,
             signerPublicKey: account.publicKey,
@@ -49,6 +51,8 @@ describe('TransactionSearchCriteria', () => {
         expect(criteria.embedded).to.be.equal(true);
         expect(criteria.group.toString()).to.be.equal(TransactionGroup.Confirmed.toString());
         expect(criteria.height?.toString()).to.be.equal('1');
+        expect(criteria.fromHeight?.toString()).to.be.equal('1');
+        expect(criteria.toHeight?.toString()).to.be.equal('1');
         expect(criteria.offset).to.be.equal('6789');
         expect(criteria.recipientAddress?.plain()).to.be.equal(account.address.plain());
         expect(criteria.signerPublicKey).to.be.equal(account.publicKey);
@@ -63,6 +67,8 @@ describe('TransactionSearchCriteria', () => {
             embedded: false,
             group: TransactionGroup.Unconfirmed,
             height: UInt64.fromUint(2),
+            fromHeight: UInt64.fromUint(1),
+            toHeight: UInt64.fromUint(1),
             offset: 'bbb',
             recipientAddress: address,
             signerPublicKey: 'publicKey',
@@ -80,6 +86,8 @@ describe('TransactionSearchCriteria', () => {
         expect(criteria.recipientAddress?.plain()).to.be.equal(address.plain());
         expect(criteria.signerPublicKey).to.be.equal('publicKey');
         deepEqual(criteria.type, [TransactionType.TRANSFER]);
+        expect(criteria.fromHeight?.toString()).to.be.equal('1');
+        expect(criteria.toHeight?.toString()).to.be.equal('1');
     });
 
     it('should create TransactionSearchCriteria - default', () => {
@@ -90,6 +98,8 @@ describe('TransactionSearchCriteria', () => {
         expect(criteria.embedded).to.be.undefined;
         expect(criteria.group).to.be.equal(TransactionGroup.Confirmed);
         expect(criteria.height).to.be.undefined;
+        expect(criteria.fromHeight).to.be.undefined;
+        expect(criteria.toHeight).to.be.undefined;
         expect(criteria.offset).to.be.undefined;
         expect(criteria.pageNumber).to.be.undefined;
         expect(criteria.pageSize).to.be.undefined;