From e6616356a200b69cb363a100752ed876d050bd0d Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Mon, 16 Aug 2021 15:59:00 -0700 Subject: [PATCH] Seach CODE or DESCRIPTION. Strip % from inbound string Signed-off-by: James Ketrenos --- graphql/whisky.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/graphql/whisky.js b/graphql/whisky.js index ce38e75..5a2eea6 100644 --- a/graphql/whisky.js +++ b/graphql/whisky.js @@ -183,16 +183,19 @@ var queryType = new graphql.GraphQLObjectType({ Whiskies: { type: graphql.GraphQLList(WhiskyType), args: { - code: { type: graphql.GraphQLString } + code: { type: graphql.GraphQLString }, }, resolve: (root, {code}, context, info) => { return new Promise((resolve, reject) => { - database.all( + if (code && code.trim() != "") { + code = `${code.replace(/%/g, '')}%`; + } + database.all( "SELECT w.*,i.quantity,i.updated " + "FROM Whiskies AS w " + "LEFT JOIN Inventories AS i ON w.code=i.whisky " + - (code ? "WHERE w.code LIKE (?) " : "") + - ";", [code], function(err, rows) { + (code ? "WHERE w.code LIKE (?) OR w.description LIKE (?)" : "") + + ";", [code, code], function(err, rows) { if (err) { console.error(err); return reject(null); } resolve(buildWhiskies(rows)); });