Merge pull request #949 from tekdi/release-1.7.5

Merge `Release 1.7.5` into `Feat leanar revamp`
tekdi · Mar 26, 2024 · 909e893 · 909e893
2 parents 3298951 + 09c2231
commit 909e893
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 6 deletions.
diff --git a/src/src/beneficiaries/beneficiaries.service.ts b/src/src/beneficiaries/beneficiaries.service.ts
@@ -3650,7 +3650,7 @@ export class BeneficiariesService {
 				document_sub_type
 				path
 			  }
-			  program_beneficiaries {
+			  program_beneficiaries(where:{program_id: {_eq:${program_id}}, academic_year_id: {_eq:${academic_year_id}}}) {
 				status,
 				enrollment_first_name,
 				enrollment_middle_name,

diff --git a/src/src/camp/camp.service.ts b/src/src/camp/camp.service.ts
@@ -819,7 +819,11 @@ export class CampService {
 			};
 		}
 
-		if (campData?.group_users[0]?.user_id != facilitator_id) {
+		if (
+			campData?.group_users[0]?.user_id != facilitator_id ||
+			(campData?.group?.status === 'inactive' &&
+				update_body?.edit_page_type !== 'edit_learners')
+		) {
 			return {
 				status: 401,
 				success: false,
@@ -1210,11 +1214,77 @@ export class CampService {
 					)
 					.map((item) => item.user_id);
 
+				// get learners id from program_beneficiaries from deactiveLearnerIds
+				let data = {
+					query: `query MyQuery {
+					program_beneficiaries(where: {user_id: {_in: [${deactiveLearnerIds}]}}) {
+						id
+						user_id
+						status
+					}
+				}`,
+				};
+				const resp = await this.hasuraServiceFromServices.getData({
+					query: data.query,
+				});
+
+				let programbeneficiariesdata =
+					resp?.data?.program_beneficiaries || [];
+
+				// get program_beneficiaires id who's status want to update
+				const programbeneficiaries = programbeneficiariesdata.map(
+					(item) => item.id,
+				);
+
+				//update learner status in program_beneficiaires removed from change_request
+				if (programbeneficiaries?.length > 0) {
+					resultActive = await this.hasuraServiceFromServices.update(
+						null,
+						'program_beneficiaries',
+						{
+							status: 'enrolled_ip_verified',
+							updated_by: facilitator_id,
+						},
+						[],
+						['id', 'status'],
+						{ where: `{id:{_in:[${programbeneficiaries}]}}` },
+					);
+
+					const activeIdsAuditData = programbeneficiariesdata.map(
+						(item) => ({
+							user_id: item.user_id,
+							user_type: 'Facilitator',
+							updated_by_user: facilitator_id,
+							context: 'campBeneficiaryStatus',
+							context_id: camp_id,
+							subject: 'beneficiary',
+							subject_id: item.user_id,
+							log_transaction_text: JSON.stringify(
+								`Facilitator ${facilitator_id} updated beneficiary ${item.user_id} status from ${item.status} to enrolled_ip_verified`,
+							),
+							old_data: JSON.stringify(
+								`{ learner_id: ${item.user_id},status:${item.status} }`,
+							),
+							new_data: JSON.stringify(
+								`{ learner_id: ${item.user_id},status:enrolled_ip_verified }`,
+							),
+							action: 'update',
+						}),
+					);
+					if (activeIdsAuditData?.length > 0) {
+						resultCreate = await this.hasuraServiceFromServices.qM(
+							'insert_audit_logs',
+							activeIdsAuditData,
+							[],
+							['id'],
+						);
+					}
+				}
+
 				if (
 					deactivateIds.length > 0 &&
 					(camp_status == 'registered' ||
-						camp_status == 'camp_ip_verified' ||
-						camp_status == 'change_required')
+						camp_status == 'camp_ip_verified')
 				) {
 					return {
 						status: 422,
@@ -1235,6 +1305,40 @@ export class CampService {
 					);
 				}
 
+				if (camp_status === 'inactive') {
+					let updatebody = {
+						status: 'camp_initiated',
+					};
+					let updatStatus = await this.hasuraService.q(
+						'groups',
+						{
+							...updatebody,
+							id: group_id,
+						},
+						['status'],
+						true,
+						['id', 'status'],
+					);
+
+					let auditData = {
+						userId: facilitator_id,
+						mw_userid: facilitator_id,
+						user_type: 'Facilitator',
+						context: 'camp.update.status',
+						context_id: camp_id,
+						subject: 'camp',
+						subject_id: camp_id,
+						log_transaction_text: `Facilitator ${facilitator_id} updated camp status of camp ${camp_id}`,
+						oldData: { status: camp_status },
+						newData: { status: 'camp_initiated' },
+						tempArray: ['status'],
+						action: 'update',
+						sortedData: true,
+					};
+
+					await this.userService.addAuditLogAction(auditData);
+				}
+
 				const createAuditData = learner_ids
 					.filter(
 						(id) =>

diff --git a/src/src/facilitator/facilitator.service.ts b/src/src/facilitator/facilitator.service.ts
@@ -1846,7 +1846,7 @@ export class FacilitatorService {
 			user_id
 			type
 		  }
-		  program_faciltators {
+		  program_faciltators(where: {academic_year_id: {_eq:${academic_year_id}}, program_id: {_eq:${program_id}}}) {
 			parent_ip
 			availability
 			id
@@ -1895,7 +1895,7 @@ export class FacilitatorService {
 			  id
 			}
 		  }
-		  events {
+		  events(where: {academic_year_id: {_eq:${academic_year_id}}, program_id: {_eq:${program_id}}}) {
 			context
 			context_id
 			created_by
@@ -1913,6 +1913,7 @@ export class FacilitatorService {
 	  }`,
 			variables: variables,
 		};
+
 		let response;
 		try {
 			response = await this.hasuraService.getData(data);

diff --git a/src/src/lms/lms.service.ts b/src/src/lms/lms.service.ts
@@ -604,6 +604,7 @@ export class LMSService {
 					attendance_count
 					events(where: {context: {_eq: "events"}}) {
 						name
+						id
 					}
 				}
 			  }
-Original file line number
+Diff line change
@@ Expand Up / @@ -604,6 +604,7 @@ export class LMSService { @@
     					attendance_count
     					events(where: {context: {_eq: "events"}}) {
     						name
+    						id
     					}
     				}
     			  }
@@ Expand Down @@