Add parameters for pagination and filtering by device type

particle-iot · Feb 22, 2019 · 4ada7d4 · 4ada7d4
1 parent 767b099
commit 4ada7d4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/Particle.js b/src/Particle.js
@@ -1359,12 +1359,14 @@ class Particle {
 	 * List all mesh networks
 	 * @param {Object} options Options for this API call
 	 * @param {String} options.auth Access token
+	 * @param {Number} [options.page] Current page of results
+	 * @param {Number} [options.perPage] Records per page
 	 * @param {Object} [options.context] Request context
 	 * @return {Promise<Object>}
 	 */
-	listMeshNetworks({ auth, context }) {
-		// TODO: Pagination
-		return this.get('/v1/networks', auth, undefined, context);
+	listMeshNetworks({ auth, context, page, perPage }) {
+		const query = page ? { page, per_page: perPage } : undefined;
+		return this.get('/v1/networks', auth, query, context);
 	}
 
 	/**
@@ -1424,12 +1426,15 @@ class Particle {
 	 * @param {Object} options Options for this API call
 	 * @param {String} options.networkId Network ID or name
 	 * @param {String} options.auth Access token
+	 * @param {Number} [options.role] Device role: 'gateway' or 'node'
+	 * @param {Number} [options.page] Current page of results
+	 * @param {Number} [options.perPage] Records per page
 	 * @param {Object} [options.context] Request context
 	 * @return {Promise<Object>}
 	 */
-	listMeshNetworkDevices({ networkId, auth, context }) {
-		// TODO: Pagination and filtering
-		return this.get(`/v1/networks/${networkId}/devices`, auth, undefined, context);
+	listMeshNetworkDevices({ networkId, auth, role, page, perPage, context }) {
+		const query = (role || page) ? { role, page, per_page: perPage } : undefined;
+		return this.get(`/v1/networks/${networkId}/devices`, auth, query, context);
 	}
 
 

diff --git a/test/Particle.spec.js b/test/Particle.spec.js
@@ -1864,7 +1864,11 @@ describe('ParticleAPI', () => {
 					results.should.match({
 						method: 'get',
 						uri: '/v1/networks',
-						auth: props.auth
+						auth: props.auth,
+						query: {
+							page: props.page,
+							per_page: props.perPage
+						}
 					});
 				});
 			});
@@ -1933,11 +1937,17 @@ describe('ParticleAPI', () => {
 
 		describe('.listMeshNetworkDevices', () => {
 			it('generates request', () => {
-				return api.listMeshNetworkDevices(props).then((results) => {
+				const p = Object.assign({ role: 'node' }, props);
+				return api.listMeshNetworkDevices(p).then((results) => {
 					results.should.match({
 						method: 'get',
 						uri: `/v1/networks/${props.networkId}/devices`,
-						auth: props.auth
+						auth: p.auth,
+						query: {
+							role: p.role,
+							page: p.page,
+							per_page: p.perPage
+						}
 					});
 				});
 			});