From c0148e8301b9d2a987c79d8f49f90e678c75e5a4 Mon Sep 17 00:00:00 2001
From: Roberto Tonino <roberto.tonino5@gmail.com>
Date: Fri, 9 Apr 2021 21:06:02 +0200
Subject: [PATCH] test: disabled logger when in test mode; refactor: type names

---
 server/src/middlewares.ts                     |  5 ++++-
 server/src/routes/api/get/albumSearch.spec.ts |  1 +
 server/src/routes/api/get/albumSearch.ts      | 10 +++++-----
 server/src/types.ts                           |  5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/server/src/middlewares.ts b/server/src/middlewares.ts
index 8e42ccc..034621a 100644
--- a/server/src/middlewares.ts
+++ b/server/src/middlewares.ts
@@ -5,7 +5,10 @@ import cookieParser from 'cookie-parser'
 import { WEBUI_DIR } from './helpers/paths'
 
 export function registerMiddlewares(app: Application) {
-	app.use(logger('dev'))
+	if (process.env.NODE_ENV !== 'test') {
+		app.use(logger('dev'))
+	}
+
 	app.use(express.json())
 	app.use(express.urlencoded({ extended: false }))
 	app.use(cookieParser())
diff --git a/server/src/routes/api/get/albumSearch.spec.ts b/server/src/routes/api/get/albumSearch.spec.ts
index 990f74a..f872782 100644
--- a/server/src/routes/api/get/albumSearch.spec.ts
+++ b/server/src/routes/api/get/albumSearch.spec.ts
@@ -16,6 +16,7 @@ describe('albumSearch requests', () => {
 			responseStatusCollector.push((await request(app).get(uri).send()).status)
 		}
 
+		expect(responseStatusCollector).toMatchObject(new Array(batchCalls.length).fill(200))
 		expect(responseStatusCollector).toMatchObject(new Array(responseStatusCollector.length).fill(200))
 	})
 
diff --git a/server/src/routes/api/get/albumSearch.ts b/server/src/routes/api/get/albumSearch.ts
index a3d5d28..856d8df 100644
--- a/server/src/routes/api/get/albumSearch.ts
+++ b/server/src/routes/api/get/albumSearch.ts
@@ -1,14 +1,14 @@
 import { RequestHandler } from 'express'
 import { ApiHandler } from '../../../types'
 
-export interface RawAlbumQueryParams {
+export interface RawAlbumQuery {
 	term: string
 	start?: string
 	nb?: string
 	ack: number
 }
 
-export interface AlbumSearchParams extends Omit<RawAlbumQueryParams, 'start' | 'nb'> {
+export interface AlbumSearchParams extends Omit<RawAlbumQuery, 'start' | 'nb'> {
 	start: number
 	nb: number
 }
@@ -16,12 +16,12 @@ export interface AlbumSearchParams extends Omit<RawAlbumQueryParams, 'start' | '
 export interface AlbumResponse {
 	data: any[]
 	total: number
-	ack: RawAlbumQueryParams['ack']
+	ack: RawAlbumQuery['ack']
 }
 
 const path: ApiHandler['path'] = '/album-search/'
 
-const handler: RequestHandler<{}, {}, {}, RawAlbumQueryParams> = (req, res, next) => {
+const handler: RequestHandler<{}, {}, {}, RawAlbumQuery> = (req, res, next) => {
 	if (!req.query) {
 		res.status(400).send()
 		next()
@@ -51,7 +51,7 @@ const apiHandler = { path, handler }
 
 export default apiHandler
 
-function parseQuery(query: RawAlbumQueryParams): AlbumSearchParams {
+function parseQuery(query: RawAlbumQuery): AlbumSearchParams {
 	let startingPoint = 0
 
 	if (typeof query.start !== 'undefined') {
diff --git a/server/src/types.ts b/server/src/types.ts
index 69c53ca..cddb08d 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -1,11 +1,12 @@
 import { RequestHandler } from 'express'
 
 /* === Utilities === */
-export type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
+// https://github.com/Microsoft/TypeScript/issues/25760#issuecomment-614417742
+export type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>
 
 export type Port = number | string | boolean
 
 export interface ApiHandler {
 	path: string
-	handler: RequestHandler
+	handler: RequestHandler<any, any, any, any>
 }