Merge pull request #1533 from GitVivekHub/Search-By-id-feature

Customer Request #227746 [BE] Search by id filter feature added
tekdi · Sep 25, 2024 · 8eeb9a3 · 8eeb9a3
2 parents 12553b9 + a722d83
commit 8eeb9a3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 33 deletions.
diff --git a/src/src/beneficiaries/beneficiaries.service.ts b/src/src/beneficiaries/beneficiaries.service.ts
@@ -743,32 +743,36 @@ export class BeneficiariesService {
 			let first_name = body.search.split(' ')[0];
 			let last_name = body.search.split(' ')[1] || '';
 
-			if (last_name?.length > 0) {
-				filterQueryArray.push(`{ _or: [
-					{ first_name: { _ilike: "%${first_name}%" } },
-					{ last_name: { _ilike: "%${last_name}%" } },
+			if (/^\d+$/.test(body?.search)) {
+				filterQueryArray.push(`{id: { _eq: "${body?.search}"} }`);
+			} else {
+				if (last_name?.length > 0) {
+					filterQueryArray.push(`{ _or: [
+						{ first_name: { _ilike: "%${first_name}%" } },
+						{ last_name: { _ilike: "%${last_name}%" } },
+						{
+							program_beneficiaries: {
+								_or: [
+									{ enrollment_first_name: { _ilike: "%${first_name}%" } },
+									{ enrollment_last_name: { _ilike: "%${last_name}%" } }
+								]
+							}
+						}
+					]} `);
+				} else {
+					filterQueryArray.push(`{_or: [
+					{ first_name: { _ilike: "%${first_name}%" } }
+					{ last_name: { _ilike: "%${first_name}%" } }
 					{
 						program_beneficiaries: {
 							_or: [
 								{ enrollment_first_name: { _ilike: "%${first_name}%" } },
-								{ enrollment_last_name: { _ilike: "%${last_name}%" } }
+								{ enrollment_last_name: { _ilike: "%${first_name}%" } }
 							]
 						}
 					}
-				]} `);
-			} else {
-				filterQueryArray.push(`{_or: [
-				{ first_name: { _ilike: "%${first_name}%" } }
-				{ last_name: { _ilike: "%${first_name}%" } }
-				{
-					program_beneficiaries: {
-						_or: [
-							{ enrollment_first_name: { _ilike: "%${first_name}%" } },
-							{ enrollment_last_name: { _ilike: "%${first_name}%" } }
-						]
-					}
+					 ]} `);
 				}
-				 ]} `);
 			}
 		}
 
@@ -900,6 +904,7 @@ export class BeneficiariesService {
 				offset: offset,
 			},
 		};
+
 		const response = await this.hasuraServiceFromServices.getData(data);
 		let mappedResponse = response?.data?.users;
 		const count = response?.data?.users_aggregate?.aggregate?.count;
@@ -1002,16 +1007,20 @@ export class BeneficiariesService {
 			let first_name = body.search.split(' ')[0];
 			let last_name = body.search.split(' ')[1] || '';
 
-			if (last_name?.length > 0) {
-				filterQueryArray.push(`{_or: [
-				{ first_name: { _ilike: "%${first_name}%" } }
-				{ last_name: { _ilike: "%${last_name}%" } }
-				 ]} `);
+			if (/^\d+$/.test(body?.search)) {
+				filterQueryArray.push(`{id: { _eq: "${body?.search}"} }`);
 			} else {
-				filterQueryArray.push(`{_or: [
-				{ first_name: { _ilike: "%${first_name}%" } }
-				{ last_name: { _ilike: "%${first_name}%" } }
-				 ]} `);
+				if (last_name?.length > 0) {
+					filterQueryArray.push(`{_or: [
+					{ first_name: { _ilike: "%${first_name}%" } }
+					{ last_name: { _ilike: "%${last_name}%" } }
+					 ]} `);
+				} else {
+					filterQueryArray.push(`{_or: [
+					{ first_name: { _ilike: "%${first_name}%" } }
+					{ last_name: { _ilike: "%${first_name}%" } }
+					 ]} `);
+				}
 			}
 		}
 		if (body?.is_deactivated && body?.is_deactivated !== '') {

diff --git a/src/src/facilitator/facilitator.service.ts b/src/src/facilitator/facilitator.service.ts
@@ -1571,12 +1571,16 @@ export class FacilitatorService {
 			);
 			variables.qualificationIds = body.qualificationIds;
 		}
-		if (body.search && body.search !== '') {
-			filterQueryArray.push(`{_or: [
-		{ first_name: { _ilike: "%${body.search}%" } },
-		{ last_name: { _ilike: "%${body.search}%" } },
-		{ email_id: { _ilike: "%${body.search}%" } }
-	  ]} `);
+		if (body?.search && body?.search !== '') {
+			if (/^\d+$/.test(body?.search)) {
+				filterQueryArray.push(`{id: { _eq: "${body?.search}"} }`);
+			} else {
+				filterQueryArray.push(`{_or: [
+					{ first_name: { _ilike: "%${body.search}%" } },
+					{ last_name: { _ilike: "%${body.search}%" } },
+					{ email_id: { _ilike: "%${body.search}%" } }
+				  ]} `);
+			}
 		}
 		if (body.hasOwnProperty('status')) {
 			if (