From ea94813d94e60dea7f57902ab0d5411fda99561d Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 6 Jan 2026 12:36:15 +0530
Subject: [PATCH] feat: system notification for new courses published

---
 frontend/src/pages/Notifications.vue     | 118 ++++++++++++++++-------
 lms/lms/api.py                           |  35 +++++--
 lms/lms/doctype/lms_course/lms_course.py |  70 ++++++++------
 3 files changed, 156 insertions(+), 67 deletions(-)

diff --git a/frontend/src/pages/Notifications.vue b/frontend/src/pages/Notifications.vue
index afcfd9a5..525f091f 100644
--- a/frontend/src/pages/Notifications.vue
+++ b/frontend/src/pages/Notifications.vue
@@ -23,30 +23,71 @@
 			v-if="notifications?.length"
 			v-for="log in notifications"
 			:key="log.name"
-			class="flex items-center py-2 justify-between"
+			class="flex space-x-2 p-2 rounded-md"
+			:class="{
+				'cursor-pointer': log.link,
+			}"
+			@click="navigateToPage(log)"
 		>
-			<div class="flex items-center">
-				<Avatar :image="log.user_image" :label="log.full_name" class="mr-2" />
-				<div class="notification text-ink-gray-7" v-html="log.subject"></div>
-			</div>
-			<div class="flex items-center space-x-2">
-				<a
-					v-if="log.link"
-					:href="log.link"
-					@click="(e) => handleMarkAsRead(e, log.name)"
-					class="text-ink-gray-5 font-medium text-sm hover:text-ink-gray-7"
+			<Avatar :image="log.user_image" size="2xl" :label="log.full_name" />
+			<div class="space-y-2">
+				<div class="flex items-center justify-between">
+					<div class="flex items-center">
+						<div class="text-ink-gray-9" v-html="log.subject"></div>
+					</div>
+					<div class="flex items-center space-x-2">
+						<div class="text-sm text-ink-gray-5">
+							{{ dayjs(log.creation).fromNow() }}
+						</div>
+						<Button
+							variant="ghost"
+							v-if="!log.read"
+							@click.stop="(e) => handleMarkAsRead(e, log.name)"
+						>
+							<template #icon>
+								<X class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
+							</template>
+						</Button>
+					</div>
+				</div>
+				<div
+					v-if="log.document_type == 'LMS Course' && log.document_details"
+					class="flex space-x-5 border border-outline-gray-2 p-2 rounded-md"
 				>
-					{{ __('View') }}
-				</a>
-				<Button
-					variant="ghost"
-					v-if="!log.read"
-					@click.stop="(e) => handleMarkAsRead(e, log.name)"
-				>
-					<template #icon>
-						<X class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
-					</template>
-				</Button>
+					<iframe
+						v-if="log.document_details.video_link"
+						:src="`https://www.youtube.com/embed/${log.document_details.video_link}`"
+						class="rounded-md w-64"
+					/>
+					<div class="">
+						<div
+							class="bg-surface-violet-1 w-fit py-1 px-1.5 rounded-full text-ink-violet-1 text-sm mb-2"
+						>
+							{{ __('New Course') }}
+						</div>
+						<div class="font-semibold mb-1">
+							{{ __(log.document_details.title) }}
+						</div>
+						<div class="leading-5">
+							{{ __(log.document_details.short_introduction) }}
+						</div>
+						<div class="mt-5 space-y-2">
+							<div
+								v-for="instructor in log.document_details.instructors"
+								class="flex items-center space-x-2"
+							>
+								<Avatar
+									:size="'sm'"
+									:image="instructor.user_image"
+									:label="instructor.full_name"
+								/>
+								<span class="text-ink-gray-7 text-sm">
+									{{ instructor.full_name }}
+								</span>
+							</div>
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
 		<div v-else class="text-ink-gray-5">
@@ -57,11 +98,12 @@
 <script setup>
 import {
 	Avatar,
+	Breadcrumbs,
+	Button,
 	createListResource,
 	createResource,
-	Breadcrumbs,
+	dayjs,
 	TabButtons,
-	Button,
 	usePageMeta,
 } from 'frappe-ui'
 import { sessionStore } from '../stores/session'
@@ -132,10 +174,28 @@ const markAllAsRead = createResource({
 	},
 })
 
-const handleMarkAsRead = (e, logName) => {
+const handleMarkAsRead = (logName) => {
 	markAsRead.submit({ name: logName })
 }
 
+const navigateToPage = (log) => {
+	if (!log.link) return
+	/* handleMarkAsRead(log.name) */
+	let link = log.link.split('/')
+	console.log(link)
+	if (link[2] == 'courses') {
+		router.push({
+			name: 'CourseDetail',
+			params: { courseName: link[3] },
+		})
+	} else if (link[2] == 'batches') {
+		router.push({
+			name: 'Batch',
+			params: { batchName: link[3] },
+		})
+	}
+}
+
 onUnmounted(() => {
 	socket.off('publish_lms_notifications')
 })
@@ -159,11 +219,3 @@ usePageMeta(() => {
 	}
 })
 </script>
-<style>
-.notification strong {
-	font-weight: 400;
-}
-.notification b {
-	font-weight: 400;
-}
-</style>
diff --git a/lms/lms/api.py b/lms/lms/api.py
index dd43af53..0557c867 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -30,7 +30,13 @@ from frappe.utils import (
 from frappe.utils.response import Response
 
 from lms.lms.doctype.course_lesson.course_lesson import save_progress
-from lms.lms.utils import get_average_rating, get_batch_details, get_course_details, get_lesson_count
+from lms.lms.utils import (
+	get_average_rating,
+	get_batch_details,
+	get_course_details,
+	get_instructors,
+	get_lesson_count,
+)
 
 
 @frappe.whitelist(allow_guest=True)
@@ -1232,19 +1238,36 @@ def get_notifications(filters):
 	notifications = frappe.get_all(
 		"Notification Log",
 		filters,
-		["subject", "from_user", "link", "read", "name"],
+		["subject", "from_user", "link", "read", "name", "creation", "document_type", "document_name"],
 		order_by="creation desc",
 	)
 
 	for notification in notifications:
-		from_user_details = frappe.db.get_value(
-			"User", notification.from_user, ["full_name", "user_image"], as_dict=1
-		)
-		notification.update(from_user_details)
+		notification = update_user_details(notification)
+		notification = update_document_details(notification)
 
 	return notifications
 
 
+def update_user_details(notification):
+	from_user_details = frappe.db.get_value(
+		"User", notification.from_user, ["full_name", "user_image"], as_dict=1
+	)
+	notification.update(from_user_details)
+	return notification
+
+
+def update_document_details(notification):
+	if notification.document_type == "LMS Course":
+		details = frappe.db.get_value(
+			"LMS Course", notification.document_name, ["title", "video_link", "short_introduction"], as_dict=1
+		)
+		instructors = get_instructors("LMS Course", notification.document_name)
+		details["instructors"] = instructors
+		notification["document_details"] = details
+	return notification
+
+
 @frappe.whitelist(allow_guest=True)
 def get_lms_settings():
 	allowed_fields = [
diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index e4aff90e..de5b40d9 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -2,12 +2,14 @@
 # For license information, please see license.txt
 
 import random
+
 import frappe
 from frappe import _
+from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
 from frappe.model.document import Document
 from frappe.utils import cint, today
-from frappe.desk.doctype.notification_log.notification_log import make_notification_logs
-from ...utils import generate_slug, update_payment_record, validate_image
+
+from ...utils import generate_slug, get_instructors, update_payment_record, validate_image
 
 
 class LMSCourse(Document):
@@ -130,14 +132,21 @@ class LMSCourse(Document):
 	def __repr__(self):
 		return f"<Course#{self.name}>"
 
+
 def send_notification_for_published_courses():
-	send_notification_for_published_courses = frappe.db.get_single_value("LMS Settings", "send_notification_for_published_courses")
+	send_notification_for_published_courses = frappe.db.get_single_value(
+		"LMS Settings", "send_notification_for_published_courses"
+	)
 	if not send_notification_for_published_courses:
 		return
-	
-	courses_published_today = frappe.get_all("LMS Course", {
-		"published_on": today(),
-	}, ["name", "title", "video_link", "short_introduction"])
+
+	courses_published_today = frappe.get_all(
+		"LMS Course",
+		{
+			"published_on": today(),
+		},
+		["name", "title", "video_link", "short_introduction"],
+	)
 
 	if not courses_published_today:
 		return
@@ -147,27 +156,24 @@ def send_notification_for_published_courses():
 	else:
 		send_system_notification_for_published_courses(courses_published_today)
 
+
 def send_email_notification_for_published_courses(courses):
 	brand_name = frappe.db.get_single_value("Website Settings", "app_name")
 	brand_logo = frappe.db.get_single_value("Website Settings", "banner_image")
 	subject = _("A new course has been published on {0}").format(brand_name)
 	template = "published_course_notification"
-	students = frappe.get_all("User", { "enabled": 1 }, pluck="name")
-	
+	students = frappe.get_all("User", {"enabled": 1}, pluck="name")
+
 	for course in courses:
-		instructor_details = []
-		instructors = frappe.get_all("Course Instructor", { "parent": course.name }, pluck="instructor")
-		for instructor in instructors:
-			details = frappe.db.get_value("User", instructor, ["full_name", "email", "user_image"], as_dict=True)
-			instructor_details.append(details)
-      
+		instructors = get_instructors("LMS Course", course.name)
+
 		args = {
 			"brand_logo": brand_logo,
 			"brand_name": brand_name,
 			"preview_video": f"https://www.youtube.com/embed/{course.video_link}",
 			"title": course.title,
 			"short_introduction": course.short_introduction,
-			"instructors": instructor_details,
+			"instructors": instructors,
 			"course_url": f"{frappe.utils.get_url()}/lms/courses/{course.name}",
 		}
 
@@ -179,17 +185,25 @@ def send_email_notification_for_published_courses(courses):
 			args=args,
 		)
 
+
 def send_system_notification_for_published_courses(courses):
 	for course in courses:
-		students = frappe.get_all("User", { "enabled": 1 }, pluck="name")
-		instructors = frappe.get_all("Course Instructor", { "parent": course.name }, pluck="instructor")
-		notification = frappe._dict({
-			"subject": course.title,
-			"email_content": _("A new course '{0}' has been published that might interest you. Check it out!").format(course.title),
-			"document_type": "LMS Course",
-			"document_name": course.name,
-			"from_user": instructors[0] if instructors else None,
-			"type": "Alert",
-			"link": f"/lms/courses/{course.name}",
-		})
-		make_notification_logs(notification, ["ash@ipp.com"])
\ No newline at end of file
+		students = frappe.get_all("User", {"enabled": 1}, pluck="name")
+		instructors = frappe.get_all("Course Instructor", {"parent": course.name}, pluck="instructor")
+		instructor_name = frappe.db.get_value("User", instructors[0], "full_name")
+		notification = frappe._dict(
+			{
+				"subject": _("{0} has published a new course {1}").format(
+					frappe.bold(instructor_name), frappe.bold(course.title)
+				),
+				"email_content": _(
+					"A new course '{0}' has been published that might interest you. Check it out!"
+				).format(course.title),
+				"document_type": "LMS Course",
+				"document_name": course.name,
+				"from_user": instructors[0] if instructors else None,
+				"type": "Alert",
+				"link": f"/lms/courses/{course.name}",
+			}
+		)
+		make_notification_logs(notification, students)