Merge pull request #56 from tekdi/revert-52-Issue#253954-new

Revert "Issue#254699 Feat: Supervisor > Display LC with participant"

Author: vaivk369

controllers/v1/programUsers.js

@@ -83,7 +83,6 @@ module.exports = class ProgramUsers extends Abstract {
 					entityId = '',
 					sortBy,
 					sortOrder,
-					level,
 				} = req.query
 				const { pageNo = 1, pageSize = 20 } = req
 				const meta = req.body && req.body.meta ? req.body.meta : {}
@@ -125,8 +124,7 @@ module.exports = class ProgramUsers extends Abstract {
 					req.userDetails,
 					meta,
 					sortBy,
-					finalSortOrder,
-					level ? parseInt(level) : undefined
+					finalSortOrder
 				)
 				return resolve(result)
 			} catch (error) {

generics/services/programUsers.js

@@ -138,7 +138,6 @@ module.exports = class ProgramUsersService {
 	 * @param {Object} meta - meta information for filtering
 	 * @param {String} sortBy - field to sort by
 	 * @param {String} sortOrder - sort order (asc/desc)
-	 * @param {Number} level - hierarchy level (e.g. 2 = Supervisor>LC>Participant, fetch sub-entities)
 	 * @returns {Object} entities with pagination info
 	 */
 	static async getEntitiesWithPagination(
@@ -153,8 +152,7 @@ module.exports = class ProgramUsersService {
 		userDetails,
 		meta = {},
 		sortBy = 'name',
-		sortOrder = 'asc',
-		level
+		sortOrder = 'asc'
 	) {
 		try {
 			const skip = (page - 1) * limit
@@ -193,25 +191,6 @@ module.exports = class ProgramUsersService {
 				}
 			}
 
-			// When level=2: fetch sub-entities (e.g. Supervisor>LC>Participant - get LCs + their Participants)
-			if (level === 2) {
-				const firstLevelEntities = [...filteredEntities]
-				const subEntities = []
-
-				for (const entity of firstLevelEntities) {
-					const entityUserId = entity.userId
-					if (!entityUserId) continue
-
-					const subProgramUser = await this.findByUserAndProgram(entityUserId, programId, programExternalId)
-					if (subProgramUser && subProgramUser.entities && subProgramUser.entities.length > 0) {
-						subEntities.push(...subProgramUser.entities)
-					}
-				}
-
-				// Merge: first level entities first, then sub-entities
-				filteredEntities = [...firstLevelEntities, ...subEntities]
-			}
-
 			// Filter by status if provided (supports comma-separated values)
 			if (status) {
 				// Parse comma-separated status values into an array

module/programUsers/helper.js

@@ -193,7 +193,6 @@ module.exports = class ProgramUsersHelper {
 	 * @param {Object} meta - meta information for filtering
 	 * @param {String} sortBy - field to sort by
 	 * @param {String} sortOrder - sort order (asc/desc)
-	 * @param {Number} level - hierarchy level (e.g. 2 = Supervisor>LC>Participant, fetch sub-entities)
 	 * @returns {Object} result
 	 */
 	static async getEntitiesWithPagination(
@@ -208,8 +207,7 @@ module.exports = class ProgramUsersHelper {
 		userDetails,
 		meta = {},
 		sortBy = 'name',
-		sortOrder = 'asc',
-		level
+		sortOrder = 'asc'
 	) {
 		try {
 			// Call service
@@ -225,8 +223,7 @@ module.exports = class ProgramUsersHelper {
 				userDetails,
 				meta,
 				sortBy,
-				sortOrder,
-				level
+				sortOrder
 			)
 
 			return {

module/programUsers/validator/v1.js

@@ -139,9 +139,6 @@ module.exports = (req) => {
 
 			// Validate search if provided
 			req.checkQuery('search').isString().withMessage('search must be a string').optional()
-
-			// Validate level if provided (e.g. 2 = Supervisor>LC>Participant)
-			req.checkQuery('level').optional().isInt({ min: 1 }).withMessage('level must be a positive integer')
 		},
 	}