Partial unique index on user_roles; composite lookups, new validators

src/database/migrations/20250925122507-update-unique-user-roles.js

@@ -0,0 +1,32 @@
+// 20250925120000-update-unique-user-roles.js
+module.exports = {
+	up: async (queryInterface, Sequelize) => {
+		const table = 'user_roles'
+
+		// drop old constraint if it exists
+		await queryInterface.sequelize.query(
+			`ALTER TABLE "${table}" DROP CONSTRAINT IF EXISTS unique_title_org_id_tenant_code;`
+		)
+
+		// create partial unique index ignoring soft-deleted rows
+		await queryInterface.sequelize.query(
+			`CREATE UNIQUE INDEX IF NOT EXISTS unique_title_org_id_tenant_code 
+       ON "${table}" (title, organization_id, tenant_code) 
+       WHERE deleted_at IS NULL;`
+		)
+	},
+
+	down: async (queryInterface, Sequelize) => {
+		const table = 'user_roles'
+
+		// drop the partial index
+		await queryInterface.sequelize.query(`DROP INDEX IF EXISTS unique_title_org_id_tenant_code;`)
+
+		// restore original constraint (no WHERE clause)
+		await queryInterface.addConstraint(table, {
+			fields: ['title', 'organization_id', 'tenant_code'],
+			type: 'unique',
+			name: 'unique_title_org_id_tenant_code',
+		})
+	},
+}

src/generics/utils.js

@@ -802,7 +802,7 @@ async function fetchAndMapAllExternalEntities(entities, service, endPoint, tenan
 		},
 		data: {
 			query: {
-				'metaInformation.name': {
+				'metaInformation.externalId': {
 					$in: entities, // Dynamically pass the array here
 				},
 				tenantId: tenantCode,
@@ -818,7 +818,11 @@ async function fetchAndMapAllExternalEntities(entities, service, endPoint, tenan
 		})
 
 	responseBody = data.reduce((acc, { _id, entityType, metaInformation }) => {
-		const key = metaInformation?.name?.replaceAll(/\s+/g, '').toLowerCase()
+		const normalize = (s) => (s ?? '').toString().replace(/\s+/g, '').toLowerCase()
+		const namePart = normalize(metaInformation?.externalId)
+		const typePart = normalize(entityType)
+		if (!namePart || !typePart) return acc
+		const key = `${namePart}${typePart}`
 		if (key) {
 			acc[key] = { _id, name: metaInformation?.name, entityType, externalId: metaInformation.externalId }
 		}

src/helpers/userInvite.js

@@ -273,31 +273,59 @@ module.exports = class UserInviteHelper {
 					// Extract and prepare meta fields
 					row.meta = {
 						block: row?.block
-							? externalEntityNameIdMap?.[row.block?.replaceAll(/\s+/g, '').toLowerCase()]?._id || null
+							? externalEntityNameIdMap?.[
+									`${row.block?.replaceAll(/\s+/g, '').toLowerCase()}${'block'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || null
 							: '',
 						state: row?.state
-							? externalEntityNameIdMap?.[row.state?.replaceAll(/\s+/g, '').toLowerCase()]?._id || null
+							? externalEntityNameIdMap?.[
+									`${row.state?.replaceAll(/\s+/g, '').toLowerCase()}${'state'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || null
 							: '',
 						school: row?.school
-							? externalEntityNameIdMap?.[row.school?.replaceAll(/\s+/g, '').toLowerCase()]?._id || null
+							? externalEntityNameIdMap?.[
+									`${row.school?.replaceAll(/\s+/g, '').toLowerCase()}${'school'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || null
 							: '',
 						cluster: row?.cluster
-							? externalEntityNameIdMap?.[row.cluster?.replaceAll(/\s+/g, '').toLowerCase()]?._id || null
+							? externalEntityNameIdMap?.[
+									`${row.cluster?.replaceAll(/\s+/g, '').toLowerCase()}${'cluster'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || null
 							: '',
 						district: row?.district
-							? externalEntityNameIdMap?.[row.district?.replaceAll(/\s+/g, '').toLowerCase()]?._id || null
+							? externalEntityNameIdMap?.[
+									`${row.district?.replaceAll(/\s+/g, '').toLowerCase()}${'district'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || null
 							: '',
 						professional_role: row?.professional_role
-							? externalEntityNameIdMap?.[row.professional_role?.replaceAll(/\s+/g, '').toLowerCase()]
-									?._id || ''
+							? externalEntityNameIdMap?.[
+									`${row.professional_role?.replaceAll(/\s+/g, '').toLowerCase()}${'professional_role'
+										.replaceAll(/\s+/g, '')
+										.toLowerCase()}`
+							  ]?._id || ''
 							: '',
 						professional_subroles: row?.professional_subroles
 							? row.professional_subroles
 									.split(',')
 									.map(
 										(prof_subRole) =>
-											externalEntityNameIdMap[prof_subRole?.replaceAll(/\s+/g, '').toLowerCase()]
-												?._id
+											externalEntityNameIdMap[
+												`${prof_subRole
+													?.replaceAll(/\s+/g, '')
+													.toLowerCase()}${'professional_subroles'
+													.replaceAll(/\s+/g, '')
+													.toLowerCase()}`
+											]?._id
 									) || []
 							: [],
 					}

src/locales/en.json

@@ -85,6 +85,9 @@
 	"ORG_ROLE_REQ_UPDATED": "Organisation request updated",
 	"FILE_UPLOAD_MODIFY_ERROR": "File update failed",
 	"STATUS_UPDATE_FAILED": "Failed to deactivate user",
+	"ORG_DEACTIVATION_FAILED": "Failed to deactivate organisation.",
+	"ORG_NOT_FOUND": "Organisation not found.",
+	"ORG_ALREADY_INACTIVE": "Organisation is already inactive.",
 	"USER_DEACTIVATED": "User deactivated Successfully",
 	"USER_CSV_UPLOADED_FAILED": "Failed to Uploaded User Invites CSV",
 	"ORG_DEACTIVATED": "Organization deactivated Successfully",
@@ -178,5 +181,6 @@
 	"ORG_UNIQUE_CONSTRAIN_ERROR": "Organization Creation / Updation Failed. code / registration_code not unique.",
 	"REG_CODE_ERROR": "registration_code is not valid or unique.",
 	"INVALID_REG_CODE_ERROR": "registration_codes {{errorMessage}}. Invalid Code(s) : {{errorValues}}",
-	"UNIQUE_CONSTRAINT_ERROR": "{{fields}} is Invalid."
+	"UNIQUE_CONSTRAINT_ERROR": "{{fields}} is Invalid.",
+	"USER_PROFILE_FETCHED_SUCCESSFULLY": "User profile fetched successfully!"
 }

src/sample.csv

@@ -1,4 +1,4 @@
 "name","email","phone_code","phone","username","password","roles","state","district","block","cluster","school","professional_role","professional_subroles"
-"SarahB","sarahB@tunerlabs.com","+91","7012345499","sarahB_tunerlabs","Password@123","mentee","Karnataka","BENGALURU RURAL","NELAMANGALA","BASAVANAHALLI","SHARADA HPS","Teacher","Teacher (Class 1-5)"
-"JohnB","johnB@tunerlabs.com","+91","7012345599","johnB_honai","Password@123","mentor","Karnataka","BENGALURU RURAL","NELAMANGALA","BASAVANAHALLI","SHARADA HPS","Teacher","Teacher (Class 1-5)"
-"PradeepB","pradeepB@tunerlabs.com","+91","7012345699","pradeepB_tl","Password@123","mentor,session_manager","Karnataka","BENGALURU RURAL","NELAMANGALA","BASAVANAHALLI","SHARADA HPS","Teacher","Teacher (Class 1-5)"
+"SarahB","sarahB@tunerlabs.com","+91","7012345499","sarahB_tunerlabs","Password@123","mentee",16,1603,160301,1603010007,16030100406,student,"student-preschool-class-2,student-class-1-5"
+"JohnB","johnB@tunerlabs.com","+91","7012345599","johnB_honai","Password@123","mentor",16,1603,160301,1603010007,16030100406,student,"student-preschool-class-2,student-class-1-5"
+"PradeepB","pradeepB@tunerlabs.com","+91","7012345699","pradeepB_tl","Password@123","mentor,session_manager",16,1603,160301,1603010007,16030100406,student,"student-preschool-class-2,student-class-1-5"

src/services/admin.js

@@ -651,6 +651,26 @@ module.exports = class AdminHelper {
 
 	static async deactivateOrg(organizationCode, tenantCode, loggedInUserId) {
 		try {
+			const org = await organizationQueries.findOne({ code: organizationCode, tenant_code: tenantCode })
+
+			if (!org) {
+				return responses.failureResponse({
+					message: 'ORG_NOT_FOUND',
+					statusCode: httpStatusCode.not_found,
+					responseCode: 'CLIENT_ERROR',
+				})
+			}
+
+			if (org.status === common.INACTIVE_STATUS) {
+				return responses.failureResponse({
+					message: 'ORG_ALREADY_INACTIVE',
+					statusCode: httpStatusCode.bad_request,
+					responseCode: 'CLIENT_ERROR',
+				})
+			}
+
+			// proceed with update
+
 			// 1. Deactivate org
 			const orgRowsAffected = await organizationQueries.update(
 				{
@@ -663,9 +683,9 @@ module.exports = class AdminHelper {
 				}
 			)
 
-			if (orgRowsAffected === 0) {
+			if (!orgRowsAffected) {
 				return responses.failureResponse({
-					message: 'STATUS_UPDATE_FAILED',
+					message: 'ORG_DEACTIVATION_FAILED',
 					statusCode: httpStatusCode.bad_request,
 					responseCode: 'CLIENT_ERROR',
 				})

src/validators/v1/admin.js

@@ -163,4 +163,18 @@ module.exports = {
 			req.checkBody(field).isArray().notEmpty().withMessage(` ${field} must be an array and should not be empty.`)
 		}
 	},
+
+	deactivateOrg: (req) => {
+		req.checkParams('id')
+			.notEmpty()
+			.withMessage('id is required and should not be empty.')
+			.matches(/^[a-z0-9_]+$/)
+			.withMessage('id must be lowercase alphanumeric with underscores.')
+
+		req.checkHeaders('tenant-id')
+			.notEmpty()
+			.withMessage('tenant-id is required and should not be empty.')
+			.matches(/^[a-z0-9_]+$/)
+			.withMessage('tenant-id must be lowercase alphanumeric with underscores.')
+	},
 }

src/validators/v1/organization.js

@@ -27,7 +27,7 @@ module.exports = {
 			.trim()
 			.notEmpty()
 			.withMessage('name field is empty')
-			.matches(/^[A-Za-z ]+$/)
+			.matches(/^[A-Za-z0-9 ]+$/)
 			.withMessage('name is invalid')
 
 		req.checkBody('description')
@@ -47,7 +47,7 @@ module.exports = {
 			.trim()
 			.notEmpty()
 			.withMessage('name field is empty')
-			.matches(/^[A-Za-z ]+$/)
+			.matches(/^[A-Za-z0-9 ]+$/)
 			.withMessage('name is invalid')
 
 		req.checkBody('description')

src/validators/v1/user-role.js

@@ -1,5 +1,6 @@
 const filterRequestBody = require('../common')
 const { userRole } = require('@constants/blacklistConfig')
+const common = require('@constants/common')
 const validateList = (req, allowedVariables) => {
 	allowedVariables.forEach((variable) => {
 		req.checkQuery(variable)
@@ -12,88 +13,117 @@ const validateList = (req, allowedVariables) => {
 module.exports = {
 	create: (req) => {
 		req.body = filterRequestBody(req.body, userRole.create)
+
 		req.checkBody('title')
 			.trim()
 			.notEmpty()
-			.withMessage('title field is empty')
+			.withMessage('title is required')
 			.matches(/^[a-z_]+$/)
-			.withMessage('title is invalid, must not contain spaces')
+			.withMessage('title must contain only lowercase letters (a–z) and underscores')
 
 		req.checkBody('user_type')
 			.trim()
 			.notEmpty()
-			.withMessage('userType field is empty')
-			.matches(/^[0-9]+$/)
-			.withMessage('userType is invalid, must not contain spaces')
+			.withMessage('user_type is required')
+			.isIn(['0', '1'])
+			.withMessage('user_type must be 0 (non-admin) or 1 (admin)')
 
 		req.checkBody('visibility')
 			.trim()
 			.notEmpty()
-			.withMessage('visibility field is empty')
-			.matches(/^[A-Z_]+$/)
-			.withMessage('visibility is invalid, must not contain spaces')
+			.withMessage('visibility is required')
+			.isIn(['PUBLIC'])
+			.withMessage('visibility must be PUBLIC')
 
 		req.checkBody('label')
 			.trim()
 			.notEmpty()
-			.withMessage('label field is empty')
+			.withMessage('label is required')
 			.matches(/^[A-Z][a-zA-Z\s]*$/)
-			.withMessage('label is invalid, first letter must be capital')
+			.withMessage('label must start with an uppercase letter and contain only letters and spaces')
+			.isLength({ max: 50 })
+			.withMessage('label must be at most 50 characters')
 
 		req.checkBody('status')
 			.trim()
-			.matches(/^[A-Za-z]*$/)
-			.withMessage('status is invalid, must not contain spaces')
 			.optional({ checkFalsy: true })
-			.notEmpty()
-			.withMessage('status field must be a non-empty string when provided')
+			.isIn([common.ACTIVE_STATUS, common.INACTIVE_STATUS])
+			.withMessage(`status must be either ${common.ACTIVE_STATUS} or ${common.INACTIVE_STATUS} when provided`)
 	},
 
 	update: (req) => {
 		req.body = filterRequestBody(req.body, userRole.update)
-		req.checkParams('id').notEmpty().withMessage('id param is empty')
+
+		req.checkParams('id').notEmpty().withMessage('id param is required')
 
 		req.checkBody('title')
 			.trim()
 			.notEmpty()
-			.withMessage('title field is empty')
+			.withMessage('title is required')
 			.matches(/^[a-z_]+$/)
-			.withMessage('title is invalid, must not contain spaces')
+			.withMessage('title must contain only lowercase letters (a–z) and underscores')
 
 		req.checkBody('user_type')
 			.trim()
 			.notEmpty()
-			.withMessage('userType field is empty')
-			.matches(/^[0-9]+$/)
-			.withMessage('userType is invalid, must not contain spaces')
+			.withMessage('user_type is required')
+			.isIn(['0', '1'])
+			.withMessage('user_type must be 0 (non-admin) or 1 (admin)')
 
 		req.checkBody('visibility')
 			.trim()
 			.notEmpty()
-			.withMessage('visibility field is empty')
-			.matches(/^[A-Z_]+$/)
-			.withMessage('visibility is invalid, must not contain spaces')
+			.withMessage('visibility is required')
+			.isIn(['PUBLIC'])
+			.withMessage('visibility must be PUBLIC')
 
 		req.checkBody('status')
 			.trim()
-			.matches(/^[A-Za-z]*$/)
-			.withMessage('status is invalid, must not contain spaces')
 			.optional({ checkFalsy: true })
-			.notEmpty()
-			.withMessage('status field must be a non-empty string when provided')
-	},
+			.isIn([common.ACTIVE_STATUS, common.INACTIVE_STATUS])
+			.withMessage(`status must be either ${common.ACTIVE_STATUS} or ${common.INACTIVE_STATUS} when provided`)
 
+		req.checkBody('label')
+			.trim()
+			.optional()
+			.matches(/^[A-Z][a-zA-Z\s]*$/)
+			.withMessage('label must start with an uppercase letter and contain only letters and spaces')
+			.isLength({ max: 50 })
+			.withMessage('label must be at most 50 characters')
+	},
 	delete: (req) => {
 		req.checkParams('id').notEmpty().withMessage('id param is empty')
 	},
 
 	list: (req) => {
-		const allowedVariables = ['title', 'user_type', 'visibility', 'organization_id', 'status']
-		validateList(req, allowedVariables)
-	},
+		req.checkQuery('title')
+			.optional()
+			.trim()
+			.matches(/^[a-z_]+$/)
+			.withMessage('title is invalid. Use only lowercase letters a–z and underscores')
+
+		req.checkQuery('user_type')
+			.optional()
+			.trim()
+			.isIn(['0', '1'])
+			.withMessage('user_type is invalid. Allowed values: 0 (non-admin) or 1 (admin)')
+
+		req.checkQuery('visibility')
+			.optional()
+			.trim()
+			.isIn(['PUBLIC'])
+			.withMessage('visibility is invalid. Allowed value: PUBLIC')
+
+		req.checkQuery('status')
+			.optional()
+			.trim()
+			.isIn([common.ACTIVE_STATUS, common.INACTIVE_STATUS])
+			.withMessage(`status must be either ${common.ACTIVE_STATUS} or ${common.INACTIVE_STATUS} when provided`)
 
-	default: (req) => {
-		const allowedVariables = ['title', 'user_type', 'visibility', 'organization_id', 'status']
-		validateList(req, allowedVariables)
+		req.checkQuery('organization_id')
+			.optional()
+			.trim()
+			.matches(/^[0-9]+$/)
+			.withMessage('organization_id is invalid. Must be numeric')
 	},
 }