Refactored to pods and core structure

Author: MiguelAngelRL

back/.vscode/launch.json

@@ -10,7 +10,8 @@
       "runtimeExecutable": null,
       "runtimeArgs": ["--nolazy"],
       "env": {
-        "NODE_ENV": "development"
+        "NODE_ENV": "development",
+        "MOCK_REPOSITORY": "true"
       },
       "console": "internalConsole",
       "sourceMaps": true,

back/src/dals/room/repository/room.contract.ts

@@ -1,8 +1,7 @@
 import { RoomInfo } from 'dals';
 
 export interface RoomRepositoryContract {
-  saveRoomInfo: (newRoomInfo: RoomInfo, action: string)  => Promise<void>;
+  saveRoomInfo: (newRoomInfo: RoomInfo, setFullText: boolean)  => Promise<void>;
   isRoomAvailable: (room: string) => Promise<boolean>;
   getRoomContent:(room: string) => Promise<string>;
 }
-

back/src/dals/room/repository/room.mock.ts

@@ -1,5 +1,4 @@
 import produce from 'immer';
-import { InputMessageTypes } from 'pods/messages';
 import { RoomInfo, UserSession } from 'dals'
 
 let userCollectionSession: UserSession[] = [];
@@ -8,13 +7,13 @@ let roomCollectionSession: RoomInfo[] = [];
 export const isRoomAvailable = async (room: string): Promise<boolean> =>
   !userCollectionSession.find((session) => session.room === room);
 
-export const saveRoomInfo = async (newRoomInfo: RoomInfo, action: string): Promise<void> => {
+export const saveRoomInfo = async (newRoomInfo: RoomInfo, setFullText: boolean): Promise<void> => {
   const roomIndex: number = await getRoomIndexByName(newRoomInfo);
   const content: string = newRoomInfo.content;
-  roomCollectionSession =
+  roomCollectionSession = 
     roomIndex === -1
       ? await insertRoom(newRoomInfo)
-      : await updateRoomContent(roomIndex, content, action);
+      : await updateRoomContent(roomIndex, content, setFullText);
 };
 
 export const getRoomContent = async (room: string): Promise<string> => {
@@ -31,21 +30,23 @@ const getRoomIndexByName = async (newRoomInfo: RoomInfo): Promise<number> => {
   );
 };
 
-const updateRoomContent = async (index: number, content: string, action:string): Promise<RoomInfo[]> => {
-  return produce(roomCollectionSession, (draftState: RoomInfo[]) => {
-    switch (action) {
-      case InputMessageTypes.TRAINER_APPEND_TEXT:
-        draftState[index].content += '\n' + content;
-        break;
-      case InputMessageTypes.TRAINER_SET_FULL_TEXT:
-        draftState[index].content = content;
-        break;
-    };
+const updateRoomContent = async (index: number, content: string, setFullText:boolean): Promise<RoomInfo[]> => {
+  if (!Boolean(content))
+    return roomCollectionSession;
+
+  const newRoomCollectionSession = produce(roomCollectionSession, (draftState: RoomInfo[]) => {
+  	const someCurrentContent: boolean = Boolean(draftState[index].content);
+  	if (someCurrentContent && !setFullText) {
+      draftState[index].content += '\n';
+    }
+    draftState[index].content = setFullText ? content : (draftState[index].content + content);
   });
+
+  return newRoomCollectionSession;
 };
 
 const insertRoom = async (newRoomInfo: RoomInfo): Promise<RoomInfo[]> => {
   return produce(roomCollectionSession, (draftState: RoomInfo[]) => {
     draftState.push(newRoomInfo);
   });
-};
+};

back/src/dals/room/repository/room.repository.ts

@@ -1,13 +1,12 @@
 import { RoomInfo, RoomContext } from 'dals'
-import { InputMessageTypes } from 'pods/messages';
 
 export const isRoomAvailable = async (room: string): Promise<boolean> => {
   const roomAvailable = !(await RoomContext.exists({ room }));
   return roomAvailable;
 }
 
-export const saveRoomInfo = async (newRoomInfo: RoomInfo, action: string): Promise<void> => {
-    await isRoomAvailable(newRoomInfo.room) ? await insertRoom(newRoomInfo) : await updateRoomContent(newRoomInfo, action);
+export const saveRoomInfo = async (newRoomInfo: RoomInfo, setFullText: boolean): Promise<void> => {
+    await isRoomAvailable(newRoomInfo.room) ? await insertRoom(newRoomInfo) : await updateRoomContent(newRoomInfo, setFullText);
 };
 
 export const getRoomContent = async (room: string): Promise<string> => {
@@ -19,29 +18,16 @@ const getRoomByName = async (room: string): Promise<RoomInfo> => {
   return (await RoomContext.findOne({room: room}).lean());
 };
 
-const updateRoomContent = async (newRoomInfo: RoomInfo, action:string): Promise<void> => {
+const updateRoomContent = async (newRoomInfo: RoomInfo, setFullText:boolean): Promise<void> => {
   const room: RoomInfo = await getRoomByName(newRoomInfo.room);
-  
   let newContent = "";
-  
-  if(room) {
-    newContent = room.content;
+  if(room && Boolean(room.content) && !setFullText) {
+    newContent = room.content + '\n';
   }
-  
-  switch (action) {
-    case InputMessageTypes.TRAINER_APPEND_TEXT:
-      newContent += '\n' + newRoomInfo.content;
-      break;
-    case InputMessageTypes.TRAINER_SET_FULL_TEXT:
-      newContent = newRoomInfo.content;
-      break;
-  };
-
+  newContent = setFullText ? newRoomInfo.content : (newContent + newRoomInfo.content);
   await RoomContext.updateOne({room: newRoomInfo.room}, {content: newContent});
-
 };
 
 const insertRoom = async (newRoomInfo: RoomInfo): Promise<void> => {
   await RoomContext.create(newRoomInfo);
 };
-

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

@@ -63,11 +63,13 @@ const handleTrainerSendText = async (socketInfo: SocketInfo, text: string, actio
   }
   const room = await getRoomFromConnectionId(socketInfo.connectionId);
   const roomInfo = { room, content: text };
-  saveRoomInfo(roomInfo, action);
+  
   switch(action){
     case InputMessageTypes.TRAINER_APPEND_TEXT:
+      saveRoomInfo(roomInfo, false);
       return [{ type: OutputMessageTypes.APPEND_TEXT, payload: text }];
     case InputMessageTypes.TRAINER_SET_FULL_TEXT:
+      saveRoomInfo(roomInfo, true);
       return [{ type: OutputMessageTypes.UPDATE_FULL_CONTENT}];
     default:
       return [];
@@ -98,12 +100,12 @@ const handleEstablishConnectionTrainer = async (socketInfo: SocketInfo, room: st
   const roomAvailable: boolean = await isRoomAvailable(room);
 
   if(roomAvailable) {
-    saveRoomInfo({room, content:""}, "");
+    saveRoomInfo({room, content:""}, false);
   }
 
   if (roomAvailable || !(await isExistingConnection(socketInfo.connectionId))) {
     await addNewUser({ connectionId: socketInfo.connectionId, room, trainerToken, isTrainer: !!trainerToken });
     socketInfo.socket.join(room);
   }
   return [{ type: OutputMessageTypes.CONNECTION_ESTABLISHED_TRAINER }];
-};
+};