resolve merge conflicts

Author: BryanZWu

README.md

@@ -704,6 +704,22 @@ numbers.SipPeer.get(function(err,sipPeer){
 });
 ```
 
+### SipPeer link Application Methods
+
+```Javascript
+numbers.SipPeer.get(function(err,sipPeer){
+  // List application associated with this peer
+  sipPeer.listApplication(callback);
+
+  // Associate an application with this peer
+  var appId = "my-application-id";
+  sipPeer.editApplication({httpMessagingV2AppId: appId}, callback);
+
+  // Dissociate all applications with this peer
+  sipPeer.removeApplication(callback);
+```
+
+
 ## Sites
 
 ### Create A Site

lib/application.js

@@ -105,7 +105,7 @@ Application.prototype.getSipPeers = function(query, callback){
       return callback(err);
     }
     let sipPeers = res.associatedSipPeers.associatedSipPeer;
-    if(!Array.isArray(sipPeers)){
+    if(!Array.isArray(sipPeers) && sipPeers){
       sipPeers = [sipPeers];
     }
     callback(null,sipPeers);

lib/sipPeer.js

@@ -78,5 +78,38 @@ SipPeer.prototype.moveTns = function(numbers, callback){
   this.client.makeRequest("post", url, {sipPeerTelephoneNumbers: {fullNumber: numbers}}, callback);
 };
 
+SipPeer.prototype.listApplication = function(callback) {
+  var url = this.client.concatAccountPath(SITE_PATH + "/" + this.siteId + "/" + SIP_PEER_PATH + "/" + this.id + "/" + "products" + "/" + "messaging" + "/" + "applicationSettings");
+  this.client.makeRequest("get", url, function (err, results) {
+    if (err) {
+      callback(error);
+    }
+    else {
+      var apps = results.applicationSettings;
+      if (!Array.isArray(apps.httpMessagingV2AppId) && apps.httpMessagingV2AppId) {
+        apps.httpMessagingV2AppId = [apps.httpMessagingV2AppId]
+      }
+      callback(null, apps)
+    }
+  })
+}
+
+SipPeer.prototype.editApplication = function(appData, callback) {
+  var url = this.client.concatAccountPath(SITE_PATH + "/" + this.siteId + "/" + SIP_PEER_PATH + "/" + this.id + "/" + "products" + "/" + "messaging" + "/" + "applicationSettings");
+  const data = {applicationsSettings: appData}
+  this.client.makeRequest("put", url, data, function (err, results) {
+    if (err) {callback(error);}
+    else {
+      var apps = results.applicationSettings;
+      callback(null, apps)
+    }
+  });
+}
+
+SipPeer.prototype.removeApplication = function(callback) {
+  var url = this.client.concatAccountPath(SITE_PATH + "/" + this.siteId + "/" + SIP_PEER_PATH + "/" + this.id + "/" + "products" + "/" + "messaging" + "/" + "applicationSettings");
+  const data = {applicationsSettings: 'REMOVE'}
+  this.client.makeRequest("put", url, data, callback);
+}
 
 module.exports = SipPeer;

test/sipPeer.js

@@ -193,4 +193,52 @@ describe("SipPeer", function(){
       peer.moveTns(data, done);
     });
   });
+  describe("#listApplication", function() {
+    it("should list application", function(done) {
+      var span = helper.nock().get("/accounts/FakeAccountId/sites/1/sippeers/10/products/messaging/applicationSettings").reply(200, helper.xml.peerApplications, {"Content-Type": "application/xml"});
+      var peer = new SipPeer();
+      peer.id = 10;
+      peer.siteId = 1;
+      peer.client = helper.createClient();
+      peer.listApplication(function(err, results) {
+        if (err) {
+          done(err);
+        } else {
+          results.httpMessagingV2AppId[0].should.equal(100)
+          done();
+        }
+      });
+    });
+  });
+  describe("#editApplication", function() {
+    it("should edit the application", function(done) {
+      var appData = {httpMessagingV2AppId: 100}
+      var span = helper.nock().put("/accounts/FakeAccountId/sites/1/sippeers/10/products/messaging/applicationSettings", helper.buildXml({applicationsSettings: appData})).reply(200, helper.xml.peerApplications, {"Content-Type": "application/xml"});
+      var peer = new SipPeer();
+      peer.id = 10;
+      peer.siteId = 1;
+      peer.client = helper.createClient();
+      var appData = {httpMessagingV2AppId: 100}
+      peer.editApplication(appData, function(err, results) {
+        if (err) {
+          done(err);
+        } else {
+          results.httpMessagingV2AppId.should.equal(100)
+          done();
+        }
+      });
+    });
+  });
+  describe("#removeApplication", function() {
+    it("should remove application", function(done) {
+      var appData = 'REMOVE';
+      var span = helper.nock().put("/accounts/FakeAccountId/sites/1/sippeers/10/products/messaging/applicationSettings", helper.buildXml({applicationsSettings: appData})).reply(200, helper.xml.peerApplications, {"Content-Type": "application/xml"});
+      var peer = new SipPeer();
+      peer.id = 10;
+      peer.siteId = 1;
+      peer.client = helper.createClient();
+      peer.removeApplication(done);
+    });
+  });
+
 });

test/xml.json

@@ -1,5 +1,6 @@
 {
   "geocode": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><GeocodeRequestResponse><GeocodedAddress><AddressLine1>1 Street Name</AddressLine1><HouseNumber>1</HouseNumber><StreetName>Street</StreetName><StreetSuffix>Name</StreetSuffix><City>City</City><StateCode>State</StateCode><Zip>ZipCode</Zip><PlusFour>1234</PlusFour><Country>US</Country></GeocodedAddress></GeocodeRequestResponse>",
+  "peerApplications": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ApplicationSettingsResponse><ApplicationSettings><HttpMessagingV2AppId>100</HttpMessagingV2AppId></ApplicationSettings></ApplicationSettingsResponse>",
   "application": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ApplicationProvisioningResponse><Application><ApplicationId>1</ApplicationId><ServiceType>Messaging-V2</ServiceType><AppName>Test Application</AppName><MsgCallbackUrl>http://a.com</MsgCallbackUrl></Application></ApplicationProvisioningResponse>",
   "voiceApplication": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ApplicationProvisioningResponse><Application><ApplicationId>2</ApplicationId><AppName>Test Application 2</AppName><ServiceType>Voice-V2</ServiceType><CallInitiatedCallbackUrl>http://b.com</CallInitiatedCallbackUrl></Application></ApplicationProvisioningResponse>",
   "applications": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><ApplicationProvisioningResponse><ApplicationList><Application><ApplicationId>1</ApplicationId><ServiceType>Messaging-V2</ServiceType><AppName>Test Application</AppName><MsgCallbackUrl>http://a.com</MsgCallbackUrl></Application><Application><ApplicationId>2</ApplicationId><AppName>Test Application 2</AppName><ServiceType>Voice-V2</ServiceType><CallInitiatedCallbackUrl>http://b.com</CallInitiatedCallbackUrl></Application></ApplicationList></ApplicationProvisioningResponse>",