Add from/to timestamp filter to get blocks endpoint - Closes #2391

api/controllers/blocks.js

@@ -46,6 +46,8 @@ BlocksController.getBlocks = function(context, next) {
 		id: params.blockId.value,
 		height: params.height.value,
 		generatorPublicKey: params.generatorPublicKey.value,
+		fromTimestamp: params.fromTimestamp.value,
+		toTimestamp: params.toTimestamp.value,
 		sort: params.sort.value,
 		limit: params.limit.value,
 		offset: params.offset.value,

modules/blocks/api.js

@@ -106,6 +106,16 @@ __private.list = function(filter, cb) {
 		params.height = filter.height;
 	}
 
+	if (filter.fromTimestamp >= 0) {
+		where.push('"b_timestamp" >= ${fromTimestamp}');
+		params.fromTimestamp = filter.fromTimestamp;
+	}
+
+	if (filter.toTimestamp >= 1) {
+		where.push('"b_timestamp" <= ${toTimestamp}');
+		params.toTimestamp = filter.toTimestamp;
+	}
+
 	// FIXME: Useless condition
 	if (filter.totalAmount >= 0) {
 		where.push('"b_totalAmount" = ${totalAmount}');

schema/swagger.yml

@@ -696,6 +696,8 @@ paths:
       parameters:
         - $ref: '#/parameters/blockId'
         - $ref: '#/parameters/height'
+        - $ref: '#/parameters/fromTimestamp'
+        - $ref: '#/parameters/toTimestamp'
         - $ref: '#/parameters/limit'
         - $ref: '#/parameters/offset'
         - in: query

test/functional/http/get/blocks.js

@@ -19,6 +19,7 @@ require('../../functional.js');
 var waitFor = require('../../../common/utils/wait_for');
 var swaggerEndpoint = require('../../../common/swagger_spec');
 var apiHelpers = require('../../../common/helpers/api');
+var slots = require('../../../../helpers/slots');
 
 var expectSwaggerParamError = apiHelpers.expectSwaggerParamError;
 
@@ -112,6 +113,72 @@ describe('GET /blocks', () => {
 			});
 		});
 
+		describe('fromTimestamp', () => {
+			it('using invalid fromTimestamp should fail', () => {
+				return blocksEndpoint
+					.makeRequest(
+						{
+							fromTimestamp: -1,
+						},
+						400
+					)
+					.then(res => {
+						expectSwaggerParamError(res, 'fromTimestamp');
+					});
+			});
+
+			it('using valid fromTimestamp should return transactions', () => {
+				// Last hour lisk time
+				var queryTime = slots.getTime() - 60 * 60;
+
+				return blocksEndpoint
+					.makeRequest(
+						{
+							fromTimestamp: queryTime,
+						},
+						200
+					)
+					.then(res => {
+						res.body.data.forEach(transaction => {
+							expect(transaction.timestamp).to.be.at.least(queryTime);
+						});
+					});
+			});
+		});
+
+		describe('toTimestamp', () => {
+			it('using invalid toTimestamp should fail', () => {
+				return blocksEndpoint
+					.makeRequest(
+						{
+							toTimestamp: 0,
+						},
+						400
+					)
+					.then(res => {
+						expectSwaggerParamError(res, 'toTimestamp');
+					});
+			});
+
+			it('using valid toTimestamp should return transactions', () => {
+				// Current lisk time
+				var queryTime = slots.getTime();
+
+				return blocksEndpoint
+					.makeRequest(
+						{
+							toTimestamp: queryTime,
+						},
+						200
+					)
+					.then(res => {
+						res.body.data.forEach(transaction => {
+							expect(transaction.timestamp).to.be.at.most(queryTime);
+						});
+					});
+			});
+		});
+
 		describe('generatorPublicKey', () => {
 			it('using invalid generatorPublicKey = "InvalidKey" format should fail with error', () => {
 				return blocksEndpoint

test/functional/http/get/delegates.js

@@ -656,7 +656,7 @@ describe('GET /delegates', () => {
 
 			describe('?', () => {
 				describe('fromTimestamp', () => {
-					it('using too small fromTimestamp should fail', () => {
+					it('using invalid fromTimestamp should fail', () => {
 						return forgedEndpoint
 							.makeRequest(
 								{ address: validDelegate.address, fromTimestamp: -1 },
@@ -690,7 +690,7 @@ describe('GET /delegates', () => {
 				});
 
 				describe('toTimestamp', () => {
-					it('using too small toTimestamp should fail', () => {
+					it('using invalid toTimestamp should fail', () => {
 						return forgedEndpoint
 							.makeRequest(
 								{ address: validDelegate.address, toTimestamp: 0 },

test/functional/http/get/transactions.js

@@ -602,7 +602,7 @@ describe('GET /api/transactions', () => {
 		});
 
 		describe('fromTimestamp', () => {
-			it('using too small fromTimestamp should fail', () => {
+			it('using invalid fromTimestamp should fail', () => {
 				return transactionsEndpoint
 					.makeRequest({ fromTimestamp: -1 }, 400)
 					.then(res => {
@@ -625,7 +625,7 @@ describe('GET /api/transactions', () => {
 		});
 
 		describe('toTimestamp', () => {
-			it('using too small toTimestamp should fail', () => {
+			it('using invalid toTimestamp should fail', () => {
 				return transactionsEndpoint
 					.makeRequest({ toTimestamp: 0 }, 400)
 					.then(res => {