From 23e9b7f1960fc93428560331e5ca0c19ce0ff129 Mon Sep 17 00:00:00 2001
From: trymg <trymg@stud.ntnu.no>
Date: Mon, 1 Nov 2021 17:31:09 +0100
Subject: [PATCH] syntactic sugar in server search function

---
 server/src/server.ts | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index dfe8546..ecd6b93 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -91,21 +91,13 @@ function getQuery(key: string, value: string){
 // builds specialized query for searching with filtering
 function getSearchQuery(title: string, genre: string, order: boolean): string {
     let query = 'SELECT * FROM movie'
-    if (title != '') {
-        query = query + ' WHERE title LIKE "%' + title + '%"'
-    }
-    if (title != '' && genre != '') {
-        query = query + ' AND'
-    }
-    if (title == '' && genre != '') {
-        query = query + ' WHERE'
-    }
-    if (genre != '') {
-        query = query +  ' genre LIKE "%' + genre + '%"'
-    }
-    if (order) {
-        query = query + ' ORDER BY year DESC'
-    }
+    
+    if (title != '') { query += ' WHERE title LIKE "%' + title + '%"' }
+    if (title != '' && genre != '') { query += ' AND' }
+    if (title == '' && genre != '') { query += ' WHERE' }
+    if (genre != '') { query += ' genre LIKE "%' + genre + '%"' }
+    if (order) { query += ' ORDER BY year DESC' }
+
     console.log(query)
     return query
 }
-- 
GitLab