#58 edge case where multiple users joins "quasi simultaneously"...

Zuehlke · Jun 21, 2020 · 1d98ace · 1d98ace
1 parent 2a1a3a6
commit 1d98ace
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/client/app/services/clientActionReducer.js b/client/app/services/clientActionReducer.js
@@ -32,6 +32,18 @@ export default function clientActionReducer(state, action) {
         ...state.pendingCommands,
         [action.command.id]: action.command
       };
+
+      if (action.command.name === 'joinRoom') {
+        // special case, we need to remember that we are joining / waiting for "joinedRoom"
+        // if first-time user, we don't have a userId. we need to know, if it is "us" that joins...
+
+        return {
+          ...state,
+          pendingCommands: modifiedPendingCommands,
+          pendingJoinCommandId: action.command.id
+        };
+      }
+
       return {...state, pendingCommands: modifiedPendingCommands};
     }
     case EVENT_RECEIVED: {

diff --git a/client/app/services/eventReducer.js b/client/app/services/eventReducer.js
@@ -102,20 +102,9 @@ const eventActionHandlers = {
    */
   [EVENT_ACTION_TYPES.joinedRoom]: {
     fn: (state, payload, event) => {
-      if (state.userId) {
-        // if our client state has already a userId set, this event indicates that someone else joined
-        const modifiedUsers = {...state.users};
-        modifiedUsers[event.userId] = payload.users[event.userId];
-        return {
-          ...state,
-          users: modifiedUsers
-        };
-      } else {
+      if (state.pendingJoinCommandId && state.pendingJoinCommandId === event.correlationId) {
         // you joined
 
-        // set the page title
-        document.title = `PoinZ - ${event.roomId}`;
-
         clientSettingsStore.setPresetUserId(event.userId);
 
         // server sends current room state (users, stories, etc.)
@@ -125,7 +114,16 @@ const eventActionHandlers = {
           userId: event.userId,
           selectedStory: payload.selectedStory,
           users: payload.users || {},
-          stories: payload.stories || {}
+          stories: payload.stories || {},
+          pendingJoinCommand: undefined
+        };
+      } else {
+        // if our client state has already a userId set, this event indicates that someone else joined
+        const modifiedUsers = {...state.users};
+        modifiedUsers[event.userId] = payload.users[event.userId];
+        return {
+          ...state,
+          users: modifiedUsers
         };
       }
     },
@@ -147,7 +145,6 @@ const eventActionHandlers = {
     fn: (state, payload, event) => {
       // If your user (in this or in another browser) left the room
       if (state.userId === event.userId) {
-        document.title = 'PoinZ';
         return {...initialState()};
       }
 

diff --git a/client/app/store/clientSettingsStore.js b/client/app/store/clientSettingsStore.js
@@ -36,8 +36,8 @@ function getPresetUserId() {
   return getItem('presetUserId');
 }
 
-function setPresetUserId(username) {
-  setItem('presetUserId', username);
+function setPresetUserId(userId) {
+  setItem('presetUserId', userId);
 }
 
 function getHideNewUserHints() {

diff --git a/client/test/unit/eventActionReducersScenarios/roomJoiningAndLeavingTest.js b/client/test/unit/eventActionReducersScenarios/roomJoiningAndLeavingTest.js
@@ -7,10 +7,14 @@ import reduceMultipleEventActions from './reduceMultipleEventActions';
 import eventReducer from '../../../app/services/eventReducer';
 
 test('You joining a new room', () => {
-  const startingState = initialState();
+  const cmdId = uuid();
+
+  const startingState = {
+    ...initialState(),
+    pendingJoinCommandId: cmdId
+  };
   let modifiedState;
 
-  const cmdId = uuid();
   const userId = uuid();
   const roomId = uuid();
   const eventActions = [