Upgrade expressjs (#1633)

* upgrade expressjs

* migration

* reenable test

* extend timeout on download test

* fixup! migration

* move empty body test from controller to validator

* enusre not empty

* extract validation function

* fixup! reenable test

* remove thin controllers

* disable e2e test of project file download

apps/server/src/api-data/excel/excel.controller.ts

@@ -1,45 +0,0 @@
-/**
- * This module encapsulates logic related to
- * Google Sheets
- */
-
-import type { Request, Response } from 'express';
-import { generateRundownPreview, listWorksheets, saveExcelFile } from './excel.service.js';
-import { CustomFields, Rundown } from 'ontime-types';
-
-export async function postExcel(req: Request, res: Response) {
-  try {
-    // file has been validated by middleware
-    const filePath = (req.file as Express.Multer.File).path;
-    await saveExcelFile(filePath);
-    res.status(200).send();
-  } catch (error) {
-    res.status(500).send({ message: String(error) });
-  }
-}
-
-export async function getWorksheets(req: Request, res: Response) {
-  try {
-    const names = listWorksheets();
-    res.status(200).send(names);
-  } catch (error) {
-    res.status(500).send({ message: String(error) });
-  }
-}
-
-/**
- * parses an Excel spreadsheet
- * @returns parsed result
- */
-export async function previewExcel(
-  req: Request,
-  res: Response<{ rundown: Rundown; customFields: CustomFields } | { message: string }>,
-) {
-  try {
-    const { options } = req.body;
-    const data = generateRundownPreview(options);
-    res.status(200).send(data);
-  } catch (error) {
-    res.status(500).send({ message: String(error) });
-  }
-}

apps/server/src/api-data/excel/excel.router.ts

@@ -1,14 +1,42 @@
-/**
- * This is a feature specific router for integration with Excel
- */
-
 import express from 'express';
+import type { Request, Response } from 'express';
 import { uploadExcel } from './excel.middleware.js';
-import { getWorksheets, postExcel, previewExcel } from './excel.controller.js';
 import { validateFileExists, validateImportMapOptions } from './excel.validation.js';
+import { CustomFields, ErrorResponse, Rundown } from 'ontime-types';
+import { generateRundownPreview, listWorksheets, saveExcelFile } from './excel.service.js';
 
 export const router = express.Router();
 
-router.post('/upload', uploadExcel, validateFileExists, postExcel);
-router.get('/worksheets', getWorksheets);
-router.post('/preview', validateImportMapOptions, previewExcel);
+router.post('/upload', uploadExcel, validateFileExists, async (req: Request, res: Response<never | ErrorResponse>) => {
+  try {
+    // file has been validated by middleware
+    const filePath = (req.file as Express.Multer.File).path;
+    await saveExcelFile(filePath);
+    res.status(201).send();
+  } catch (error) {
+    res.status(500).send({ message: String(error) });
+  }
+});
+
+router.get('/worksheets', (_req: Request, res: Response<string[] | ErrorResponse>) => {
+  try {
+    const names = listWorksheets();
+    res.status(200).send(names);
+  } catch (error) {
+    res.status(500).send({ message: String(error) });
+  }
+});
+
+router.post(
+  '/preview',
+  validateImportMapOptions,
+  (req: Request, res: Response<{ rundown: Rundown; customFields: CustomFields } | ErrorResponse>) => {
+    try {
+      const { options } = req.body;
+      const data = generateRundownPreview(options);
+      res.status(200).send(data);
+    } catch (error) {
+      res.status(500).send({ message: String(error) });
+    }
+  },
+);

apps/server/src/api-data/excel/excel.validation.ts

@@ -1,16 +1,12 @@
 import { isImportMap } from 'ontime-utils';
 
-import { body, validationResult } from 'express-validator';
-import type { NextFunction, Request, Response } from 'express';
+import { body } from 'express-validator';
+import {
+  requestValidationFunction,
+  requestValidationFunctionWithFile,
+} from '../validation-utils/validationFunction.js';
 
-export const validateFileExists = [
-  (req: Request, res: Response, next: NextFunction) => {
-    if (!req.file) {
-      return res.status(422).json({ errors: 'File not found' });
-    }
-    next();
-  },
-];
+export const validateFileExists = [requestValidationFunctionWithFile];
 
 export const validateImportMapOptions = [
   body('options')
@@ -19,9 +15,5 @@ export const validateImportMapOptions = [
       return isImportMap(content);
     }),
 
-  (req: Request, res: Response, next: NextFunction) => {
-    const errors = validationResult(req);
-    if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() });
-    next();
-  },
+  requestValidationFunction,
 ];