Merge pull request #134 from Lemoncode/bug/fix-duplicated-room

refactor get initial content when establish connection

Author: nasdan

back/src/pods/messages/messages.consts.ts

@@ -4,17 +4,13 @@ export const InputMessageTypes = {
   TRAINER_APPEND_TEXT: 'TRAINER_APPEND_TEXT',
   TRAINER_SET_FULL_TEXT: 'TRAINER_SET_FULL_TEXT',
   TRAINER_SAVE_CONTENT: 'TRAINER_SAVE_CONTENT',
-  TRAINER_REQUEST_FULL_CONTENT: 'TRAINER_REQUEST_FULL_CONTENT',
-  STUDENT_REQUEST_FULL_CONTENT: 'STUDENT_REQUEST_FULL_CONTENT',
 };
 
 export const OutputMessageTypes = {
   CONNECTION_ESTABLISHED_TRAINER: 'CONNECTION_ESTABLISHED_TRAINER',
   CONNECTION_ESTABLISHED_STUDENT: 'CONNECTION_ESTABLISHED_STUDENT',
   ERROR_MULTI_TRAINER_NOT_IMPLEMENTED_YET: 'ERROR_MULTI_TRAINER_NOT_IMPLEMENTED_YET',
   APPEND_TEXT: 'APPEND_TEXT',
-  TRAINER_SEND_FULL_CONTENT: 'TRAINER_SEND_FULL_CONTENT',
-  STUDENT_SEND_FULL_CONTENT: 'STUDENT_SEND_FULL_CONTENT',
   UPDATE_FULL_CONTENT: 'UPDATE_FULL_CONTENT',
 };
 

back/src/pods/messages/processors/input-processor.ts

@@ -41,12 +41,6 @@ export const processInputMessage = async (
         InputMessageTypes.TRAINER_SET_FULL_TEXT
       );
       break;
-    case InputMessageTypes.STUDENT_REQUEST_FULL_CONTENT:
-      outputActionCollection = await handleRequestGetStudentContent();
-      break;
-    case InputMessageTypes.TRAINER_REQUEST_FULL_CONTENT:
-      outputActionCollection = await handleRequestGetTrainerContent();
-      break;
     default:
       break;
   }
@@ -135,11 +129,3 @@ const handleTrainerSendText = async (
       return [];
   }
 };
-
-const handleRequestGetStudentContent = async (): Promise<Action[]> => {
-  return [{ type: OutputMessageTypes.STUDENT_SEND_FULL_CONTENT }];
-};
-
-const handleRequestGetTrainerContent = async (): Promise<Action[]> => {
-  return [{ type: OutputMessageTypes.TRAINER_SEND_FULL_CONTENT }];
-};

back/src/pods/messages/processors/output-processor.ts

@@ -35,12 +35,6 @@ export const processOuputMessage = async (
     case OutputMessageTypes.UPDATE_FULL_CONTENT:
       await handleUpdateFullContent(socketInfo);
       break;
-    case OutputMessageTypes.STUDENT_SEND_FULL_CONTENT:
-      await handleSingleStudentSendFullContent(socketInfo);
-      break;
-    case OutputMessageTypes.TRAINER_SEND_FULL_CONTENT:
-      await handleTrainerSendFullContent(socketInfo);
-      break;
     default:
       break;
   }
@@ -49,23 +43,21 @@ export const processOuputMessage = async (
 const handleNotifyConnectionEstablishedTrainer = async (
   socketInfo: SocketInfo
 ) => {
-  const room = await sessionRepository.getRoomFromConnectionId(
-    socketInfo.connectionId
+  await handleSendFullContent(
+    socketInfo,
+    responseType.TRAINER_GET_FULL_CONTENT,
+    false
   );
-  const response: ResponseBase = { type: responseType.CONNECTION_ACK };
-  socketInfo.socket.in(room).emit(SocketOuputMessageLiteral.MESSAGE, response);
 };
 
 const handleNotifyConnectionEstablishedStudent = async (
   socketInfo: SocketInfo
 ) => {
-  const room = await sessionRepository.getRoomFromConnectionId(
-    socketInfo.connectionId
+  await handleSendFullContent(
+    socketInfo,
+    responseType.STUDENT_GET_FULL_CONTENT,
+    false
   );
-  const response: ResponseBase = {
-    type: responseType.CONNECTION_ACK,
-  };
-  socketInfo.socket.in(room).emit(SocketOuputMessageLiteral.MESSAGE, response);
 };
 
 const handleAppendText = async (socketInfo: SocketInfo, text: string) => {
@@ -86,22 +78,6 @@ const handleUpdateFullContent = async (socketInfo: SocketInfo) => {
   );
 };
 
-const handleSingleStudentSendFullContent = async (socketInfo: SocketInfo) => {
-  await handleSendFullContent(
-    socketInfo,
-    responseType.STUDENT_GET_FULL_CONTENT,
-    false
-  );
-};
-
-const handleTrainerSendFullContent = async (socketInfo: SocketInfo) => {
-  await handleSendFullContent(
-    socketInfo,
-    responseType.TRAINER_GET_FULL_CONTENT,
-    false
-  );
-};
-
 const handleSendFullContent = async (
   socketInfo: SocketInfo,
   responseType: string,

front/src/common-app/index.ts

@@ -1,3 +1,2 @@
-export * from './session-content';
 export * from './components/appbar';
 export * from './components/footer';

front/src/common-app/session-content.ts

@@ -8,8 +8,6 @@ export const SocketOuputMessageLiteral = {
 export const SocketEmitMessageTypes = {
   TRAINER_APPEND_TEXT: 'TRAINER_APPEND_TEXT', // Trainer add new text
   TRAINER_SET_FULL_TEXT: 'TRAINER_SET_FULL_TEXT', // Trainer send full session text
-  TRAINER_REQUEST_FULL_CONTENT: 'TRAINER_REQUEST_FULL_CONTENT', // Trainer checks if there's previous session content when connecting
-  STUDENT_REQUEST_FULL_CONTENT: 'STUDENT_REQUEST_FULL_CONTENT', // Student checks if there's previous session content when connecting
 };
 
 export const SocketReceiveMessageTypes = {

front/src/core/const.ts

@@ -7,7 +7,6 @@ import {
 } from 'core';
 import { useLog } from 'core';
 import { StudentComponent } from './student.component';
-import { getPreviousSessionContent } from 'common-app';
 import { useParams } from 'react-router-dom';
 
 interface Params {
@@ -42,10 +41,6 @@ export const StudentContainer = () => {
         }
       }
     });
-    getPreviousSessionContent(
-      socket,
-      SocketEmitMessageTypes.STUDENT_REQUEST_FULL_CONTENT
-    );
   };
 
   React.useEffect(() => {

front/src/pods/student/student.container.tsx

@@ -11,7 +11,6 @@ import {
 import { useLog } from 'core';
 import { TrainerComponent } from './trainer.component';
 import { useWithRef, getHostBaseUrl } from 'common';
-import { getPreviousSessionContent } from 'common-app';
 
 interface Params {
   token: string;
@@ -46,10 +45,6 @@ export const TrainerContainer = () => {
         }
       }
     });
-    getPreviousSessionContent(
-      socket,
-      SocketEmitMessageTypes.TRAINER_REQUEST_FULL_CONTENT
-    );
   };
 
   React.useEffect(() => {