Skip to content

Commit

Permalink
Implemented full text search for members in member-client #15
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicho90
nicho90 committed May 5, 2017
1 parent 26aa492 commit 7fc9131
Show file tree
Hide file tree
Showing 13 changed files with 1,152 additions and 2 deletions.
152 changes: 152 additions & 0 deletions controllers/members/search.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
var async = require('async');
var colors = require('colors');
var pg = require('pg');
var types = require('pg').types;
types.setTypeParser(1700, 'text', parseFloat);
var _ = require('underscore');
var jwt = require('jsonwebtoken');
var pool = require('../../server.js').pool;
var server_url = require('../../server.js').server_url;
var jwtSecret = require('../../server.js').jwtSecret;

var fs = require("fs");
var dir_1 = "/../../sql/queries/users/";
var dir_2 = "/../../sql/queries/members/";
var query_get_user = fs.readFileSync(__dirname + dir_1 + 'get.sql', 'utf8').toString();
var query_get_member = fs.readFileSync(__dirname + dir_2 + 'get.sql', 'utf8').toString();
var query_search_members_by_institute_of_member = fs.readFileSync(__dirname + dir_2 + 'search_by_institute.sql', 'utf8').toString();
var query_search_members_by_institute_of_user = fs.readFileSync(__dirname + dir_2 + 'search_by_institute_of_user.sql', 'utf8').toString();
var query_search_members = fs.readFileSync(__dirname + dir_2 + 'search.sql', 'utf8').toString();


// SEARCH
exports.request = function(req, res) {

async.waterfall([
function(callback){
// Connect to database
pool.connect(function(err, client, done) {
if(err) {
callback(err, 500);
} else {
callback(null, client, done);
}
});
},
function(client, done, callback) {
// Authorization
if(req.headers.authorization) {
var token = req.headers.authorization.substring(7);

// Verify token
jwt.verify(token, jwtSecret, function(err, decoded) {
if(err){
callback(new Error("Authorization failed"), 401);
} else {
if(decoded.member){
// Database query
client.query(query_get_member, [
decoded.member_id
], function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
// Check if Member exists
if (result.rows.length === 0) {
callback(new Error("Member not found"), 404);
} else {
callback(null, client, done, result.rows[0], undefined, query_search_members_by_institute_of_member);
}
}
});
} else if(decoded.user){
// Database query
client.query(query_get_user, [
decoded.user_id
], function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
// Check if User exists
if (result.rows.length === 0) {
callback(new Error("User not found"), 404);
} else {
callback(null, client, done, undefined, result.rows[0], query_search_members_by_institute_of_user);
}
}
});
} else {
callback(null, client, done, undefined, undefined, query_search_members);
}
}
});
} else {
callback(null, client, done, undefined, undefined, query_search_members);
}
},
function(client, done, member, user, query, callback) {
// Preparing parameters
var params = [];

// Pagination parameters
params.push(Number(req.query.offset) || null );
params.push(Number(req.query.limit) || null );

// Sorting
params.push(req.query.orderby || 'name.asc');

// Filter by former status
params.push(String(req.query.former));

// Filter by institute
if(member){
params.push(member.institute_id);
}
if(user){
params.push(user.institute_id);
}

// Prepare search-query
if(!req.body.search_text || req.body.search_text === ""){
callback(new Error("No search text found"), 400);
} else {
var search_text = req.body.search_text;
var search_array = search_text.split(' ');
var search_query_text = "";

for(var i=0; i<search_array.length; i++){
if(i !== search_array.length-1){
search_query_text = search_query_text + search_array[i] + ":*|";
} else {
search_query_text = search_query_text + search_array[i] + ":*";
}
}

params.push(search_query_text);

callback(null, client, done, query, params);
}

},
function(client, done, query, params, callback) {
// Database query
client.query(query, params, function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
callback(null, 200, result.rows);
}
});
}
], function(err, code, result) {
if(err){
console.error(colors.red(err));
res.status(code).send(err.message);
} else {
res.status(code).send(result);
}
});
};
110 changes: 110 additions & 0 deletions controllers/members/search_by_course.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
var async = require('async');
var colors = require('colors');
var pg = require('pg');
var types = require('pg').types;
types.setTypeParser(1700, 'text', parseFloat);
var _ = require('underscore');
var jwt = require('jsonwebtoken');
var pool = require('../../server.js').pool;
var server_url = require('../../server.js').server_url;
var jwtSecret = require('../../server.js').jwtSecret;

var fs = require("fs");
var dir_1 = "/../../sql/queries/courses/";
var dir_2 = "/../../sql/queries/members/";
var query_get_course = fs.readFileSync(__dirname + dir_1 + 'get.sql', 'utf8').toString();
var query_search_members_by_course = fs.readFileSync(__dirname + dir_2 + 'search_by_course.sql', 'utf8').toString();


// SEARCH BY COURSE
exports.request = function(req, res) {

async.waterfall([
function(callback){
// Connect to database
pool.connect(function(err, client, done) {
if(err) {
callback(err, 500);
} else {
callback(null, client, done);
}
});
},
function(client, done, callback) {
// Authorization
if(req.headers.authorization) {
var token = req.headers.authorization.substring(7);

// Verify token
jwt.verify(token, jwtSecret, function(err, decoded) {
if(err){
callback(new Error("Authorization failed"), 401);
} else {
if(decoded.member){
callback(null, client, done);
} else {
callback(new Error("Authorization failed"), 401);
}
}
});
} else {
callback(new Error("Authorization failed"), 401);
}
},
function(client, done, callback) {
// Database query
client.query(query_get_course, [
req.params.course_id
] ,function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
// Check if Course exists
if (result.rows.length === 0) {
callback(new Error("Course not found"), 404);
} else {
callback(null, client, done);
}
}
});
},
function(client, done, callback) {
// Preparing parameters
var params = [];

// Pagination parameters
params.push(Number(req.query.offset) || null );
params.push(Number(req.query.limit) || null );

// Sorting
params.push(req.query.orderby || 'name.asc');

// Filter by former status
params.push(String(req.query.former));

// Filter by course
params.push(req.params.course_id);

callback(null, client, done, params);
},
function(client, done, params, callback) {
// Database query
client.query(query_search_members_by_course, params, function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
callback(null, 200, result.rows);
}
});
}
], function(err, code, result) {
if(err){
console.error(colors.red(err));
res.status(code).send(err.message);
} else {
res.status(code).send(result);
}
});
};
135 changes: 135 additions & 0 deletions controllers/members/search_by_institute.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
var async = require('async');
var colors = require('colors');
var pg = require('pg');
var types = require('pg').types;
types.setTypeParser(1700, 'text', parseFloat);
var _ = require('underscore');
var jwt = require('jsonwebtoken');
var pool = require('../../server.js').pool;
var server_url = require('../../server.js').server_url;
var jwtSecret = require('../../server.js').jwtSecret;

var fs = require("fs");
var dir_1 = "/../../sql/queries/institutes/";
var dir_2 = "/../../sql/queries/members/";
var query_get_institute = fs.readFileSync(__dirname + dir_1 + 'get.sql', 'utf8').toString();
var query_get_member = fs.readFileSync(__dirname + dir_2 + 'get.sql', 'utf8').toString();
var query_search_members_by_institute = fs.readFileSync(__dirname + dir_2 + 'search_by_institute.sql', 'utf8').toString();


// SEARCH BY INSTITUTE
exports.request = function(req, res) {

async.waterfall([
function(callback){
// Connect to database
pool.connect(function(err, client, done) {
if(err) {
callback(err, 500);
} else {
callback(null, client, done);
}
});
},
function(client, done, callback) {
// Authorization
if(req.headers.authorization) {
var token = req.headers.authorization.substring(7);

// Verify token
jwt.verify(token, jwtSecret, function(err, decoded) {
if(err){
callback(new Error("Authorization failed"), 401);
} else {
if(decoded.member){
if(decoded.admin){
callback(null, client, done);
} else {
// Database query
client.query(query_get_member, [
decoded.member_id
], function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
// Check if Member exists
if (result.rows.length === 0) {
callback(new Error("Member not found"), 404);
} else {
// Check if the member is authorized for this institute
if(result.rows[0].institute_id === Number(req.params.institute_id)){
callback(null, client, done);
} else {
callback(new Error("Authorization failed"), 401);
}
}
}
});
}
} else {
callback(new Error("Authorization failed"), 401);
}
}
});
} else {
callback(new Error("Authorization failed"), 401);
}
},
function(client, done, callback) {
// Database query
client.query(query_get_institute, [
req.params.institute_id
], function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
// Check if Institute exists
if (result.rows.length === 0) {
callback(new Error("Institute not found"), 404);
} else {
callback(null, client, done);
}
}
});
},
function(client, done, callback) {
// Preparing parameters
var params = [];

// Pagination parameters
params.push(Number(req.query.offset) || null );
params.push(Number(req.query.limit) || null );

// Sorting
params.push(req.query.orderby || 'name.asc');

// Filter by former status
params.push(String(req.query.former));

// Filter by institute
params.push(req.params.institute_id);

callback(null, client, done, params);
},
function(client, done, params, callback) {
// Database query
client.query(query_search_members_by_institute, params, function(err, result) {
done();
if (err) {
callback(err, 500);
} else {
callback(null, 200, result.rows);
}
});
}
], function(err, code, result) {
if(err){
console.error(colors.red(err));
res.status(code).send(err.message);
} else {
res.status(code).send(result);
}
});
};
Loading

0 comments on commit 7fc9131

Please sign in to comment.