soajs.multitenant 2.1.18 → 2.1.19

package/Gruntfile.js

@@ -197,7 +197,7 @@ module.exports = function (grunt) {
 				// When true, grunt-coveralls will only print a warning rather than
 				// an error, to prevent CI builds from failing unnecessarily (e.g. if
 				// coveralls.io is down). Optional, defaults to false.
-				force: false
+				force: true
 			},
 			your_target: {
 				// Target-specific LCOV coverage file

package/_index.js

@@ -514,7 +514,13 @@ function run(serviceStartCb) {
 					return res.json(req.soajs.buildResponse(error, data));
 				});
 			});
-			
+
+			service.get("/admin/tenants", (req, res) => {
+				bl.tenant.getByIds(req.soajs, req.soajs.inputmaskData, (error, data) => {
+					return res.json(req.soajs.buildResponse(error, data));
+				});
+			});
+
 			service.get("/tenant/console", (req, res) => {
 				req.soajs.inputmaskData.soajs = true;
 				bl.tenant.get(req.soajs, req.soajs.inputmaskData, (error, data) => {

package/bl/tenant.js

@@ -218,7 +218,7 @@ let bl = {
 		data.id = inputmaskData.id;
 		data.code = inputmaskData.code;
 		data.name = inputmaskData.name;
-		
+
 		if (!data.id && !data.code && !data.name) {
 			data.id = soajs.tenant.id;
 		}
@@ -234,7 +234,24 @@ let bl = {
 			return cb(null, record);
 		});
 	},
-	
+
+	"getByIds": (soajs, inputmaskData, cb) => {
+		if (!inputmaskData || !inputmaskData.ids) {
+			return cb(bl.handleError(soajs, 400, null));
+		}
+		let modelObj = bl.mp.getModel(soajs);
+		let data = {
+			ids: inputmaskData.ids
+		};
+		modelObj.getTenantsById(data, (err, result) => {
+			bl.mp.closeModel(soajs, modelObj);
+			if (err) {
+				return cb(bl.handleError(soajs, 602, err));
+			}
+			return cb(null, result);
+		});
+	},
+
 	"list": (soajs, inputmaskData, cb) => {
 		if (!inputmaskData) {
 			return cb(bl.handleError(soajs, 400, null));

package/config.js

@@ -961,6 +961,20 @@ module.exports = {
 				"commonFields": ['appId', 'key']
 			},
 
+			"/admin/tenants": {
+				_apiInfo: {
+					"l": "Get admin tenants by ids",
+					"group": "Admin Tenant"
+				},
+				"ids": {
+					"source": ['query.ids'],
+					"required": true,
+					"validation": {
+						'type': 'array',
+						'items': { 'type': 'string' }
+					}
+				}
+			},
 			"/admin/tenant": {
 				_apiInfo: {
 					"l": "Get admin tenant",

package/model/mongo/tenant.js

@@ -107,6 +107,55 @@ Tenant.prototype.getTenants = function (data, cb) {
 	__self.mongoCore.find(colName, condition, null, cb);
 };
 
+Tenant.prototype.getTenantsById = function (data, cb) {
+	let __self = this;
+	if (!data || !data.ids || !Array.isArray(data.ids) || data.ids.length === 0) {
+		let error = new Error("Array of ids is required.");
+		return cb(error, null);
+	}
+
+	let objectIds = data.ids.map(id => __self.mongoCore.ObjectId(id));
+
+	let pipeline = [
+		{ "$match": { "_id": { "$in": objectIds } } },
+		{
+			"$facet": {
+				"count": [{ "$count": "count" }],
+				"items": [
+					{
+						"$project": {
+							"_id": 1,
+							"name": 1
+						}
+					}
+				]
+			}
+		},
+		{ "$unwind": { "path": "$count", "preserveNullAndEmptyArrays": true } },
+		{
+			"$project": {
+				"items": "$items",
+				"count": { "$ifNull": ["$count.count", 0] }
+			}
+		}
+	];
+
+	__self.mongoCore.aggregate(colName, pipeline, {}, (err, cursor) => {
+		if (err) {
+			return cb(err);
+		}
+		cursor.toArray((err, response) => {
+			if (err) {
+				return cb(err);
+			}
+			if (response && response[0]) {
+				return cb(null, response[0]);
+			}
+			return cb(null, { items: [], count: 0 });
+		});
+	});
+};
+
 Tenant.prototype.getTenant = function (data, cb) {
 	let __self = this;
 	if (!data || !(data.id || data.code || data.name)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.multitenant",
   "description": "soajs multitenant service",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "author": "soajs team <team@soajs.org>",
   "repository": {
     "type": "git",