Fixed #657 (#660)

- Removed totalPage and TotalEntries from pagination

Author: rg911

package-lock.json

@@ -101,7 +101,7 @@
         "ripemd160": "^2.0.2",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3",
-        "symbol-openapi-typescript-fetch-client": "0.9.6",
+        "symbol-openapi-typescript-fetch-client": "0.9.7-SNAPSHOT.202009041234",
         "tweetnacl": "^1.0.3",
         "utf8": "^3.0.0",
         "ws": "^7.2.3"

package.json

@@ -139,8 +139,6 @@ export abstract class Http {
             data.map((d) => mapper(d, networkType)),
             pagination?.pageNumber,
             pagination?.pageSize,
-            pagination?.totalEntries,
-            pagination?.totalPages,
         );
     }
 }

src/infrastructure/Http.ts

@@ -27,16 +27,8 @@ export class Page<T> {
      * @param data the page data
      * @param pageNumber the current page number starting from 1.
      * @param pageSize the page size.
-     * @param totalEntries the total entries.
-     * @param totalPages the total pages for the given criteria.
      */
-    constructor(
-        public readonly data: T[],
-        public readonly pageNumber: number,
-        public readonly pageSize: number,
-        public readonly totalEntries: number,
-        public readonly totalPages: number,
-    ) {
-        this.isLastPage = this.pageNumber >= this.totalPages;
+    constructor(public readonly data: T[], public readonly pageNumber: number, public readonly pageSize: number) {
+        this.isLastPage = !this.data.length || this.pageSize > this.data.length;
     }
 }

src/infrastructure/Page.ts

@@ -129,8 +129,6 @@ describe('AccountHttp', () => {
         const pagination = {} as Pagination;
         pagination.pageNumber = 1;
         pagination.pageSize = 1;
-        pagination.totalEntries = 1;
-        pagination.totalPages = 1;
 
         const body = {} as AccountPage;
         body.data = [accountInfoDto];

test/infrastructure/AccountHttp.spec.ts

@@ -109,8 +109,6 @@ describe('BlockHttp', () => {
         const pagination = {} as Pagination;
         pagination.pageNumber = 1;
         pagination.pageSize = 1;
-        pagination.totalEntries = 1;
-        pagination.totalPages = 1;
 
         const body = {} as BlockPage;
         body.data = [blockInfoDto];

test/infrastructure/BlockHttp.spec.ts

@@ -49,8 +49,6 @@ describe('MetadataHttp', () => {
     const pagination = {} as Pagination;
     pagination.pageNumber = 1;
     pagination.pageSize = 1;
-    pagination.totalEntries = 1;
-    pagination.totalPages = 1;
 
     const metadataDTOMosaic = {} as MetadataInfoDTO;
     metadataDTOMosaic.id = 'aaa';

test/infrastructure/MetadataHttp.spec.ts

@@ -99,8 +99,6 @@ describe('MosaicHttp', () => {
         const pagination = {} as Pagination;
         pagination.pageNumber = 1;
         pagination.pageSize = 1;
-        pagination.totalEntries = 1;
-        pagination.totalPages = 1;
 
         const body = {} as MosaicPage;
         body.data = [mosaicInfoDto];

test/infrastructure/MosaicHttp.spec.ts

@@ -208,8 +208,6 @@ describe('NamespaceHttp', () => {
         const pagination = {} as Pagination;
         pagination.pageNumber = 1;
         pagination.pageSize = 1;
-        pagination.totalEntries = 1;
-        pagination.totalPages = 1;
 
         const body = {} as NamespacePage;
         body.data = [namespaceInfoDto];

test/infrastructure/NamespaceHttp.spec.ts

@@ -30,22 +30,20 @@ describe('Page', () => {
             [TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create(''), NetworkType.TEST_NET)],
             1,
             1,
-            1,
-            1,
         );
         expect(page.data.length).to.be.equal(1);
         expect(page.pageNumber).to.be.equal(1);
         expect(page.pageSize).to.be.equal(1);
-        expect(page.totalEntries).to.be.equal(1);
-        expect(page.isLastPage).to.be.true;
+        expect(page.isLastPage).to.be.false;
 
         page = new Page<Transaction>(
             [TransferTransaction.create(Deadline.create(), account.address, [], PlainMessage.create(''), NetworkType.TEST_NET)],
-            1,
-            1,
-            1,
-            3,
+            2,
+            2,
         );
-        expect(page.isLastPage).to.be.false;
+        expect(page.isLastPage).to.be.true;
+
+        page = new Page<Transaction>([], 2, 2);
+        expect(page.isLastPage).to.be.true;
     });
 });