fix(RoomsAdapter): fix return of getActivitiesInRealTime

webex · Mar 16, 2022 · fb7ba4a · fb7ba4a
1 parent f17ca37
commit fb7ba4a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 28 deletions.
diff --git a/src/ActivitiesSDKAdapter.js b/src/ActivitiesSDKAdapter.js
@@ -54,7 +54,7 @@ function parseSDKAttachments(sdkActivity) {
  * @param {object} sdkActivity  SDK activity object
  * @returns {Activity} Adapter activity object
  */
-function fromSDKActivity(sdkActivity) {
+export function fromSDKActivity(sdkActivity) {
   return {
     ID: sdkActivity.id ? constructHydraId('message', sdkActivity.id) : sdkActivity.ID,
     roomID: sdkActivity.target ? constructHydraId('room', sdkActivity.target.id) : sdkActivity.roomID,

diff --git a/src/RoomsSDKAdapter.js b/src/RoomsSDKAdapter.js
@@ -3,9 +3,9 @@ import {
   concat,
   from,
   fromEvent,
-  BehaviorSubject,
   Observable,
   throwError,
+  ReplaySubject,
 } from 'rxjs';
 import {
   filter,
@@ -17,6 +17,7 @@ import {
 } from 'rxjs/operators';
 import {RoomsAdapter} from '@webex/component-adapter-interfaces';
 import {deconstructHydraId} from '@webex/common';
+import {fromSDKActivity} from './ActivitiesSDKAdapter';
 import logger from './logger';
 
 // TODO: Figure out how to import JS Doc definitions and remove duplication.
@@ -294,26 +295,24 @@ export default class RoomsSDKAdapter extends RoomsAdapter {
    */
   getActivitiesInRealTime(ID) {
     logger.debug('ROOM', ID, 'getActivitiesInRealTime()', ['called with', {ID}]);
+
+    if (!ID) {
+      logger.error('ROOM', ID, 'getPastActivities()', ['Must provide room ID']);
+
+      return throwError(new Error('getPastActivities - Must provide room ID'));
+    }
+
     if (!(ID in this.getActivitiesInRealTimeCache)) {
-      const getActivitiesInRealTime$ = new BehaviorSubject({});
+      const getActivitiesInRealTime$ = new ReplaySubject();
 
-      this.datasource.internal.mercury.on('event:conversation.activity', (sdkActivity) => {
+      this.datasource.internal.mercury.on('event:conversation.activity', ({data}) => {
+        const {activity} = data;
         const {id: UUID} = deconstructHydraId(ID);
 
-        if (sdkActivity.target && sdkActivity.target.id === UUID) {
-          logger.debug('ROOM', ID, 'getActivitiesInRealTime()', ['received "event:conversation.activity" event', {sdkActivity}]);
-
-          const activity = {
-            ID: sdkActivity.id,
-            roomID: sdkActivity.target.id,
-            content: sdkActivity.object,
-            contentType: sdkActivity.object.objectType,
-            personID: sdkActivity.actor.id,
-            displayAuthor: false,
-            created: sdkActivity.published,
-          };
+        if (activity.target && activity.target.id === UUID) {
+          logger.debug('ROOM', ID, 'getActivitiesInRealTime()', ['received "event:conversation.activity" event', {activity}]);
 
-          getActivitiesInRealTime$.next(activity);
+          getActivitiesInRealTime$.next(fromSDKActivity(activity).ID);
 
           logger.info('ROOM', ID, 'getActivitiesInRealTime()', ['emitting activity object', {activity}]);
         }

diff --git a/src/RoomsSDKAdapter.test.js b/src/RoomsSDKAdapter.test.js
@@ -3,6 +3,7 @@ import {isObservable} from 'rxjs';
 import RoomsSDKAdapter from './RoomsSDKAdapter';
 import mockActivities from './mockActivities';
 import createMockSDK, {mockSDKActivity, mockSDKRoom} from './mockSdk';
+import {fromSDKActivity} from './ActivitiesSDKAdapter';
 
 describe('Rooms SDK Adapter', () => {
   let mockSDK;
@@ -12,6 +13,9 @@ describe('Rooms SDK Adapter', () => {
   beforeEach(() => {
     mockSDK = createMockSDK();
     mockSDK.internal.conversation.list = jest.fn(() => Promise.resolve([]));
+    mockSDK.internal.mercury.on = jest.fn((event, callback) => callback({
+      data: {activity: mockSDKActivity},
+    }));
     roomsSDKAdapter = new RoomsSDKAdapter(mockSDK);
   });
 
@@ -68,18 +72,8 @@ describe('Rooms SDK Adapter', () => {
     });
 
     test('returns a activity in a proper shape', (done) => {
-      mockSDK.internal.mercury.on = jest.fn((event, callback) => callback(mockSDKActivity));
-
       roomsSDKAdapter.getActivitiesInRealTime(mockSDKActivity.target.id).subscribe((activity) => {
-        expect(activity).toEqual({
-          ID: mockSDKActivity.id,
-          roomID: mockSDKActivity.target.id,
-          content: mockSDKActivity.object,
-          contentType: mockSDKActivity.object.objectType,
-          personID: mockSDKActivity.actor.id,
-          displayAuthor: false,
-          created: mockSDKActivity.published,
-        });
+        expect(activity).toEqual(fromSDKActivity(mockSDKActivity).ID);
         done();
       });
     });