From b3e90c7f2fac0a8d159a4e24c0266146d1e7429e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 3 Dec 2025 15:44:19 +0530
Subject: [PATCH] fix: validate before enrolling in batch

---
 frontend/src/components/BatchOverlay.vue      |  1 +
 .../lms_batch_enrollment.py                   |  7 ++
 lms/lms/utils.py                              | 71 ++++++++++++++-----
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue
index 82a4bcb3..c2043393 100644
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -198,6 +198,7 @@ const seats_left = computed(() => {
 })
 
 const isStudent = computed(() => {
+	console.log(props.batch.data?.students)
 	return props.batch.data?.students?.includes(user.data?.name)
 })
 
diff --git a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
index 303f10ee..9bc15dce 100644
--- a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
+++ b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py
@@ -16,6 +16,7 @@ class LMSBatchEnrollment(Document):
 
 	def validate(self):
 		self.validate_duplicate_members()
+		self.validate_seat_availability()
 		self.validate_course_enrollment()
 
 	def validate_duplicate_members(self):
@@ -25,6 +26,12 @@ class LMSBatchEnrollment(Document):
 		):
 			frappe.throw(_("Member already enrolled in this batch"))
 
+	def validate_seat_availability(self):
+		seat_count = frappe.db.get_value("LMS Batch", self.batch, "seat_count")
+		enrolled_count = frappe.db.count("LMS Batch Enrollment", {"batch": self.batch})
+		if seat_count and enrolled_count >= seat_count:
+			frappe.throw(_("There are no seats available in this batch."))
+
 	def validate_course_enrollment(self):
 		courses = frappe.get_all("Batch Course", filters={"parent": self.batch}, fields=["course"])
 
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 2bb58757..1c5f639f 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1691,6 +1691,11 @@ def has_submitted_assessment(assessment, assessment_type, member=None):
 		docfield = "quiz"
 		fields = ["percentage"]
 		not_attempted = 0
+	elif assessment_type == "LMS Programming Exercise":
+		doctype = "LMS Programming Exercise Submission"
+		docfield = "exercise"
+		fields = ["status"]
+		not_attempted = "Not Attempted"
 
 	filters = {}
 	filters[docfield] = assessment
@@ -2058,29 +2063,59 @@ def enroll_in_course(course, payment_name):
 
 @frappe.whitelist()
 def enroll_in_batch(batch, payment_name=None):
-	if not frappe.db.exists("LMS Batch Enrollment", {"batch": batch, "member": frappe.session.user}):
-		batch_doc = frappe.db.get_value("LMS Batch", batch, ["name", "seat_count"], as_dict=True)
-		students = frappe.db.count("LMS Batch Enrollment", {"batch": batch})
-		if batch_doc.seat_count and students >= batch_doc.seat_count:
-			frappe.throw(_("The batch is full. Please contact the Administrator."))
+	if not frappe.db.exists("LMS Batch", batch):
+		frappe.throw(_("The specified batch does not exist."))
 
-		new_student = frappe.new_doc("LMS Batch Enrollment")
+	batch_doc = frappe.db.get_value(
+		"LMS Batch", batch, ["name", "seat_count", "allow_self_enrollment"], as_dict=True
+	)
+	payment_doc = get_payment_details(payment_name)
+	validate_enrollment_eligibility(batch_doc, payment_doc)
+	create_enrollment(batch, payment_doc)
+
+
+def get_payment_details(payment_name):
+	payment_doc = None
+	if payment_name:
+		payment_doc = frappe.db.get_value(
+			"LMS Payment", payment_name, ["name", "source", "payment_received"], as_dict=True
+		)
+	return payment_doc
+
+
+def validate_enrollment_eligibility(batch_doc, payment_doc=None):
+	if frappe.db.exists("LMS Batch Enrollment", {"batch": batch_doc.name, "member": frappe.session.user}):
+		frappe.throw(_("You are already enrolled in this batch."))
+
+	if batch_doc.paid_batch:
+		if not payment_doc or not payment_doc.payment_received:
+			frappe.throw(_("Payment is required to enroll in this batch."))
+
+	elif not batch_doc.allow_self_enrollment:
+		frappe.throw(_("Enrollment in this batch is restricted. Please contact the Administrator."))
+
+	students = frappe.db.count("LMS Batch Enrollment", {"batch": batch_doc.name})
+	if batch_doc.seat_count and students >= batch_doc.seat_count:
+		frappe.throw(_("There are no seats available in this batch."))
+
+
+def create_enrollment(batch, payment_doc=None):
+	new_student = frappe.new_doc("LMS Batch Enrollment")
+	new_student.update(
+		{
+			"member": frappe.session.user,
+			"batch": batch,
+		}
+	)
+
+	if payment_doc:
 		new_student.update(
 			{
-				"member": frappe.session.user,
-				"batch": batch,
+				"payment": payment_doc.name,
+				"source": payment_doc.source,
 			}
 		)
-
-		if payment_name:
-			payment = frappe.db.get_value("LMS Payment", payment_name, ["name", "source"], as_dict=True)
-			new_student.update(
-				{
-					"payment": payment.name,
-					"source": payment.source,
-				}
-			)
-		new_student.save()
+	new_student.save()
 
 
 def update_certificate_purchase(course, payment_name):