Develop to QA DEPLOYED BRANCH ON 17-02-2026

documentation/latest/postman-collections/mentoring/MentorED-Mentoring.postman_collection.json

@@ -236,7 +236,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"value\": \"roless\",\n    \"label\": \"RolesV\",\n    \"status\": \"ACTIVE\",\n    \"type\": \"SYSTEM\",\n    \"data_type\": \"ARRAY[STRING]\",\n    \"model_names\": [\"UserExtension\",\"Session\"],\n    \"required\": true,\n    \"allow_filtering\": true\n}",
+							"raw": "{\n    \"value\": \"roless\",\n    \"label\": \"RolesV\",\n    \"status\": \"ACTIVE\",\n    \"type\": \"SYSTEM\",\n    \"data_type\": \"ARRAY[STRING]\",\n    \"model_names\": [\"UserExtension\",\"Session\"],\n    \"required\": true,\n    \"allow_filtering\": true,\n    \"meta\":{\n        \"filterType\":\"OR\"\n    }\n}",
 							"options": {
 								"raw": {
 									"language": "json"
@@ -331,7 +331,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"value\": \"roless\",\n    \"label\": \"RolesV\",\n    \"status\": \"ACTIVE\",\n    \"type\": \"SYSTEM\",\n    \"data_type\": \"ARRAY[STRING]\",\n    \"model_names\": [\"UserExtension\",\"Session\"],\n    \"required\": true\n}",
+							"raw": "{\n    \"value\": \"roless\",\n    \"label\": \"RolesV\",\n    \"status\": \"ACTIVE\",\n    \"type\": \"SYSTEM\",\n    \"data_type\": \"ARRAY[STRING]\",\n    \"model_names\": [\"UserExtension\",\"Session\"],\n    \"required\": true,\n    \"meta\":{\n        \"filterType\":\"AND\"\n    }\n}",
 							"options": {
 								"raw": {
 									"language": "json"

src/.env.sample

@@ -113,6 +113,7 @@ DEFAULT_TENANT_CODE='DEFAULT'
 
 # Email template codes
 MENTEE_SESSION_ENROLLMENT_BY_MANAGER_EMAIL_TEMPLATE= 'mentee_session_enrollment_by_manager'
+MENTEE_PUBLIC_SESSION_ENROLLMENT_BY_MANAGER_EMAIL_TEMPLATE= 'mentee_public_session_enrollment_by_manager'
 MENTOR_PRIVATE_SESSION_INVITE_BY_MANAGER_EMAIL_TEMPLATE= 'mentor_invite_private_session_by_manager'
 MENTOR_PUBLIC_SESSION_INVITE_BY_MANAGER_EMAIL_TEMPLATE= 'mentor_invite_public_session_by_manager'
 MENTOR_SESSION_DELETE_BY_MANAGER_EMAIL_TEMPLATE= 'session_deleted_by_manager'
@@ -172,6 +173,10 @@ ADMIN_TOKEN_HEADER_NAME='admin-auth-token'
 # The header name used to pass the organization ID in HTTP requests. This helps identify the organization associated with the request.
 ORG_ID_HEADER_NAME='organization-id'
 
+# Header names used by admins to override the target org/tenant when calling APIs on behalf of another organization or tenant.
+ORG_CODE_HEADER_NAME='x-org-code'
+TENANT_CODE_HEADER_NAME='x-tenant-code'
+
 # Flag to enable/disable chat chapabilities
 ENABLE_CHAT=true
 
@@ -191,4 +196,6 @@ KAFKA_HEALTH_CHECK_TOPIC='mentoring-health-check-topic-check'
 SERVICE_NAME='MentoringService'
 
 #To disable logs for healthCheck
-HEALTH_CHECK_DEBUG_MODE='false'
+HEALTH_CHECK_DEBUG_MODE='false'
+EVENT_TENANT_KAFKA_TOPIC='tenantEvent'
+EVENT_ORGANIZATION_KAFKA_TOPIC='organizationEvent'

src/api-doc/api-doc.yaml

@@ -5896,6 +5896,15 @@ paths:
                   type: string
                 type:
                   type: string
+                meta:
+                  type: object
+                  properties:
+                    filterType:
+                      type: string
+                      enum:
+                        - OR
+                        - AND
+
             examples:
               example1:
                 value:
@@ -5908,6 +5917,8 @@ paths:
                   required: true
                   status: ACTIVE
                   type: SYSTEM
+                  meta:
+                    filterType: OR
               example2:
                 value:
                   value: pgender
@@ -5962,6 +5973,11 @@ paths:
                         type: 'null'
                       has_entities:
                         type: boolean
+                      meta:
+                        type: object
+                        properties:
+                          filterType:
+                            type: string
                   field_0:
                     type: string
                   meta:
@@ -5988,6 +6004,8 @@ paths:
                       updated_at: '2023-09-22T12:40:19.817Z'
                       created_at: '2023-09-22T12:40:19.817Z'
                       has_entities: true
+                      meta:
+                        filterType: OR
                     meta:
                       correlation: 3babe76b-d277-4073-8a59-8dfb94face9b
                       meeting_platform: BBB
@@ -6228,6 +6246,14 @@ paths:
                   type: boolean
                 required:
                   type: boolean
+                meta:
+                  type: object
+                  properties:
+                    filterType:
+                      type: string
+                      enum:
+                        - OR
+                        - AND
             examples:
               example1:
                 value:
@@ -6240,6 +6266,8 @@ paths:
                     - UserExtension
                   allow_filtering: true
                   required: true
+                  meta:
+                    filterType: OR
               example2:
                 value:
                   value: pgender
@@ -6296,6 +6324,11 @@ paths:
                         type: string
                       has_entities:
                         type: boolean
+                      meta:
+                        type: object
+                        properties:
+                          filterType:
+                            type: string
                   meta:
                     type: object
                     properties:
@@ -6322,6 +6355,8 @@ paths:
                       deleted_at: null
                       organization_id: '1'
                       has_entities: true
+                      meta:
+                        filterType: OR
                     meta:
                       correlation: 5f384234-cd5a-467e-a5ac-b43365d2a7a3
                       meeting_platform: BBB

src/configs/kafka.js

@@ -14,6 +14,7 @@ const rolechangeConsumer = require('@generics/kafka/consumers/rolechange')
 const createuserConsumer = require('@generics/kafka/consumers/createuser')
 const updateuserConsumer = require('@generics/kafka/consumers/updateuser')
 const organizationConsumer = require('@generics/kafka/consumers/organization')
+const tenantConsumer = require('@generics/kafka/consumers/tenant')
 
 module.exports = async () => {
 	const kafkaIps = process.env.KAFKA_URL.split(',')
@@ -48,7 +49,12 @@ async function startConsumer(kafkaClient) {
 
 	await consumer.connect()
 
-	const topics = [process.env.EVENTS_TOPIC, process.env.CLEAR_INTERNAL_CACHE].filter(Boolean)
+	const topics = [
+		process.env.EVENTS_TOPIC,
+		process.env.CLEAR_INTERNAL_CACHE,
+		process.env.EVENT_TENANT_KAFKA_TOPIC,
+		process.env.EVENT_ORGANIZATION_KAFKA_TOPIC,
+	].filter(Boolean)
 	await consumer.subscribe({ topics })
 
 	await consumer.run({
@@ -77,8 +83,13 @@ async function startConsumer(kafkaClient) {
 
 				let response
 
-				if (payload && topic === process.env.EVENTS_TOPIC) {
-					// Handle organization events
+				if (payload && topic === process.env.EVENT_TENANT_KAFKA_TOPIC) {
+					if (payload.eventType === 'create' || payload.eventType === 'update') {
+						response = await tenantConsumer.messageReceived(payload)
+					}
+				}
+
+				if (payload && topic === process.env.EVENT_ORGANIZATION_KAFKA_TOPIC) {
 					if (
 						payload.entity === 'organization' &&
 						(payload.eventType === 'create' ||
@@ -87,6 +98,9 @@ async function startConsumer(kafkaClient) {
 					) {
 						response = await organizationConsumer.messageReceived(payload)
 					}
+				}
+
+				if (payload && topic === process.env.EVENTS_TOPIC) {
 					if (payload.entity === 'user') {
 						if (payload.eventType === 'roleChange') {
 							response = await rolechangeConsumer.messageReceived(payload)
@@ -102,18 +116,18 @@ async function startConsumer(kafkaClient) {
 						}
 					}
 				}
-				if (payload && topic === process.env.CLEAR_INTERNAL_CACHE) {
-					if (payload.type === 'CLEAR_INTERNAL_CACHE') {
-						response = await utils.internalDel(payload.value)
-					}
-				}
+				// if (payload && topic === process.env.CLEAR_INTERNAL_CACHE) {
+				// 	if (payload.type === 'CLEAR_INTERNAL_CACHE') {
+				// 		response = await utils.internalDel(payload.value)
+				// 	}
+				// }
 
 				logger.info(`Kafka event handling response : ${response}`)
 			} catch (err) {
 				logger.error(`Error in Kafka message handler for topic ${topic}`, {
 					topic,
 					partition,
-					offset,
+					offset: message.offset,
 					err: err?.stack || err?.message || String(err),
 				})
 			}

src/constants/common.js

@@ -317,4 +317,7 @@ module.exports = {
 		ASCENDING: 'ASC',
 		DESCENDING: 'DESC',
 	},
+	TENANT_ADMIN_ROLE: 'tenant_admin',
+	ORG_CODE_HEADER: (process.env.ORG_CODE_HEADER_NAME || 'x-org-code').toLowerCase(),
+	TENANT_CODE_HEADER: (process.env.TENANT_CODE_HEADER_NAME || 'x-tenant-code').toLowerCase(),
 }

src/controllers/v1/notification.js

@@ -29,14 +29,6 @@ module.exports = class NotificationTemplate {
 
 	async template(req) {
 		try {
-			if (!utilsHelper.validateRoleAccess(req.decodedToken.roles, [common.ADMIN_ROLE, common.ORG_ADMIN_ROLE])) {
-				throw responses.failureResponse({
-					message: 'USER_IS_NOT_A_ADMIN',
-					statusCode: httpStatusCode.bad_request,
-					responseCode: 'CLIENT_ERROR',
-				})
-			}
-
 			if (req.method === common.PATCH_METHOD) {
 				const updatedTemplate = await notificationService.update(
 					req.params.id,

src/controllers/v1/notifications.js

@@ -34,7 +34,7 @@ module.exports = class Notifications {
 			notificationsService.sendNotification(
 				req.body.job_id,
 				req.body.email_template_code,
-				req.body.job_creator_org_id ? req.body.job_creator_org_id : '',
+				req.body.org_code || '',
 				tenantCode
 			)
 			return {

src/controllers/v1/sessions.js

@@ -241,15 +241,25 @@ module.exports = class Sessions {
 		try {
 			let tenantCode = req.decodedToken?.tenant_code
 			let orgCode = req.decodedToken?.organization_code
+
+			// For scheduler service callbacks: tenant_code and org_code come in the request body
+			if (!tenantCode && req.body?.tenant_code) {
+				tenantCode = req.body.tenant_code
+			}
+			if (!orgCode && req.body?.org_code) {
+				orgCode = req.body.org_code
+			}
+
 			// Enhanced: Check query parameters first (from BBB callback with enhanced isolation)
 			if (!tenantCode && req.query.tenantCode) {
 				tenantCode = req.query.tenantCode
 			}
 
-			// For scheduled jobs or BBB callbacks without tokens, get tenant_code from session
-			if (!tenantCode) {
-				const sessionData = await sessionService.getSessionTenantCode(req.params.id, tenantCode)
-				tenantCode = sessionData?.tenant_code
+			// For BBB callbacks or any other case without tokens/body — fetch from session
+			if (!tenantCode || !orgCode) {
+				const sessionData = await sessionService.getSessionTenantCode(req.params.id, orgCode)
+				if (!tenantCode) tenantCode = sessionData?.tenant_code
+				if (!orgCode) orgCode = sessionData?.org_code
 			}
 
 			const isBBB = req.query.source == common.BBB_VALUE ? true : false