Some minors changes

Author: MiguelAngelRL

back/package.json

@@ -4,14 +4,13 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "run-p -l type-check:watch start:dev",
+    "start": "run-p -l type-check:watch start:dev start:local-db",
+    "start:mock": "cross-env MOCK_REPOSITORY=true run-p -l type-check:watch start:dev",
     "start:dev": "nodemon --exec babel-node --extensions \".ts\" src/index.ts",
     "start:debug": "run-p -l type-check:watch \"start:dev -- --inspect-brk\"",
     "start:prod": "node ./dist/index.js",
-    "start:mock": "cross-env MOCK_REPOSITORY=true npm run start",
-    "start:localdb": "cross-env run-p -l start start:docker-db",
-    "start:docker-db": "docker-compose up || echo \"Run docker-compose up manually\"",
-    "stop:docker-db": "docker-compose down || echo \"Run docker-compose down manually\"",
+    "start:local-db": "docker-compose up || echo \"Run docker-compose up manually\"",
+    "stop:local-db": "docker-compose down || echo \"Run docker-compose down manually\"",
     "build": "run-p -l type-check build:prod",
     "build:prod": "npm run clean && babel src -d dist --ignore=\"./src/test-runners\" --extensions \".ts\"",
     "build:dev": "npm run clean && babel src -d dist --ignore=\"./src/test-runners\" --extensions \".ts\" --source-maps",

back/src/app.ts

@@ -1,16 +1,10 @@
-import { createApp } from './express.server';
-import { envConstants } from 'core';
-import { api } from './api';
 import cors from 'cors';
 import SocketIOClient, { Socket } from 'socket.io';
-import {
-  processInputMessage,
-  InputMessageTypes,
-  processOutputMessageCollection,
-  Action,
-  SocketInfo,
-} from './messages';
-import { connectToDB } from 'core';
+
+import { createApp } from './express.server';
+import { envConstants, connectToDB } from 'core';
+import { api } from './api';
+import { processInputMessage, InputMessageTypes, processOutputMessageCollection, Action, SocketInfo } from './messages';
 
 const app = createApp();
 

back/src/core/servers/cors.ts

@@ -1,4 +1,4 @@
-import { envConstants } from '../constants';
+import { envConstants } from 'core';
 import cors from 'cors';
 
 const options: cors.CorsOptions = {

back/src/dals/session/repository/index.ts

@@ -1,6 +1,5 @@
 import { envConstants } from 'core/constants';
 import * as mockRepository from './session.mock';
-//TODO: change to session.db
 import * as repository from './session.repository';
 import { SessionRepository } from './session.contract';
 

back/src/dals/session/repository/session.repository.ts

@@ -1,5 +1,5 @@
 import { InputMessageTypes } from 'messages';
-import {ConnectSessionInfo, RoomInfo, UserSession, UserSessionContext, RoomContext} from 'dals'
+import {RoomInfo, UserSession, UserSessionContext, RoomContext} from 'dals'
 
 export const isRoomAvailable = async (room: string): Promise<boolean> => {
   const roomAvailable = !(await RoomContext.exists({ room }));
@@ -65,10 +65,9 @@ export const isTrainerUser = async (connectionId: string): Promise<boolean> => {
 
 export const isExistingConnection = async (connectionId: string): Promise<boolean> => {
   const session: UserSession = await getSessionFromConnectionId(connectionId);
-  return session ? true : false;
+  return Boolean(session);
 }
 
 const getSessionFromConnectionId = async (connectionId: string): Promise<UserSession> => {
-  return (await UserSessionContext.findOne({connectionId: connectionId}));
-};
-
+  return (await UserSessionContext.findOne({connectionId: connectionId}).lean());
+};

back/src/messages/input-processor.ts

@@ -100,7 +100,7 @@ const handleEstablishConnectionTrainer = async (socketInfo: SocketInfo, room: st
     saveRoomInfo({room, content:""}, "");
   }
 
-  if (await isRoomAvailable(room) || !(await isExistingConnection(socketInfo.connectionId))) {
+  if (roomAvailable || !(await isExistingConnection(socketInfo.connectionId))) {
     await addNewUser({ connectionId: socketInfo.connectionId, room, trainerToken, isTrainer: !!trainerToken });
     socketInfo.socket.join(room);
   }