Merge pull request #7 from Nazar910/bugfix

Bugfix

Author: Igor Drobiazko

lib/triggers/contacts.js

@@ -4,6 +4,7 @@ const messages = require('elasticio-node').messages;
 const co = require('co');
 const MicrosoftGraph = require('msgraph-sdk-javascript');
 const rp = require('request-promise');
+const _ = require('lodash');
 
 /**
  * This method will be called from elastic.io platform providing following data
@@ -56,10 +57,11 @@ function processAction(msg, cfg, snapshot) {
         const values = contacts.value;
         console.log('Found %s contacts', values.length);
         if (values.length > 0) {
-            const message = messages.newMessageWithBody({
-                contacts: values
+            values.forEach((elem)=> {
+                const messageBody = _.omitBy(elem, (value, key) => key.startsWith('@odata.'));
+                messageBody.calendarId = cfg.calendarId;
+                this.emit('data', messages.newMessageWithBody(messageBody));
             });
-            this.emit('data', message);
             let lmdate = new Date(values[values.length - 1].lastModifiedDateTime);
             // The output value has always 0 milliseconds
             // we need to set the milliseconds value to 999 in order not to see

spec/data/getContact_test.out.json

@@ -0,0 +1,84 @@
+[
+  {
+    "@odata.etag": "W/\"EQAAABYAAAAPk/xXi/m8SpOJXtHI8EVyAAAAADMd\"",
+    "otherAddress": {},
+    "businessAddress": {},
+    "homeAddress": {},
+    "emailAddresses": [],
+    "children": [],
+    "personalNotes": null,
+    "spouseName": null,
+    "businessPhones": [],
+    "mobilePhone": null,
+    "homePhones": [],
+    "manager": null,
+    "assistantName": null,
+    "businessHomePage": null,
+    "profession": null,
+    "officeLocation": null,
+    "department": null,
+    "companyName": null,
+    "jobTitle": null,
+    "imAddresses": [],
+    "generation": null,
+    "yomiCompanyName": null,
+    "yomiSurname": null,
+    "yomiGivenName": null,
+    "title": null,
+    "surname": "LastName",
+    "nickName": null,
+    "middleName": null,
+    "initials": null,
+    "givenName": "Contact1",
+    "displayName": "Contact1 LastName",
+    "fileAs": "LastName, Contact1",
+    "birthday": null,
+    "parentFolderId": "AQMkADAwATMwMAItY2ZmADktNjM4OAAtMDACLTAwCgAuAAADsOSavd0-LEaQVsombMCNegEAO2Hd7H7x9USxohZwL5iAFQAAAgEOAAAA",
+    "categories": [],
+    "changeKey": "EQAAABYAAAA7Yd3sfvH1RLGiFnAvmIAVAACGnyqI",
+    "lastModifiedDateTime": "2017-03-13T14:27:23Z",
+    "createdDateTime": "2017-03-13T14:17:05Z",
+    "id": "AQMkADAwATMwMAItY2ZmADktNjM4OAAtMDACLTAwCgBGAAADsOSavd0-LEaQVsombMCNegcAO2Hd7H7x9USxohZwL5iAFQAAAgEOAAAAO2Hd7H7x9USxohZwL5iAFQAAAIaR-vMAAAA="
+  },
+  {
+    "@odata.etag": "W/\"EQAAABYAAAAPk/xXi/m8SpOJXtHI8EVyAAAAADMe\"",
+    "otherAddress": {},
+    "businessAddress": {},
+    "homeAddress": {},
+    "emailAddresses": [],
+    "children": [],
+    "personalNotes": null,
+    "spouseName": null,
+    "businessPhones": [],
+    "mobilePhone": null,
+    "homePhones": [],
+    "manager": null,
+    "assistantName": null,
+    "businessHomePage": null,
+    "profession": null,
+    "officeLocation": null,
+    "department": null,
+    "companyName": null,
+    "jobTitle": null,
+    "imAddresses": [],
+    "generation": null,
+    "yomiCompanyName": null,
+    "yomiSurname": null,
+    "yomiGivenName": null,
+    "title": null,
+    "surname": "LastName2",
+    "nickName": null,
+    "middleName": null,
+    "initials": null,
+    "givenName": "contact2",
+    "displayName": "contact2 LastName2",
+    "fileAs": "LastName2, contact2",
+    "birthday": null,
+    "parentFolderId": "AQMkADAwATMwMAItY2ZmADktNjM4OAAtMDACLTAwCgAuAAADsOSavd0-LEaQVsombMCNegEAO2Hd7H7x9USxohZwL5iAFQAAAgEOAAAA",
+    "categories": [],
+    "changeKey": "EQAAABYAAAA7Yd3sfvH1RLGiFnAvmIAVAACGnyqK",
+    "lastModifiedDateTime": "2017-03-13T15:22:32Z",
+    "createdDateTime": "2017-03-13T15:16:17Z",
+    "id": "AQMkADAwATMwMAItY2ZmADktNjM4OAAtMDACLTAwCgBGAAADsOSavd0-LEaQVsombMCNegcAO2Hd7H7x9USxohZwL5iAFQAAAgEOAAAAO2Hd7H7x9USxohZwL5iAFQAAAIaR-vQAAAA="
+  }
+]

spec/triggers/getContacts.spec.js

@@ -0,0 +1,69 @@
+'use strict';
+
+describe('Outlook Contacts', function test() {
+
+    const nock = require('nock');
+    const _ = require('lodash');
+    const trigger = require('../../lib/triggers/contacts');
+
+    const cfg = require('../data/configuration.in.json');
+    const jsonOut = {
+        value: require('../data/getContact_test.out.json')
+    };
+
+    const refreshTokenUri = 'https://login.microsoftonline.com';
+    const refreshTokenApi = '/common/oauth2/v2.0/token';
+    const microsoftGraphUri = 'https://graph.microsoft.com/v1.0';
+    const microsoftGraphApi = '/me/contacts';
+
+
+    var self;
+    beforeEach(function createSpy() {
+        self = jasmine.createSpyObj('self', ['emit']);
+    });
+
+    it('should emit data without @oauth property - case: http 200', done => {
+        const scope1 = nock(refreshTokenUri).post(refreshTokenApi)
+                                        .reply(200, {
+                                            access_token: 1
+                                        });
+
+        const scope2 = nock(microsoftGraphUri).get(microsoftGraphApi)
+                                          .query({
+                                              $orderby: 'lastModifiedDateTime asc',
+                                              $top: 900,
+                                              $filter: 'lastModifiedDateTime gt 1970-01-01T00:00:00.000Z'
+                                          })
+                                          .reply(200, jsonOut);
+
+        function checkResults() {
+            let calls = self.emit.calls;
+            expect(calls.count()).toEqual(4);
+            expect(calls.argsFor(0)[0]).toEqual('updateKeys');
+            const [firstEvent, firstEmitData] = calls.argsFor(1);
+            expect(firstEvent).toBe('data');
+            expect(firstEmitData.body).toEqual(Object.assign(
+              _.omit(jsonOut.value[0], '@odata.etag'),
+                {
+                    calendarId: cfg.calendarId
+                }
+            ));
+            const [secondEvent, secondEmitData] = calls.argsFor(2);
+            expect(secondEvent).toBe('data');
+            expect(secondEmitData.body).toEqual(Object.assign(
+              _.omit(jsonOut.value[1], '@odata.etag'),
+                {
+                    calendarId: cfg.calendarId
+                }
+            ));
+            expect(scope1.isDone()).toBeTruthy();
+            expect(scope2.isDone()).toBeTruthy();
+        }
+
+        trigger.process.call(self, {}, cfg, {})
+        .then(checkResults)
+        .then(done)
+        .catch(done.fail);
+    });
+
+});