fixquery
This commit is contained in:
+1
-11
@@ -6,18 +6,8 @@ const jobs = require('../service/jobs');
|
||||
var controllers = {
|
||||
getMarketJobs: function(req, res) {
|
||||
jobs.getmarketjobs(req, res, function(err, result) {
|
||||
|
||||
|
||||
|
||||
console.log("B**************************************************** START");
|
||||
console.log(result);
|
||||
console.log("B**************************************************** END");
|
||||
//res.json(result);
|
||||
res.status(200).json({'status': 1, 'msg': result })
|
||||
//console.log( JSON.parse(result.toJSON()));
|
||||
//const resultData = JSON.parse( JSON.stringify(result).replace("[","").replace("]",""));
|
||||
//res.json(resultData);
|
||||
|
||||
res.status(200).json({'status': 1, 'result_list': result })
|
||||
});
|
||||
},
|
||||
getStatus: function(req, res) {
|
||||
|
||||
@@ -6,22 +6,7 @@ module.exports = function(app) {
|
||||
app.route('/marketjobs')
|
||||
.get(controller.getMarketJobs);
|
||||
|
||||
|
||||
app.route('/marketjob3s/:id')
|
||||
.get(controller.getStatus);
|
||||
|
||||
app.get('/marketjobs2', function(req, res) {
|
||||
res.json([{
|
||||
number: 1,
|
||||
name: 'John',
|
||||
gender: 'male'
|
||||
},
|
||||
{
|
||||
number: 2,
|
||||
name: 'Ashley',
|
||||
gender: 'female'
|
||||
}
|
||||
]);
|
||||
})
|
||||
|
||||
};
|
||||
@@ -4,6 +4,9 @@ const port = process.env.PORT || 3000;
|
||||
|
||||
const app = express();
|
||||
|
||||
app.use(express.json());
|
||||
app.use(express.urlencoded());
|
||||
|
||||
const routes = require('./api/routes');
|
||||
routes(app);
|
||||
|
||||
|
||||
+37
-21
@@ -5,29 +5,45 @@ const db = require('../app/db')
|
||||
const logger = require('../app/logger');
|
||||
|
||||
var jobs = {
|
||||
getmarketjobs: function(req, res, next) {
|
||||
//
|
||||
// var data = {
|
||||
// "account_bank": req.body.account_bank,
|
||||
// "account_number": req.body.account_number,
|
||||
// "amount": req.body.amount,
|
||||
// "narration": req.body.narration,
|
||||
// };
|
||||
//
|
||||
// logger.info(data);
|
||||
getmarketjobs: function (req, res, next) {
|
||||
|
||||
db.query("SELECT uid,id,username FROM members LIMIT 10", function (err, result) {
|
||||
if (err) throw err;
|
||||
console.log("A****************************************************");
|
||||
console.log(result.rows);
|
||||
console.log("A****************************************************");
|
||||
// res = result.rows;
|
||||
// res = result.rows;
|
||||
// console.log(res);
|
||||
next(null, result.rows); // pass control to the next handler
|
||||
console.log("REQ---->",req.body.uid);
|
||||
var data = {
|
||||
"uid": req.body.uid,
|
||||
"member_id": req.body.member_id,
|
||||
"limit": req.body.limit,
|
||||
"sessionid": req.body.sessionid,
|
||||
"page": req.body.page
|
||||
};
|
||||
let Qstring =""; // "SELECT uid,id,username FROM members LIMIT 10";
|
||||
let QextraString ="";
|
||||
if ( req.body.uid !==""){
|
||||
QextraString= " AND j.country IN (SELECT c.country FROM members_wallet w " +
|
||||
" LEFT JOIN currency c ON c.code =w.currency " +
|
||||
" LEFT JOIN members m ON m.id = w.member_id " +
|
||||
" WHERE m.uid = '"+req.body.uid+"' )";
|
||||
}
|
||||
|
||||
Qstring = " SELECT j.title,j.description,m.id AS job_id,m.expire,m.job_description,j.price, " +
|
||||
" m.offer_code,j.timeline_days, to_char(m.expire, 'Dy Mon dd, yyyy HH:MI AM') AS expire2," +
|
||||
" m.uid AS offer_uid,j.uid AS job_uid,m.added::date AS offer_added,j.country AS job_country, " +
|
||||
" c.code AS currency_code, c.description AS currency_description,j.country, j.category " +
|
||||
" FROM members_jobs_offer m " +
|
||||
" LEFT JOIN members_jobs j ON j.id=m.job_id " +
|
||||
" LEFT JOIN currency c ON c.country=j.country " +
|
||||
" WHERE m.status = 1 AND m.client_id=0 " +
|
||||
" AND m.expire IS NOT NULL " +
|
||||
" AND m.public_view = 1 AND m.expire> now() AND j.status = 1 " + QextraString +
|
||||
" ORDER BY m.expire DESC LIMIT "+ data.limit;
|
||||
|
||||
db.query(Qstring, function (err, result) {
|
||||
try {
|
||||
if (err) throw err;
|
||||
next(null, result.rows); // pass control to the next handler
|
||||
} catch (e) {
|
||||
next(e.message, null); // pass control to the next handler
|
||||
}
|
||||
});
|
||||
// next(null, null); // pass control to the next handler
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = jobs;
|
||||
|
||||
Reference in New Issue
Block a user