update search condition generator

1 files changed, 9 insertions, 5 deletions

diff --git a/scripts/apiParse.js b/scripts/apiParse.js
index 427f34cd..138a82f4 100644
--- a/scripts/apiParse.js
+++ b/scripts/apiParse.js
@@ -1,9 +1,10 @@
 var debug = require('debug')('debug')
 
-const addUserSearch = async function (input) {
+const addUserSearch = function (input, table) {
   debug('add User Search')
   var {search, starts_with, contains} = input
 
+  if (!table) { table = 'Users' }
   // if (since) cmd = cmd.havingRaw('invoices + payments + deposits + orders > ?', [0])
 
   if (search) {
@@ -13,7 +14,7 @@ const addUserSearch = async function (input) {
       search = '%' + search + '%'
     }
 
-    var condition = "(Users.email like '" + search + " OR Users.username like '" + search + "'"
+    var condition = "(" + table + ".email like '" + search + "' OR " + table + ".username like '" + search + "')"
 
     debug('condition: ' + condition)
     return condition
@@ -22,14 +23,14 @@ const addUserSearch = async function (input) {
   }
 }
 
-const addTimeSearch = async function (input, field) {
+const addTimeSearch = function (input, field) {
   debug('add time Search')
   if (!field) { field = 'updatedAt' }
   
   var {since} = input
   if (since) {
   
-    condition = "WHERE " + field + " >= " + since
+    condition = field + " >= '" + since + "'"
     debug('condition: ' + condition)
 
     return condition
@@ -38,5 +39,8 @@ const addTimeSearch = async function (input, field) {
   }
 }
 
-module.exports = {addUserSearch: addUserSearch, addTimeSearch: addTimeSearch}
+module.exports = {
+  addUserSearch: addUserSearch, 
+  addTimeSearch: addTimeSearch,
+}