soajs.multitenant 2.1.17 → 2.1.19

package/.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+
+on:
+  push:
+    branches: [ master, develop, feature/*, features/* ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      mongodb:
+        image: mongo:8
+        ports:
+          - 27017:27017
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Install grunt-cli
+        run: npm install -g grunt-cli
+
+      - name: Run linting
+        run: grunt
+
+      - name: Run tests
+        if: github.ref != 'refs/heads/master'
+        run: grunt test
+
+      - name: Run coverage
+        if: github.ref == 'refs/heads/master'
+        run: grunt coverage

package/.github/workflows/release.yml

@@ -0,0 +1,94 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - release
+      - 'release/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      mongodb:
+        image: mongo:8
+        ports:
+          - 27017:27017
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Install grunt-cli
+        run: npm install -g grunt-cli
+
+      - name: Run linting
+        run: grunt
+
+      - name: Run tests
+        run: grunt test
+
+  publish-docker:
+    runs-on: ubuntu-latest
+    needs: test
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Extract version from package.json
+        id: version
+        run: |
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          MAJOR_VERSION=$(echo ${PACKAGE_VERSION} | awk -F. '{ print $1 }')
+          echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> $GITHUB_OUTPUT
+          echo "MAJOR_VERSION=${MAJOR_VERSION}" >> $GITHUB_OUTPUT
+          echo "Package version: ${PACKAGE_VERSION}"
+          echo "Major version: ${MAJOR_VERSION}"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: |
+            soajsorg/multitenant:latest
+            soajsorg/multitenant:${{ steps.version.outputs.PACKAGE_VERSION }}
+            soajsorg/multitenant:${{ steps.version.outputs.MAJOR_VERSION }}.x
+
+      - name: Create Git tag
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git tag ${{ steps.version.outputs.PACKAGE_VERSION }} || true
+
+      - name: Push tag
+        run: git push origin ${{ steps.version.outputs.PACKAGE_VERSION }} || true
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.version.outputs.PACKAGE_VERSION }}
+          name: Release ${{ steps.version.outputs.PACKAGE_VERSION }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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.17",
+  "version": "2.1.19",
   "author": "soajs team <team@soajs.org>",
   "repository": {
     "type": "git",
@@ -29,13 +29,13 @@
     "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
     "mocha": "11.7.5",
-    "nock": "14.0.10",
-    "soajs.controller": "4.2.41"
+    "nock": "14.0.11",
+    "soajs.controller": "4.3.0"
   },
   "dependencies": {
     "async": "3.2.6",
-    "soajs": "4.1.19",
-    "soajs.core.libs": "1.2.1",
+    "soajs": "4.1.21",
+    "soajs.core.libs": "1.2.2",
     "request": "2.88.2",
     "uuid": "13.0.0"
   }

package/.travis.yml

@@ -1,72 +0,0 @@
-dist: focal
-language: node_js
-node_js: 20
-
-jobs:
-  include:
-
-  - stage: install, check code style and coverage
-    if: tag IS blank
-    services:
-    - mongodb
-    addons:
-      hosts:
-      - localhost
-    before_script:
-    - npm install -g grunt-cli
-    - sleep 10
-    script:
-    - grunt
-    - if [ "$TRAVIS_BRANCH" != "master" ]; then grunt test; fi
-    - if [ "$TRAVIS_BRANCH" = "master" ]; then grunt coverage; fi
-
-  # - stage: Publish to npm
-  #   if: branch =~ /(release)/
-  #   script:
-  #   - echo "PUBLISH npm"
-  #   deploy:
-  #     skip_cleanup: true
-  #     provider: npm
-  #     email: $NPM_EMAIL
-  #     api_key: $NPM_TOKEN
-  #     on:
-  #       all_branches: true
-  #       condition: $TRAVIS_BRANCH =~ ^(release)*
-
-  - stage: Publish to docker registry
-    if: branch =~ /(release)/
-    script:
-    - echo "PUBLISH docker"
-    - export PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -Fn '{ print $2 }' | sed 's/[n:",]//g' | tr -d '[[:space:]]')
-    - export MAJOR_VERSION=$(echo ${PACKAGE_VERSION} | awk -F. '{ print $1 }')
-    - echo Package version ${PACKAGE_VERSION}
-    - echo Major version ${MAJOR_VERSION}
-
-    - git config --local user.name ${GIT_USER}
-    - git config --local user.email ${GIT_EMAIL}
-    - git tag ${PACKAGE_VERSION}
-
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-    - docker build -t soajsorg/multitenant .
-
-    - docker images
-
-    - docker tag soajsorg/multitenant:latest soajsorg/multitenant:${PACKAGE_VERSION}
-    - docker tag soajsorg/multitenant:latest soajsorg/multitenant:${MAJOR_VERSION}.x
-
-    - docker push soajsorg/multitenant
-    - docker push soajsorg/multitenant:${PACKAGE_VERSION}
-    - docker push soajsorg/multitenant:${MAJOR_VERSION}.x
-    before_deploy:
-      - yes | gem update --system --force
-      - gem install bundler
-      - gem install faraday-net_http -v '3.3.0'
-      - gem install uri
-      - gem install logger
-    deploy:
-      on:
-        all_branches: true
-      provider: releases
-      api_key: ${GIT_TOKEN}
-      skip_cleanup: true