824 streamline frontend change level network calls

backend/src/controller/levelController.ts

@@ -1,6 +1,7 @@
 import { Response } from 'express';
 
 import { LevelGetRequest } from '@src/models/api/LevelGetRequest';
+import { isValidLevel } from '@src/models/level';
 
 function handleLoadLevel(req: LevelGetRequest, res: Response) {
 	const { level } = req.query;
@@ -10,6 +11,11 @@ function handleLoadLevel(req: LevelGetRequest, res: Response) {
 		return;
 	}
 
+	if (!isValidLevel(level)) {
+		res.status(400).send('Invalid level');
+		return;
+	}
+
 	res.send({
 		emails: req.session.levelState[level].sentEmails,
 		chatHistory: req.session.levelState[level].chatHistory,

backend/src/controller/startController.ts

@@ -1,8 +1,7 @@
 import { Response } from 'express';
 
 import { StartGetRequest } from '@src/models/api/StartGetRequest';
-import { ChatModel } from '@src/models/chat';
-import { LEVEL_NAMES, LevelState } from '@src/models/level';
+import { LEVEL_NAMES, isValidLevel } from '@src/models/level';
 import { getValidOpenAIModels } from '@src/openai';
 import {
 	systemRoleLevel1,
@@ -12,14 +11,6 @@ import {
 
 import { sendErrorResponse } from './handleError';
 
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
-
 function handleStart(req: StartGetRequest, res: Response) {
 	const { level } = req.query;
 
@@ -28,6 +19,11 @@ function handleStart(req: StartGetRequest, res: Response) {
 		return;
 	}
 
+	if (!isValidLevel(level)) {
+		sendErrorResponse(res, 400, 'Invalid level');
+		return;
+	}
+
 	const systemRoles = [
 		{ level: LEVEL_NAMES.LEVEL_1, systemRole: systemRoleLevel1 },
 		{ level: LEVEL_NAMES.LEVEL_2, systemRole: systemRoleLevel2 },

backend/src/models/level.ts

@@ -13,6 +13,10 @@ const LEVEL_NAMES = {
 
 type LEVEL_NAMES = (typeof LEVEL_NAMES)[keyof typeof LEVEL_NAMES];
 
+function isValidLevel(levelValue: unknown) {
+	return Object.values(LEVEL_NAMES).includes(levelValue as LEVEL_NAMES);
+}
+
 interface LevelState {
 	level: LEVEL_NAMES;
 	chatHistory: ChatMessage[];
@@ -32,5 +36,5 @@ function getInitialLevelStates() {
 	);
 }
 
-export { getInitialLevelStates, LEVEL_NAMES };
+export { getInitialLevelStates, LEVEL_NAMES, isValidLevel };
 export type { LevelState };

backend/src/sessionRoutes.ts

@@ -24,16 +24,8 @@ import {
 import { handleResetProgress } from './controller/resetController';
 import { handleStart } from './controller/startController';
 import { handleTest } from './controller/testController';
-import { ChatModel, defaultChatModel } from './models/chat';
-import { LevelState, getInitialLevelStates } from './models/level';
-
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
+import { defaultChatModel } from './models/chat';
+import { getInitialLevelStates } from './models/level';
 
 const sessionSigningSecret = process.env.SESSION_SECRET;
 if (!sessionSigningSecret) {

backend/test/integration/chatController.test.ts

@@ -3,21 +3,12 @@ import { Response } from 'express';
 
 import { handleChatToGPT } from '@src/controller/chatController';
 import { OpenAiChatRequest } from '@src/models/api/OpenAiChatRequest';
-import { ChatModel } from '@src/models/chat';
 import { ChatMessage } from '@src/models/chatMessage';
 import { Defence } from '@src/models/defence';
 import { EmailInfo } from '@src/models/email';
 import { LEVEL_NAMES, LevelState } from '@src/models/level';
 import { systemRoleLevel1 } from '@src/promptTemplates';
 
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
-
 // mock the api call
 const mockCreateChatCompletion =
 	jest.fn<

backend/test/tsconfig.json

@@ -3,5 +3,5 @@
 	"compilerOptions": {
 		"noEmit": true
 	},
-	"include": ["./**/*.ts", "../jest.config.ts"]
+	"include": ["./**/*.ts", "../typings", "../jest.config.ts"]
 }

backend/test/unit/controller/chatController.test.ts

@@ -12,7 +12,6 @@ import { OpenAiChatRequest } from '@src/models/api/OpenAiChatRequest';
 import { OpenAiClearRequest } from '@src/models/api/OpenAiClearRequest';
 import {
 	DefenceReport,
-	ChatModel,
 	ChatResponse,
 	MessageTransformation,
 } from '@src/models/chat';
@@ -26,14 +25,6 @@ import {
 	setSystemRoleInChatHistory,
 } from '@src/utils/chat';
 
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
-
 jest.mock('@src/openai');
 const mockChatGptSendMessage = chatGptSendMessage as jest.MockedFunction<
 	typeof chatGptSendMessage

backend/test/unit/controller/defenceController.test.ts

@@ -4,19 +4,10 @@ import { Response } from 'express';
 import { handleConfigureDefence } from '@src/controller/defenceController';
 import { configureDefence } from '@src/defence';
 import { DefenceConfigureRequest } from '@src/models/api/DefenceConfigureRequest';
-import { ChatModel } from '@src/models/chat';
 import { ChatMessage } from '@src/models/chatMessage';
 import { DEFENCE_ID, Defence } from '@src/models/defence';
 import { EmailInfo } from '@src/models/email';
-import { LEVEL_NAMES, LevelState } from '@src/models/level';
-
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
+import { LEVEL_NAMES } from '@src/models/level';
 
 jest.mock('@src/defence');
 const mockConfigureDefence = configureDefence as jest.MockedFunction<

backend/test/unit/controller/emailController.test.ts

@@ -3,17 +3,7 @@ import { Response } from 'express';
 
 import { handleClearEmails } from '@src/controller/emailController';
 import { EmailClearRequest } from '@src/models/api/EmailClearRequest';
-import { ChatModel } from '@src/models/chat';
 import { EmailInfo } from '@src/models/email';
-import { LevelState } from '@src/models/level';
-
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
 
 function responseMock() {
 	return {

backend/test/unit/controller/levelController.test.ts

@@ -3,6 +3,7 @@ import { Response } from 'express';
 
 import { handleLoadLevel } from '@src/controller/levelController';
 import { LevelGetRequest } from '@src/models/api/LevelGetRequest';
+import { LEVEL_NAMES } from '@src/models/level';
 
 jest.mock('@src/promptTemplates', () => ({
 	systemRoleLevel1: 'systemRoleLevel1',
@@ -23,11 +24,59 @@ afterEach(() => {
 	mockSend.mockClear();
 });
 
-test('WHEN client asks to load level 1 THEN the backend sends the level information for the given level', () => {
+[
+	LEVEL_NAMES.LEVEL_1,
+	LEVEL_NAMES.LEVEL_2,
+	LEVEL_NAMES.LEVEL_3,
+	LEVEL_NAMES.SANDBOX,
+].forEach((level) => {
+	test(`GIVEN level ${
+		level + 1
+	} WHEN client asks to load the level THEN the backend sends the correct level information`, () => {
+		const req = {
+			query: {
+				level,
+			},
+			session: {
+				levelState: [
+					{
+						sentEmails: 'level 1 emails',
+						chatHistory: 'level 1 chat history',
+						defences: 'level 1 defences',
+					},
+					{
+						sentEmails: 'level 2 emails',
+						chatHistory: 'level 2 chat history',
+						defences: 'level 2 defences',
+					},
+					{
+						sentEmails: 'level 3 emails',
+						chatHistory: 'level 3 chat history',
+						defences: 'level 3 defences',
+					},
+					{
+						sentEmails: 'level 4 emails',
+						chatHistory: 'level 4 chat history',
+						defences: 'level 4 defences',
+					},
+				],
+			},
+		} as unknown as LevelGetRequest;
+		const res = responseMock();
+
+		handleLoadLevel(req, res);
+
+		expect(mockSend).toHaveBeenCalledWith({
+			emails: `level ${level + 1} emails`,
+			chatHistory: `level ${level + 1} chat history`,
+			defences: `level ${level + 1} defences`,
+		});
+	});
+});
+
+test('WHEN client does not provide a level THEN the backend sends the level information for the given level', () => {
 	const req = {
-		query: {
-			level: 1,
-		},
+		query: {},
 		session: {
 			levelState: [
 				{},
@@ -43,16 +92,13 @@ test('WHEN client asks to load level 1 THEN the backend sends the level informat
 
 	handleLoadLevel(req, res);
 
-	expect(mockSend).toHaveBeenCalledWith({
-		emails: [],
-		chatHistory: [],
-		defences: [],
-	});
+	expect(res.status).toHaveBeenCalledWith(400);
+	expect(mockSend).toHaveBeenCalledWith('Level not provided');
 });
 
-test('WHEN client does not provide a level THEN the backend sends the level information for the given level', () => {
+test('WHEN client provides an invalid level THEN the backend sends the level information for the given level', () => {
 	const req = {
-		query: {},
+		query: { level: 5 },
 		session: {
 			levelState: [
 				{},
@@ -69,5 +115,5 @@ test('WHEN client does not provide a level THEN the backend sends the level info
 	handleLoadLevel(req, res);
 
 	expect(res.status).toHaveBeenCalledWith(400);
-	expect(mockSend).toHaveBeenCalledWith('Level not provided');
+	expect(mockSend).toHaveBeenCalledWith('Invalid level');
 });

backend/test/unit/controller/resetController.test.ts

@@ -3,7 +3,6 @@ import { Request, Response } from 'express';
 
 import { handleResetProgress } from '@src/controller/resetController';
 import { defaultDefences } from '@src/defaultDefences';
-import { ChatModel } from '@src/models/chat';
 import { ChatMessage } from '@src/models/chatMessage';
 import { DEFENCE_ID, Defence, DefenceConfigItem } from '@src/models/defence';
 import { EmailInfo } from '@src/models/email';
@@ -13,14 +12,6 @@ import {
 	getInitialLevelStates,
 } from '@src/models/level';
 
-declare module 'express-session' {
-	interface Session {
-		initialised: boolean;
-		chatModel: ChatModel;
-		levelState: LevelState[];
-	}
-}
-
 function responseMock() {
 	return {
 		send: jest.fn(),