Revert to the old version of get devices by segment (filter by segmen…

…t query does not give the same result as getting device from a segment)
barracksiot · Feb 16, 2017 · fb453f2 · fb453f2
1 parent d0c31e0
commit fb453f2
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 24 deletions.
diff --git a/clients/Barracks.js b/clients/Barracks.js
@@ -317,6 +317,23 @@ class Barracks {
     });
   }
 
+  getSegmentDevices(token, segmentId) {
+    return new Promise(resolve => {
+      logger.debug('Getting devices for segment:', segmentId);
+      const stream = new PageableStream();
+      resolve(stream);
+      this.client.retrieveAllPages(stream, 'getSegmentDevices', {
+        headers: {
+          'x-auth-token': token
+        },
+        pathVariables: {
+          segmentId
+        }
+      },
+      'devices');
+    });
+  }
+
   getDevices(token, query) {
     return new Promise(resolve => {
       logger.debug('Getting devices with query:', query);

diff --git a/clients/Barracks.spec.js b/clients/Barracks.spec.js
@@ -1052,6 +1052,34 @@ describe('Barracks', () => {
     });
   });
 
+  describe('#getSegmentDevices()', () => {
+
+    it('should return a stream object and deleguate to the client', done => {
+      // Given
+      const segmentId = 'aSegment';
+      const options = {
+        headers: { 'x-auth-token': token },
+        pathVariables: { segmentId }
+      }
+      barracks.client.retrieveAllPages = sinon.spy();
+
+      // When / Then
+      barracks.getSegmentDevices(token, segmentId).then(result => {
+        expect(result).to.be.instanceOf(PageableStream);
+        expect(barracks.client.retrieveAllPages).to.have.been.calledOnce;
+        expect(barracks.client.retrieveAllPages).to.have.been.calledWithExactly(
+          new PageableStream(),
+          'getSegmentDevices',
+          options,
+          'devices'
+        );
+        done();
+      }).catch(err => {
+        done(err);
+      });
+    });
+  });
+
   describe('#getDevices()', () => {
 
     it('should return a stream object and deleguate to the client when no query given', done => {

diff --git a/commands/DevicesCommand.js b/commands/DevicesCommand.js
@@ -1,18 +1,23 @@
 const BarracksCommand = require('./BarracksCommand');
 
-function getQuery(token, program, barracks) {
+function getAllDevicesFromFilter(token, barracks, filterName) {
   return new Promise((resolve, reject) => {
-    let promise;
-    if (program.segment) {
-      promise = barracks.getSegmentByName(token, program.segment);
-    } else if (program.filter) {
-      promise = barracks.getFilterByName(token, program.filter);
-    } else {
-      promise = Promise.resolve({});
-    }
+    barracks.getFilterByName(token, filterName).then(filter => {
+      return barracks.getDevices(token, filter.query);
+    }).then(resultStream => {
+      resolve(resultStream);
+    }).catch(err => {
+      reject(err);
+    });
+  });
+}
 
-    promise.then(filterObject => {
-      resolve(filterObject.query);
+function getAllDevicesFromSegment(token, barracks, segmentName) {
+  return new Promise((resolve, reject) => {
+    barracks.getSegmentByName(token, segmentName).then(segment => {
+      return barracks.getSegmentDevices(token, segment.id);
+    }).then(resultStream => {
+      resolve(resultStream);
     }).catch(err => {
       reject(err);
     });
@@ -42,12 +47,14 @@ class DevicesCommand extends BarracksCommand {
   }
 
   execute(program) {
-    let token;
-    return this.getAuthenticationToken().then(authToken => {
-      token = authToken;
-      return getQuery(token, program, this.barracks);
-    }).then(query => {
-      return this.barracks.getDevices(token, query);
+    return this.getAuthenticationToken().then(token => {
+      if (program.segment) {
+        return getAllDevicesFromSegment(token, this.barracks, program.segment);
+      } else if (program.filter) {
+        return getAllDevicesFromFilter(token, this.barracks, program.filter);
+      } else {
+        return this.barracks.getDevices(token);
+      }
     });
   }
 }

diff --git a/commands/DevicesCommand.spec.js b/commands/DevicesCommand.spec.js
@@ -169,7 +169,7 @@ describe('DevicesCommand', () => {
       const error = 'request failed';
       devicesCommand.getAuthenticationToken = sinon.stub().returns(Promise.resolve(token));
       devicesCommand.barracks.getSegmentByName = sinon.stub().returns(Promise.resolve(segment));
-      devicesCommand.barracks.getDevices = sinon.stub().returns(Promise.reject(error));
+      devicesCommand.barracks.getSegmentDevices = sinon.stub().returns(Promise.reject(error));
 
       // when / Then
       devicesCommand.execute(program).then(result => {
@@ -180,8 +180,8 @@ describe('DevicesCommand', () => {
         expect(devicesCommand.getAuthenticationToken).to.have.been.calledWithExactly();
         expect(devicesCommand.barracks.getSegmentByName).to.have.been.calledOnce;
         expect(devicesCommand.barracks.getSegmentByName).to.have.been.calledWithExactly(token, segmentName);
-        expect(devicesCommand.barracks.getDevices).to.have.been.calledOnce;
-        expect(devicesCommand.barracks.getDevices).to.have.been.calledWithExactly(token, query);
+        expect(devicesCommand.barracks.getSegmentDevices).to.have.been.calledOnce;
+        expect(devicesCommand.barracks.getSegmentDevices).to.have.been.calledWithExactly(token, segmentId);
         done();
       });
     });
@@ -191,7 +191,7 @@ describe('DevicesCommand', () => {
       const program = programWithValidSegment;
       devicesCommand.getAuthenticationToken = sinon.stub().returns(Promise.resolve(token));
       devicesCommand.barracks.getSegmentByName = sinon.stub().returns(Promise.resolve(segment));
-      devicesCommand.barracks.getDevices = sinon.stub().returns(Promise.resolve(new PageableStream()));
+      devicesCommand.barracks.getSegmentDevices = sinon.stub().returns(Promise.resolve(new PageableStream()));
 
       // when / Then
       devicesCommand.execute(program).then(result => {
@@ -200,8 +200,8 @@ describe('DevicesCommand', () => {
         expect(devicesCommand.getAuthenticationToken).to.have.been.calledWithExactly();
         expect(devicesCommand.barracks.getSegmentByName).to.have.been.calledOnce;
         expect(devicesCommand.barracks.getSegmentByName).to.have.been.calledWithExactly(token, segmentName);
-        expect(devicesCommand.barracks.getDevices).to.have.been.calledOnce;
-        expect(devicesCommand.barracks.getDevices).to.have.been.calledWithExactly(token, query);
+        expect(devicesCommand.barracks.getSegmentDevices).to.have.been.calledOnce;
+        expect(devicesCommand.barracks.getSegmentDevices).to.have.been.calledWithExactly(token, segmentId);
         done();
       }).catch(err => {
         done(err);
@@ -220,7 +220,7 @@ describe('DevicesCommand', () => {
         expect(devicesCommand.getAuthenticationToken).to.have.been.calledOnce;
         expect(devicesCommand.getAuthenticationToken).to.have.been.calledWithExactly();
         expect(devicesCommand.barracks.getDevices).to.have.been.calledOnce;
-        expect(devicesCommand.barracks.getDevices).to.have.been.calledWithExactly(token, undefined);
+        expect(devicesCommand.barracks.getDevices).to.have.been.calledWithExactly(token);
         done();
       }).catch(err => {
         done(err);

diff --git a/config.js b/config.js
@@ -65,6 +65,10 @@ module.exports = {
         method: 'GET',
         path: '/api/member/segments/:id'
       },
+      getSegmentDevices: {
+        method: 'GET',
+        path: '/api/member/segments/:segmentId/devices'
+      },
       getFilters: {
         method: 'GET',
         path: '/api/member/filters/'