Skip to content

Remove q dependency #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 27, 2022
Merged

Remove q dependency #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ae672fd
rename mongoose-rest-api.test.js to .mjs
marcag3 Sep 23, 2022
6ed36b3
update mongodb-memory-server and mongoose
marcag3 Sep 26, 2022
a62428b
correct test for new version
marcag3 Sep 26, 2022
13451f0
use countDocuments instead of count
marcag3 Sep 26, 2022
671ba60
Merge pull request #1 from marcag3/deprecation-warning
marcag3 Sep 26, 2022
3cfb619
remove q in package.json and npm audit fix
marcag3 Sep 26, 2022
f8d5ed1
add minimum node version 16
marcag3 Sep 26, 2022
e30dee7
bump version of chai from 4.1.2 to 4.3.6
marcag3 Sep 26, 2022
e38db80
bump version of moka from 8.1.3 to 10.0.0
marcag3 Sep 26, 2022
7fd7755
remove Q in index.js
marcag3 Sep 26, 2022
eb4bef0
remove Q in test
marcag3 Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 89 additions & 78 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,129 +1,140 @@
var Q = require('q');

function RestCrud(Model, object_id_parameter, options) {
if(!Model) throw "no Model specified";
if(!options) options = {}
if (!Model) throw "no Model specified";
if (!options) options = {};

var get = function(req, res) {
if(!req) throw "no Request object specified";
if(!res) throw "no Response object specified";

var deferred = Q.defer();
var get = function (req, res) {
if (!req) throw "no Request object specified";
if (!res) throw "no Response object specified";

var columns = null;
if(req.query.columns) columns = req.query.columns.join(" ");
if (req.query.columns) columns = req.query.columns.join(" ");

var populate = '';
if(req.query.populate) populate = req.query.populate.join(" ");
var populate = "";
if (req.query.populate) populate = req.query.populate.join(" ");

if(object_id_parameter && req.params[object_id_parameter]) {
Model.findById(req.params[object_id_parameter], columns).populate(populate).exec(function(err, object) {
if(err) return deferred.reject(err);
deferred.resolve(object);
if (object_id_parameter && req.params[object_id_parameter]) {
return new Promise((resolve, reject) => {
Model.findById(req.params[object_id_parameter], columns)
.populate(populate)
.exec(function (err, object) {
if (err) return reject(err);
resolve(object);
});
});
} else {
var sort = '';
if(req.query.sort) sort = req.query.sort;
var sort = "";
if (req.query.sort) sort = req.query.sort;

var offset = 0;
if(req.query.offset) offset = parseInt(req.query.offset);
if (req.query.offset) offset = parseInt(req.query.offset);

var limit = 0;
if(req.query.limit) limit = parseInt(req.query.limit);
if (req.query.limit) limit = parseInt(req.query.limit);

var params = {};
if(req.params.search_term) {
if(!options.search_columns) throw new Error("No search columns specified in options");
if (req.params.search_term) {
if (!options.search_columns)
throw new Error("No search columns specified in options");
var pattern = new RegExp(".*" + req.params.search_term + ".*", "i");
var search_params = [];
for(var i=0; i<options.search_columns.length; i++) {
for (var i = 0; i < options.search_columns.length; i++) {
var new_search_param = {};
new_search_param[options.search_columns[i]] = pattern;
search_params.push(new_search_param);
}
params['$or'] = search_params;
params["$or"] = search_params;
}
for(var k in req.query) {
if(["sort", "populate", "columns", "offset", "limit"].indexOf(k) > -1) continue;
for (var k in req.query) {
if (["sort", "populate", "columns", "offset", "limit"].indexOf(k) > -1)
continue;
var v = req.query[k];
if(v == '') v = null;
if(typeof v == "string" && v.toLowerCase() == 'true') v = true;
if(typeof v == "string" && v.toLowerCase() == 'false') v = false;
if(typeof v == "string" && v.charAt(0) === '!'){
if (v == "") v = null;
if (typeof v == "string" && v.toLowerCase() == "true") v = true;
if (typeof v == "string" && v.toLowerCase() == "false") v = false;
if (typeof v == "string" && v.charAt(0) === "!") {
v = v.slice(1);
params[k] = {$ne:v};
params[k] = { $ne: v };
} else {
params[k] = v;
}
if(typeof params[k] == "string" && params[k].indexOf(",") != -1) {
params[k] = {$in: v.split(",")};
if (typeof params[k] == "string" && params[k].indexOf(",") != -1) {
params[k] = { $in: v.split(",") };
}
}
Model.count(params).exec(function(err, count) {
if(err) return deferred.reject(err);
res.set('X-Total', count);
if(limit) res.set('X-Total-Pages', Math.ceil(count/limit));
Model.find(params,columns).populate(populate).sort(sort).skip(offset).limit(limit).exec(function(err, objects) {
if(err) return deferred.reject(err);
return deferred.resolve(objects);
return new Promise((resolve, reject) => {
Model.countDocuments(params).exec(function (err, count) {
if (err) return reject(err);
res.set("X-Total", count);
if (limit) res.set("X-Total-Pages", Math.ceil(count / limit));
Model.find(params, columns)
.populate(populate)
.sort(sort)
.skip(offset)
.limit(limit)
.exec(function (err, objects) {
if (err) return reject(err);
resolve(objects);
});
});
});
}
return deferred.promise;
};

var post = function(req, res) {
if(!req) throw "no Request object specified";
if(!res) throw "no Response object specified";
var deferred = Q.defer();
Model.create(req.body, function(err, new_object) {
if(err) deferred.reject(err);
deferred.resolve(new_object);
});
return deferred.promise;
var post = function (req, res) {
if (!req) throw "no Request object specified";
if (!res) throw "no Response object specified";
return new Promise((resolve, reject) => {
Model.create(req.body, function (err, new_object) {
if (err) return reject(err);
resolve(new_object);
});
});
};

var update = function(req, res) {
if(!req) throw "no Request object specified";
if(!res) throw "no Response object specified";
var deferred = Q.defer();
Model.findById(req.params[object_id_parameter], function(err, object) {
if(err) return deferred.reject(err);
for(var k in req.body) {
if(["_id", "__v"].indexOf(k) > -1) continue;
object[k] = req.body[k];
}
object.save(function(err, saved_object) {
if(err) return deferred.reject(err);
deferred.resolve(saved_object);
var update = function (req, res) {
if (!req) throw "no Request object specified";
if (!res) throw "no Response object specified";
return new Promise((resolve, reject) => {
Model.findById(req.params[object_id_parameter], function (err, object) {
if (err) return reject(err);
for (var k in req.body) {
if (["_id", "__v"].indexOf(k) > -1) continue;
object[k] = req.body[k];
}
object.save(function (err, saved_object) {
if (err) return reject(err);
resolve(saved_object);
});
});
});
return deferred.promise;
};

var remove = function(req, res) {
if(!req) throw "no Request object specified";
if(!res) throw "no Response object specified";
var deferred = Q.defer();
Model.findByIdAndRemove(req.params[object_id_parameter], function(err, removed_object) {
if(err) deferred.reject(err);
result = removed_object;
if(result) result = true;
deferred.resolve(result);
var remove = function (req, res) {
if (!req) throw "no Request object specified";
if (!res) throw "no Response object specified";
return new Promise((resolve, reject) => {
Model.findByIdAndRemove(
req.params[object_id_parameter],
function (err, removed_object) {
if (err) return reject(err);
result = removed_object;
if (result) result = true;
resolve(result);
}
);
});
return deferred.promise;
}
};

var methods = {
get: get,
post: post
post: post,
};

if(object_id_parameter) {
if (object_id_parameter) {
methods.put = methods.patch = update;
methods.delete = remove;
}
return methods;
}

module.exports = RestCrud
module.exports = RestCrud;
Loading