From f4765244610325dc6b4bb663b0ead7465dceb443 Mon Sep 17 00:00:00 2001 From: Tsu-ba-me Date: Thu, 9 Jun 2022 13:47:09 -0400 Subject: [PATCH] fix(striker-ui-api): get anvil UUIDs from query params in GET /server --- .../lib/request_handlers/server/getServer.ts | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/striker-ui-api/src/lib/request_handlers/server/getServer.ts b/striker-ui-api/src/lib/request_handlers/server/getServer.ts index 896aca19..42732da4 100644 --- a/striker-ui-api/src/lib/request_handlers/server/getServer.ts +++ b/striker-ui-api/src/lib/request_handlers/server/getServer.ts @@ -1,18 +1,22 @@ import buildGetRequestHandler from '../buildGetRequestHandler'; import join from '../../join'; +import { sanitizeQS } from '../../sanitizeQS'; export const getServer = buildGetRequestHandler( (request, buildQueryOptions) => { - const { anvilsUUID } = request.body; + const { anvilUUIDs } = request.query; - const condAnvilsUUID = join(anvilsUUID, { - beforeReturn: (toReturn) => - toReturn ? `AND server_anvil_uuid IN (${toReturn})` : '', - elementWrapper: "'", - separator: ', ', - }); + const condAnvilUUIDs = join( + sanitizeQS(anvilUUIDs, { returnType: 'string[]' }), + { + beforeReturn: (toReturn) => + toReturn ? `AND server_anvil_uuid IN (${toReturn})` : '', + elementWrapper: "'", + separator: ', ', + }, + ); - console.log(`condAnvilsUUID=[${condAnvilsUUID}]`); + console.log(`condAnvilsUUID=[${condAnvilUUIDs}]`); if (buildQueryOptions) { buildQueryOptions.afterQueryReturn = (queryStdout) => { @@ -34,13 +38,13 @@ export const getServer = buildGetRequestHandler( } return ` - SELECT - server_uuid, - server_name, - server_state, - server_host_uuid - FROM servers - WHERE server_state != 'DELETED' - ${condAnvilsUUID};`; + SELECT + server_uuid, + server_name, + server_state, + server_host_uuid + FROM servers + WHERE server_state != 'DELETED' + ${condAnvilUUIDs};`; }, );