add search functionality

Author: VirtualDOMinic

DB-query-planning.md

@@ -1,11 +1,24 @@
-# Joe and Dom thinking of queries:
+# Joe and Dom (and Eve now!) thinking of queries:
+Misc notes
 
 ## People searching:
 
 * User searches for item
     * `SELECT * FROM items WHERE lower(name) LIKE '%{user-input.toLowerCase()}%' OR lower(description) LIKE '%{user-input.toLowerCase()}%';
     * The above is passed in using JS template literal. Do we need to escape the percentages?
 
+* Updated query example:
+`SELECT users.name, items.name, items.description FROM items
+                               INNER JOIN users ON items.lender_id = users.id 
+                               WHERE lower(items.name) LIKE '%blade%' OR lower(items.description) LIKE '%blade%';
+`
+
+`SELECT users.name, users.fav_colour, items.name, items.description 
+FROM items 
+INNER JOIN users 
+ON items.lender_id = users.id 
+WHERE lower(items.name) LIKE '%$1%' OR lower(items.description) LIKE '%$1%';`
+
 * User searches for item, with box checked to only show items that are available (ie not out on loan)
     * `SELECT * FROM loans WHERE item_id=${item_id}`
 

src/handlers.js

@@ -50,8 +50,19 @@ const handlers = {
     });
   },
 
-  search(req, res) {
-    // add some innards
+  search(req, res, endpoint) {
+    const qry = decodeURIComponent(endpoint.split("?q=")[1]).replace(/[^A-Za-z0-9 ]/,"").toLowerCase();
+    getData(qry, (err, result) => {
+      if(err) {
+        res.writeHead(500, { "Content-Type": "text/html" });
+        res.end("<h1>Server Error</h1>");
+        console.log("search error");
+      } else {
+        res.writeHead(200, "Content-type: application/json");
+        res.end(JSON.stringify(result));
+      }
+    })
+
   },
   requestItem(req, res) {
     if (req.method === "POST") {

src/queries/getData.js

@@ -1,13 +1,17 @@
 const databaseConnection = require('../database/db_connection.js');
 
 // qry is the db query we want to make
-const getData = (cb) => {
-    databaseConnection.query('SELECT * FROM users', (err, res) => {
+const getData = (qry, cb) => {
+    databaseConnection.query(`SELECT users.name, users.fav_colour, items.name, items.description 
+    FROM items 
+    INNER JOIN users 
+    ON items.lender_id = users.id 
+    WHERE lower(items.name) LIKE '%${qry}%' OR lower(items.description) LIKE '%${qry}%'`, (err, res) => {
         if (err) {
-            cb(err);
-        } else {
-            cb(null, res.rows)
-        }
+            return cb(err);
+        } 
+        return cb(null, res.rows);
+
     });
 };
 

src/router.js

@@ -5,8 +5,8 @@ const router = (req, res) => {
 
   if (endpoint === "") {
     handlers.home(req, res);
-  } else if (endpoint === "search") {
-    handlers.search(req, res); // some arguments maybe
+  } else if (endpoint.includes("search?q=")) {
+    handlers.search(req, res, endpoint); // some arguments maybe
   } else if (endpoint === "request-item") {
     handlers.requestItem(req, res);
   } else if (endpoint === "add-item") {