fix(FEC-9247): add userId to kava reports

flow-typed/types/kava-config.js

@@ -25,6 +25,7 @@
  */
 type _KavaConfigObject = {
   serviceUrl?: string,
+  tamperAnalyticsHandler?: Function,
   viewEventCountdown?: number,
   resetSessionCountdown?: number,
   dvrThreshold?: number,
@@ -33,7 +34,7 @@ type _KavaConfigObject = {
   customVar3?: Object,
   applicationVersion?: string,
   playbackContext?: string,
-  tamperAnalyticsHandler?: Function
+  userId?: string
 };
 
 /**

src/kava-event-model.js

@@ -306,6 +306,9 @@ export function getEventModel(eventObj: KavaEvent, model: KavaModel): Object {
   if (model.getApplicationVersion()) {
     commonModel.applicationVersion = model.getApplicationVersion();
   }
+  if (model.getUserId()) {
+    commonModel.userId = model.getUserId();
+  }
   const eventModel = eventObj.getEventModel(model);
   return Object.assign(eventModel, commonModel);
 }

src/kava-model.js

@@ -52,6 +52,7 @@ class KavaModel {
   getPlaybackType: Function;
   getPlaybackContext: Function;
   getApplicationVersion: Function;
+  getUserId: Function;
   getCanPlayTime: Function;
 
   constructor(model?: Object) {

src/kava.js

@@ -678,6 +678,7 @@ class Kava extends BasePlugin {
     this._model.getPlaybackType = () => this._getPlaybackType();
     this._model.getPlaybackContext = () => this.config.playbackContext;
     this._model.getApplicationVersion = () => this.config.applicationVersion;
+    this._model.getUserId = () => this.config.userId;
   }
 
   _getPosition(): number {

test/src/kava-model.spec.js

@@ -28,7 +28,8 @@ const ab = 3,
   jt = 1213,
   tp = '12',
   pc = 'pc',
-  av = 'av';
+  av = 'av',
+  usi = '1234';
 
 describe('KavaModel', () => {
   let model;
@@ -79,6 +80,7 @@ describe('KavaModel', () => {
     model.getPlaybackType = () => pback;
     model.getPlaybackContext = () => pc;
     model.getApplicationVersion = () => av;
+    model.getUserId = () => usi;
   });
 
   it('should update the model', function() {
@@ -111,7 +113,8 @@ describe('KavaModel', () => {
       sessionStartTime: sst,
       customVar2: cv2,
       playbackContext: pc,
-      applicationVersion: av
+      applicationVersion: av,
+      userId: usi
     });
   });
 });

test/src/kava.spec.js

@@ -108,7 +108,8 @@ describe('KavaPlugin', function() {
           playlistId: '12345678',
           entryType: 'Vod',
           sessionId: 'c15be273-0f1b-10a3-4fc9-d7a53eebee85:b66abd37-e2e2-a22e-86ac-7859592e754b',
-          ks: 'Njk0ZmI4MzBiOTJiMGZhN2NmNTAwYWQyZGM2M2Y0YjkxMGRiZGI3MXwxMDkxOzEwOTE7MTUxNzkyMjgxMzswOzE1MTc4MzY0MTMuMTM4OzA7dmlldzoqLHdpZGdldDoxOzs='
+          ks: 'Njk0ZmI4MzBiOTJiMGZhN2NmNTAwYWQyZGM2M2Y0YjkxMGRiZGI3MXwxMDkxOzEwOTE7MTUxNzkyMjgxMzswOzE1MTc4MzY0MTMuMTM4OzA7dmlldzoqLHdpZGdldDoxOzs=',
+          userId: '1234'
         }
       },
       session: {
@@ -148,6 +149,7 @@ describe('KavaPlugin', function() {
       params.clientVer.should.equal(config.plugins.kava.playerVersion);
       params.clientTag.should.equal('html5:v' + config.plugins.kava.playerVersion);
       params.position.should.exist;
+      params.userId.should.equal(config.plugins.kava.userId);
     }
 
     it('should send IMPRESSION event', done => {
@@ -480,40 +482,45 @@ describe('KavaPlugin', function() {
       sandbox.stub(window.navigator.connection, 'effectiveType').value('2g');
 
       sandbox.stub(OVPAnalyticsService, 'trackEvent').callsFake((serviceUrl, params) => {
-        if (params.eventType === KavaEventModel.VIEW.index) {
-          validateCommonParams(params, KavaEventModel.VIEW.index);
-          params.should.have.all.keys(
-            'audioLanguage',
-            'bufferTime',
-            'bufferTimeSum',
-            'actualBitrate',
-            'averageBitrate',
-            'captionsLanguage',
-            'clientTag',
-            'clientVer',
-            'deliveryType',
-            'droppedFramesRatio',
-            'entryId',
-            'eventIndex',
-            'eventType',
-            'ks',
-            'partnerId',
-            'playTimeSum',
-            'playbackType',
-            'playlistId',
-            'position',
-            'referrer',
-            'sessionId',
-            'soundMode',
-            'tabMode',
-            'networkConnectionType'
-          );
-          params.networkConnectionType.should.equal('2g');
-          params.tabMode.should.equal(TabMode.TAB_FOCUSED);
-          params.soundMode.should.equal(SoundMode.SOUND_ON);
-          done();
+        try {
+          if (params.eventType === KavaEventModel.VIEW.index) {
+            validateCommonParams(params, KavaEventModel.VIEW.index);
+            params.should.have.all.keys(
+              'audioLanguage',
+              'bufferTime',
+              'bufferTimeSum',
+              'actualBitrate',
+              'averageBitrate',
+              'captionsLanguage',
+              'clientTag',
+              'clientVer',
+              'deliveryType',
+              'droppedFramesRatio',
+              'entryId',
+              'eventIndex',
+              'eventType',
+              'ks',
+              'partnerId',
+              'playTimeSum',
+              'playbackType',
+              'playlistId',
+              'position',
+              'referrer',
+              'sessionId',
+              'soundMode',
+              'tabMode',
+              'networkConnectionType',
+              'userId'
+            );
+            params.networkConnectionType.should.equal('2g');
+            params.tabMode.should.equal(TabMode.TAB_FOCUSED);
+            params.soundMode.should.equal(SoundMode.SOUND_ON);
+            done();
+          }
+          return new RequestBuilder();
+        } catch (err) {
+          done(err);
         }
-        return new RequestBuilder();
       });
       setupPlayer(config);
       player.play();