EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'dev' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8 into dev

Browse Source
This commit is contained in:
shunmugam 2019-09-11 19:07:23 +05:30
commit 9e677c688f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/controllers/BlockchainBlock.ts
View File

@ -1012,6 +1012,7 @@ export class BlockchainBlockController {
// MaxPages, // MaxPages,
PageSize, PageSize,
}: BlockchainBlockPaginationDto = request.query; }: BlockchainBlockPaginationDto = request.query;
if (parseInt(CurrentPage) == NaN) { if (parseInt(CurrentPage) == NaN) {
next(new IntegerValidationException('CurrentPage')); next(new IntegerValidationException('CurrentPage'));
} else if (parseInt(PageSize) == NaN) { } else if (parseInt(PageSize) == NaN) {
@ -1076,14 +1077,14 @@ export class BlockchainBlockController {
.leftJoin('blockchain_block.BlockchainKernels', 'blockchain_kernel') .leftJoin('blockchain_block.BlockchainKernels', 'blockchain_kernel')
.leftJoin('blockchain_block.BlockchainOutputs', 'blockchain_output') .leftJoin('blockchain_block.BlockchainOutputs', 'blockchain_output')
.skip(PaginationReponseData.startIndex) .skip(PaginationReponseData.startIndex)
.take(PaginationReponseData.pageSize) .take(PaginationReponseData.pageSize+1)
.orderBy('blockchain_block.Timestamp', 'DESC') .orderBy('blockchain_block.Timestamp', 'DESC')
.groupBy('blockchain_block.Hash') .groupBy('blockchain_block.Hash')
.getRawAndEntities(); .getRawAndEntities();
//console.log(BlockchainBlockPaginationQuery.raw);
let BlockchainBlockResult = BlockchainBlockPaginationQuery.raw; let BlockchainBlockResult = BlockchainBlockPaginationQuery.raw;
BlockchainBlockResult.splice(-1,1);
let lastElemt = let lastElemt =
BlockchainBlockResult[BlockchainBlockResult.length - 1]; BlockchainBlockResult[BlockchainBlockResult.length - 1];
const BlockchainPreviousBlockFetchQuery = await getConnection(Global.network).getRepository( const BlockchainPreviousBlockFetchQuery = await getConnection(Global.network).getRepository(