From 287980a30dc7916db43ebf5282d073456d47b96e Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 24 Feb 2024 18:29:17 -0500 Subject: [PATCH] add more return --- api/controller.js | 12 ++++++++++-- service/jobs.js | 12 +++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/api/controller.js b/api/controller.js index 2c727a3..4374514 100644 --- a/api/controller.js +++ b/api/controller.js @@ -2,12 +2,20 @@ const properties = require('../package.json') const jobs = require('../service/jobs'); +const logger = require('../app/logger'); var controllers = { getMarketJobs: function(req, res) { jobs.getmarketjobs(req, res, function(err, result) { - console.log(result); - res.status(200).json({'status': 1, 'result_list': result }) + // logger.info(result); + /* + "status": "OK", + "total_record": 1, + "internal_return": 0, + "result_list" + */ + res.status(200).json({'status': 'OK', 'result_list': result.result,'total_record': result.total_record }) + //res.status(200).json({'status': 'OK', 'result_list': result }) }); }, getStatus: function(req, res) { diff --git a/service/jobs.js b/service/jobs.js index 9b00199..6e39573 100644 --- a/service/jobs.js +++ b/service/jobs.js @@ -7,7 +7,7 @@ const logger = require('../app/logger'); var jobs = { getmarketjobs: function (req, res, next) { - console.log("REQ---->",req.body.uid); + //console.log("REQ---->",req.body.uid); var data = { "uid": req.body.uid, "member_id": req.body.member_id, @@ -36,11 +36,17 @@ var jobs = { " AND m.public_view = 1 AND m.expire> now() AND j.status = 1 " + QextraString + " ORDER BY m.expire DESC LIMIT "+ data.limit; - logger.info(Qstring); + // logger.info(Qstring); db.query(Qstring, function (err, result) { try { if (err) throw err; - next(null, result.rows); // pass control to the next handler + let resultItem ={ + "result": result.rows, + "total_record": result.rowCount + } + // logger.info(result); + next(null, resultItem); // pass control to the next handler + // next(null, result.rows); // pass control to the next handler } catch (e) { next(e.message, null); // pass control to the next handler }