Skip to content

Commit 0bf3322

Browse files
committed
Implement sorting for profile image / not profile image in Backend
1 parent 1b4e4d0 commit 0bf3322

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

core/db.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,20 @@ exports.getEntries = function(filter, callback){
6161

6262
let sql = 'SELECT * FROM entries';
6363

64-
if (filter['active'] !== '0') {
64+
if (filter['active'] === 1) {
6565
sql += ' WHERE email_confirmed = 1 AND status = 1';
6666
}
6767

68+
if (filter['profileImage'] === 1) {
69+
sql += (filter['active'] === 1 ? ' AND' : ' WHERE') + ' image != \'\'';
70+
}
71+
6872
let orderByDate = filter['orderByDate'] === 'asc' ? 'ASC' : 'DESC';
6973

7074
sql += ' ORDER BY ID ' + orderByDate + ' LIMIT ? OFFSET ?;';
7175

7276
// make the query
73-
connection.query(sql, [parseInt(filter['limit']), parseInt(filter['offset'])], function(err, results) {
77+
connection.query(sql, [filter['limit'], filter['offset']], function(err, results) {
7478
connection.release();
7579
if(err) { callback(results, true); return; }
7680
callback(results, false);

core/entryController.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ exports.getAll = function(req, res) {
1212
ORDER_BY_DATE_DESC = 'desc';
1313

1414
let filter = {};
15-
filter['limit'] = req.query.limit || 10;
16-
filter['offset'] = req.query.offset || 0;
17-
filter['active'] = req.query.isActive || 1;
15+
filter['limit'] = parseInt(req.query.limit) || 10;
16+
filter['offset'] = parseInt(req.query.offset) || 0;
17+
filter['active'] = parseInt(req.query.isActive) || 1;
1818
filter['orderByDate'] = (req.query.orderByDate === ODER_BY_DATE_ASC) ? ORDER_BY_DATE_ASC : ORDER_BY_DATE_DESC;
19+
filter['profileImage'] = parseInt(req.query.profileImage) || 0;
1920

2021
db.getEntries(filter, function(results, err){
2122
if(!err){

0 commit comments

Comments
 (0)