From 9914cb4a4040e4a4590632415996ff3ed86cc6b7 Mon Sep 17 00:00:00 2001 From: Toking Date: Mon, 7 Oct 2019 16:22:27 +0200 Subject: [PATCH] Kategorienauswahl --- db/wartung.sql | 0 routes/recepie.js | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 db/wartung.sql diff --git a/db/wartung.sql b/db/wartung.sql new file mode 100644 index 0000000..e69de29 diff --git a/routes/recepie.js b/routes/recepie.js index 7ec4b12..49f783d 100644 --- a/routes/recepie.js +++ b/routes/recepie.js @@ -64,11 +64,13 @@ router.get('/', function(req, res, next) { " FROM rezept JOIN schwierigkeit on schwierigkeit = schwierigkeit.id "+ " LEFT JOIN rezept_kategorie ON rezept.id = rezept" + - " LEFT JOIN kategorie on kategorie.id = kategorie "; - if(req.query.term) query += " WHERE rezept.name ilike '%"+req.query.term+ + " LEFT JOIN kategorie on kategorie.id = kategorie "+ + " WHERE 1 = 1 "; + if(req.query.term) query += " AND rezept.name ilike '%"+req.query.term+ "%' OR rezept.beschreibung ilike '%"+req.query.term+"%' "+ " OR rezept.id in (select rezept from rezept_zutat where zutat in (select id from zutat where name ilike '%"+req.query.term+"%'))"; - if(req.query.hashtag) query += " WHERE rezept.schluessel ilike '"+req.query.hashtag+"' " + if(req.query.hashtag) query += " AND rezept.schluessel ilike '"+req.query.hashtag+"' " + if(req.query.cat) query += " AND kategorie.id ="+req.query.cat+" "