Updated modelFunctions & fx signatures to include server as arg 0

transomjs · Sep 8, 2020 · cf4299b · cf4299b
1 parent 8e7ffd4
commit cf4299b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/lib/modelFunctions.js b/lib/modelFunctions.js
@@ -17,7 +17,7 @@ module.exports = function ModelFunctions(options) {
         collations
     });
 
-    function modelFind(entity, req) {
+    function modelFind(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             const query = handlerUtils.buildQuery(model.find(), req, entity);
@@ -69,7 +69,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelFindById(entity, req) {
+    function modelFindById(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             let id;
@@ -154,7 +154,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelFindBinary(entity, req) {
+    function modelFindBinary(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             const pathOpts = model.schema.path(req.params.__attribute).options;
@@ -196,7 +196,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelCount(entity, req) {
+    function modelCount(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
 
@@ -217,7 +217,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelInsert(entity, req) {
+    function modelInsert(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             const values = Object.assign({}, req.body, req.files);
@@ -271,7 +271,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelDelete(entity, req) {
+    function modelDelete(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
 
@@ -302,7 +302,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelDeleteById(entity, req) {
+    function modelDeleteById(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             let id;
@@ -340,7 +340,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelDeleteBatch(entity, req) {
+    function modelDeleteBatch(server, entity, req) {
         const model = entity.model;
         var p = new Promise(function (resolve, reject) {
             const deleteIdList = (req.body || {}).id;
@@ -387,7 +387,7 @@ module.exports = function ModelFunctions(options) {
         });
     }
 
-    function modelUpdateById(entity, req) {
+    function modelUpdateById(server, entity, req) {
         const model = entity.model;
         return new Promise(function (resolve, reject) {
             let id;

diff --git a/lib/modelHandler.js b/lib/modelHandler.js
@@ -87,7 +87,7 @@ module.exports = function ModelHandler(options) {
 		debug(`HandleFind on ${entity.modelName}`);
 
 		const modelFx = entity.fx || modelFunctions.modelFind;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || jsonArrayResponder;
 				return responder(server, entity, req, res, data);
@@ -106,7 +106,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "findById");
 		debug(`HandleFindById on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelFindById;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || jsonResponder;
 				return responder(server, entity, req, res, {item: data});
@@ -125,7 +125,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "findBinary");
 		debug(`HandleFindBinary on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelFindBinary;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || binaryResponder;
 				return responder(server, entity, req, res, data);		
@@ -141,7 +141,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "findCount");
 		debug(`HandleCount on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelCount;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 		.then((data) => {
 			const responder = entity.responder || jsonResponder;
 			return responder(server, entity, req, res, {item: data});
@@ -157,7 +157,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "insert");
 		debug(`HandleInsert on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelInsert;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 		.then((data) => {
 			const responder = entity.responder || jsonResponder;
 			return responder(server, entity, req, res, data);
@@ -189,7 +189,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "deleteById");
 		debug(`HandleDeleteById on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelDeleteById;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || jsonResponder;
 				return responder(server, entity, req, res, {item: data});
@@ -205,7 +205,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "deleteBatch");
 		debug(`HandleDeleteBatch on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.handleDeleteBatch;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || jsonResponder;
 				return responder(server, entity, req, res, {item: data});
@@ -221,7 +221,7 @@ module.exports = function ModelHandler(options) {
 		const entity = getEntity(req, "updateById");
 		debug(`HandleUpdateById on ${entity.modelName}`);
 		const modelFx = entity.fx || modelFunctions.modelUpdateById;
-		modelFx(entity, req)
+		modelFx(server, entity, req)
 			.then((data) => {
 				const responder = entity.responder || jsonResponder;
 				return responder(server, entity, req, res, data);