Reorganize preset backend

backend/src/index.ts

@@ -6,6 +6,7 @@ import path from 'path';
 import * as Auth from './auth';
 import * as Election from './election';
 import * as ManagedGameServers from './managedGameServers';
+import * as Presets from './presets';
 import * as Match from './match';
 import { checkAndNormalizeLogAddress } from './match';
 import * as MatchMap from './matchMap';
@@ -111,6 +112,7 @@ const main = async () => {
 	await Auth.setup();
 	await WebSocket.setup(httpServer);
 	await ManagedGameServers.setup();
+	await Presets.setup();
 	Match.registerCommandHandlers();
 	MatchMap.registerCommandHandlers();
 	Election.registerCommandHandlers();

backend/src/presets.ts

@@ -0,0 +1,79 @@
+import { generate as shortUuid } from 'short-uuid';
+import { IPreset, IPresetCreateDto, IPresetUpdateDto } from '../../common/types/preset';
+import * as Storage from './storage';
+
+const FILE_NAME = 'presets.json';
+const presets = new Map<string, IPreset>();
+
+const write = async () => {
+	await Storage.write(FILE_NAME, Array.from(presets.values()));
+};
+
+export const setup = async () => {
+	const data = await Storage.read(FILE_NAME, [] as IPreset[]);
+	data.forEach((preset) => presets.set(preset.id, preset));
+};
+
+export const getAll = () => {
+	return Array.from(presets.values());
+};
+
+export const add = async (dto: IPresetCreateDto) => {
+	let id: string;
+	do {
+		id = shortUuid();
+	} while (presets.has(id));
+	const preset = {
+		id: id,
+		name: dto.name,
+		data: dto.data,
+	};
+	presets.set(id, preset);
+	await write();
+	return preset;
+};
+
+export const update = async (dto: IPresetUpdateDto) => {
+	const preset = presets.get(dto.id);
+	if (!preset) {
+		return false;
+	}
+	presets.set(dto.id, dto);
+	await write();
+	return true;
+};
+
+export const remove = async (id: string) => {
+	const removed = presets.delete(id);
+	if (removed) {
+		await write();
+	}
+	return removed;
+};
+/*
+
+export const getPresets = async () => {
+	return await Storage.read<IPreset[]>(FILE_NAME, []);
+};
+
+export const writePresets = async (presets: IPreset[]) => {
+	return await Storage.write(FILE_NAME, presets);
+};
+
+export const setPreset = async (data: IPreset) => {
+	const presets = await getPresets();
+	presets.push(data);
+	writePresets(presets);
+};
+
+export const deletePreset = async (id: string) => {
+	const oldPresets = await getPresets();
+	const newPresets = oldPresets.filter((preset) => preset.id !== id);
+	if (oldPresets.length === newPresets.length) {
+		return false;
+	} else {
+		writePresets(newPresets);
+		return true;
+	}
+};
+*/

backend/src/presetsController.ts

@@ -3,26 +3,23 @@ import {
 	Controller,
 	Delete,
 	Get,
-	NoSecurity,
 	Post,
 	Put,
 	Request,
 	Route,
 	Security,
 	SuccessResponse,
 } from '@tsoa/runtime';
-import { generate as shortUuid } from 'short-uuid';
 import { IPreset, IPresetCreateDto } from '../../common/types/preset';
 import { IAuthResponse } from './auth';
-import { deletePreset, getPresets, setPreset } from './preset';
+import * as Presets from './presets';
 
 @Route('/api/presets')
 @Security('bearer_token')
 export class PresetsController extends Controller {
 	@Get()
-	@NoSecurity()
 	async getPresets(@Request() { user }: { user: IAuthResponse }): Promise<IPreset[]> {
-		return getPresets();
+		return Presets.getAll();
 	}
 
 	@Post()
@@ -31,27 +28,21 @@ export class PresetsController extends Controller {
 		@Body() requestBody: IPresetCreateDto,
 		@Request() { user }: { user: IAuthResponse }
 	): Promise<IPreset> {
-		const id = shortUuid();
-		const preset: IPreset = { ...requestBody, id: id };
-		setPreset(preset);
+		const preset = Presets.add(requestBody);
 		this.setStatus(201);
 		return preset;
 	}
 
-	@Put('')
+	@Put()
 	async updatePreset(@Body() requestBody: IPreset, @Request() { user }: { user: IAuthResponse }) {
-		const presets = await getPresets();
-		const preset = presets.find((preset) => preset.id === requestBody.id);
-		if (preset) {
-			setPreset({ ...requestBody });
-		} else {
+		if (!(await Presets.update(requestBody))) {
 			this.setStatus(404);
 		}
 	}
 
 	@Delete('{id}')
 	async deletePreset(id: string, @Request() { user }: { user: IAuthResponse }): Promise<void> {
-		if (!(await deletePreset(id))) {
+		if (!(await Presets.remove(id))) {
 			this.setStatus(404);
 		}
 	}

backend/src/routes.ts

@@ -1677,6 +1677,7 @@ export function RegisterRoutes(app: Router) {
 	// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
 	app.get(
 		'/api/presets',
+		authenticateMiddleware([{ bearer_token: [] }]),
 		...fetchMiddlewares<RequestHandler>(PresetsController),
 		...fetchMiddlewares<RequestHandler>(PresetsController.prototype.getPresets),
 

backend/swagger.json

@@ -2816,7 +2816,11 @@
 						}
 					}
 				},
-				"security": [],
+				"security": [
+					{
+						"bearer_token": []
+					}
+				],
 				"parameters": []
 			},
 			"post": {

common/types/preset.ts

@@ -8,3 +8,5 @@ export interface IPresetCreateDto {
 export interface IPreset extends IPresetCreateDto {
 	id: string;
 }
+
+export interface IPresetUpdateDto extends IPreset {}

frontend/src/pages/create.tsx

@@ -224,7 +224,7 @@ export const CreatePage: Component = () => {
 	const setMatchDataFromPreset = (presetId: string) => {
 		const preset = getPresetById(presetId);
 		if (preset) {
-			setMatchCreateDto(preset.data);
+			setMatchCreateDto(JSON.parse(JSON.stringify(preset.data)));
 		}
 	};
 
@@ -249,7 +249,14 @@ export const CreatePage: Component = () => {
 						>
 							<option value=""></option>
 							<For each={presets()}>
-								{(preset) => <option value={preset.id}>{preset.name}</option>}
+								{(preset) => (
+									<option
+										value={preset.id}
+										selected={selectedPresetId() === preset.id}
+									>
+										{preset.name}
+									</option>
+								)}
 							</For>
 						</SelectInput>
 					</div>