Merge pull request 'fix: handle empty package pricing fields correctly' (#42) from fix/optional-pricing into dev

Reviewed-on: #42

backend/prisma/migrations/20260520043835_add_seo/migration.sql

@@ -0,0 +1,50 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[seoId]` on the table `Doctor` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "Doctor" ADD COLUMN     "professionalSummary" TEXT,
+ADD COLUMN     "seoId" INTEGER;
+
+-- CreateTable
+CREATE TABLE "DoctorSpecialization" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "doctorId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "DoctorSpecialization_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Seo" (
+    "id" SERIAL NOT NULL,
+    "seoTitle" TEXT,
+    "metaDescription" TEXT,
+    "focusKeyphrase" TEXT,
+    "slug" TEXT,
+    "tags" TEXT[],
+    "ogTitle" TEXT,
+    "ogDescription" TEXT,
+    "ogImage" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Seo_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Seo_slug_key" ON "Seo"("slug");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Doctor_seoId_key" ON "Doctor"("seoId");
+
+-- AddForeignKey
+ALTER TABLE "Doctor" ADD CONSTRAINT "Doctor_seoId_fkey" FOREIGN KEY ("seoId") REFERENCES "Seo"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DoctorSpecialization" ADD CONSTRAINT "DoctorSpecialization_doctorId_fkey" FOREIGN KEY ("doctorId") REFERENCES "Doctor"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/migrations/20260520044321_add_exp/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Doctor" ADD COLUMN     "experience" INTEGER;

backend/prisma/schema.prisma

@@ -23,11 +23,15 @@ model Doctor {
   name          String
   image         String?
   designation   String?
+  experience       Int?
   workingStatus String?
   qualification String?
   isActive      Boolean  @default(true)
   globalSortOrder Int    @default(1000)
-
+  specializations DoctorSpecialization[]
+  professionalSummary String? @db.Text
+  seoId Int? @unique
+  seo   Seo? @relation(fields: [seoId], references: [id])
   departments  DoctorDepartment[]
   appointments Appointment[]
 
@@ -276,3 +280,32 @@ model HealthPackageInquiry {
   createdAt       DateTime      @default(now())
   updatedAt       DateTime      @updatedAt
 }
+
+
+model DoctorSpecialization {
+  id          Int     @id @default(autoincrement())
+  name        String
+  description String? @db.Text
+  doctorId    Int
+  doctor      Doctor @relation(fields: [doctorId],references: [id],onDelete: Cascade)
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+}
+
+model Seo {
+  id                Int      @id @default(autoincrement())
+  doctor              Doctor?
+
+  seoTitle          String?
+  metaDescription   String?   @db.Text
+  focusKeyphrase    String?
+  slug              String?   @unique
+  tags              String[]
+
+  ogTitle           String?
+  ogDescription     String?   @db.Text
+  ogImage           String?
+
+  createdAt         DateTime @default(now())
+  updatedAt         DateTime @updatedAt
+}

backend/src/controllers/doctor.controller.js

@@ -9,12 +9,18 @@ export const getAllDoctors = async (req, res) => {
 		const doctors = await prisma.doctor.findMany({
 			where: admin === "true" ? {} : {isActive: true},
 			include: {
+				seo: true,
 				departments: {
 					include: {
 						department: true,
 						timing: true,
 					},
 				},
+				specializations: {
+					orderBy: {
+						createdAt: "asc",
+					},
+				},
 			},
 			orderBy: [{globalSortOrder: "asc"}, {name: "asc"}],
 		});
@@ -28,7 +34,25 @@ export const getAllDoctors = async (req, res) => {
 			workingStatus: doc.workingStatus,
 			qualification: doc.qualification,
 			isActive: doc.isActive,
+			experience: doc.experience,
+			professionalSummary: doc.professionalSummary,
 			globalSortOrder: doc.globalSortOrder,
+			specializations: doc.specializations.map((item) => ({
+				id: item.id,
+				name: item.name,
+				description: item.description,
+			})),
+			seo: {
+				seoTitle: doc.seo?.seoTitle ?? "",
+				metaDescription: doc.seo?.metaDescription ?? "",
+				focusKeyphrase: doc.seo?.focusKeyphrase ?? "",
+				slug: doc.seo?.slug ?? "",
+				tags: doc.seo?.tags ?? [],
+
+				ogTitle: doc.seo?.ogTitle ?? "",
+				ogDescription: doc.seo?.ogDescription ?? "",
+				ogImage: doc.seo?.ogImage ?? "",
+			},
 			departments: doc.departments.map((d) => {
 				const t = d.timing || {};
 				const timingArray = [
@@ -73,6 +97,8 @@ export const getDoctorByDoctorId = async (req, res) => {
 		const doctor = await prisma.doctor.findUnique({
 			where: {doctorId},
 			include: {
+				seo: true,
+				specializations: true,
 				departments: {
 					include: {
 						department: true,
@@ -96,6 +122,24 @@ export const getDoctorByDoctorId = async (req, res) => {
 			designation: doctor.designation,
 			workingStatus: doctor.workingStatus,
 			qualification: doctor.qualification,
+			experience: doctor.experience,
+			professionalSummary: doctor.professionalSummary,
+			seo: {
+				seoTitle: doctor.seo?.seoTitle ?? "",
+				metaDescription: doctor.seo?.metaDescription ?? "",
+				focusKeyphrase: doctor.seo?.focusKeyphrase ?? "",
+				slug: doctor.seo?.slug ?? "",
+				tags: doctor.seo?.tags ?? [],
+				ogTitle: doctor.seo?.ogTitle ?? "",
+				ogDescription: doctor.seo?.ogDescription ?? "",
+				ogImage: doctor.seo?.ogImage ?? "",
+			},
+			specializations:
+				doctor.specializations?.map((item) => ({
+					id: item.id,
+					name: item.name,
+					description: item.description,
+				})) ?? [],
 			departments: doctor.departments.map((d) => ({
 				departmentId: d.department.departmentId,
 				departmentName: d.department.name,
@@ -145,7 +189,15 @@ export const getDoctorsByDepartmentId = async (req, res) => {
 				doctor: {isActive: true},
 			},
 			include: {
-				doctor: true,
+				doctor: {
+					include: {
+						seo: {
+							select: {
+								slug: true,
+							},
+						},
+					},
+				},
 			},
 			orderBy: {sortOrder: "asc"},
 		});
@@ -156,6 +208,7 @@ export const getDoctorsByDepartmentId = async (req, res) => {
 			image: d.doctor.image ?? "",
 			designation: d.doctor.designation,
 			hierarchyOrder: d.sortOrder,
+			slug: d.doctor.seo?.slug ?? "",
 		}));
 
 		res.status(200).json({
@@ -184,7 +237,48 @@ export const createDoctor = async (req, res) => {
 			isActive,
 			globalSortOrder,
 			departments,
+			experience,
+			professionalSummary,
+			seoTitle,
+			metaDescription,
+			focusKeyphrase,
+			slug,
+			tags,
+			specializations,
+			ogTitle,
+			ogDescription,
+			ogImage,
 		} = req.body;
+		const messages = [];
+
+		if (!doctorId) messages.push("Doctor ID is required");
+		if (!name?.trim()) messages.push("Doctor name is required");
+		if (!designation?.trim()) messages.push("Designation is required");
+		if (!qualification?.trim()) messages.push("Qualification is required");
+		if (!departments || departments.length === 0) {
+			messages.push("At least one department is required");
+		}
+
+		if (messages.length > 0) {
+			return res.status(400).json({
+				success: false,
+				message: messages.join(", "),
+			});
+		}
+		const seo = await prisma.seo.create({
+			data: {
+				seoTitle,
+				metaDescription,
+				focusKeyphrase,
+				slug: slug ? slug : null,
+				tags: tags || [],
+
+				// Open Graph
+				ogTitle,
+				ogDescription,
+				ogImage,
+			},
+		});
 
 		const doctor = await prisma.doctor.create({
 			data: {
@@ -194,6 +288,9 @@ export const createDoctor = async (req, res) => {
 				designation,
 				workingStatus,
 				qualification,
+				experience: experience ? Number(experience) : null,
+				professionalSummary,
+				seoId: seo.id,
 				isActive: isActive !== undefined ? isActive : true,
 				globalSortOrder:
 					globalSortOrder !== undefined ? Number(globalSortOrder) : 0,
@@ -224,6 +321,17 @@ export const createDoctor = async (req, res) => {
 				});
 			}
 		}
+		if (specializations?.length) {
+			await prisma.doctorSpecialization.createMany({
+				data: specializations
+					.filter((item) => item.name?.trim())
+					.map((item) => ({
+						name: item.name.trim(),
+						description: item.description?.trim() || null,
+						doctorId: doctor.id,
+					})),
+			});
+		}
 
 		res.status(201).json({
 			success: true,
@@ -241,7 +349,7 @@ export const createDoctor = async (req, res) => {
 //update doctors
 export const updateDoctor = async (req, res) => {
 	try {
-		const {doctorId} = req.params;
+		const {doctorId, action} = req.params;
 		const {
 			name,
 			designation,
@@ -251,13 +359,58 @@ export const updateDoctor = async (req, res) => {
 			isActive,
 			globalSortOrder,
 			departments,
+			experience,
+			professionalSummary,
+			seoTitle,
+			metaDescription,
+			focusKeyphrase,
+			slug,
+			tags,
+			specializations,
 		} = req.body;
-
+		if (!doctorId) {
+			return res.status(400).json({
+				success: false,
+				message: "Doctor ID is required",
+			});
+		}
 		const doctor = await prisma.doctor.findUnique({where: {doctorId}});
 		if (!doctor)
 			return res
 				.status(404)
 				.json({success: false, message: "Doctor not found"});
+		if (action === "toggleStatus") {
+			await prisma.doctor.update({
+				where: {id: doctor.id},
+				data: {
+					isActive: !doctor.isActive,
+				},
+			});
+
+			return res.status(200).json({
+				success: true,
+				message: `Doctor has been ${
+					doctor.isActive ? "deactivated" : "activated"
+				} successfully`,
+			});
+		}
+
+		const messages = [];
+		if (!doctorId) messages.push("Doctor ID is required");
+		if (!name?.trim()) messages.push("Doctor name is required");
+		if (!qualification?.trim()) messages.push("Qualification is required");
+		if (!designation?.trim()) messages.push("Designation is required");
+
+		if (!departments || departments.length === 0) {
+			messages.push("At least one department is required");
+		}
+
+		if (messages.length > 0) {
+			return res.status(400).json({
+				success: false,
+				message: messages.join(", "),
+			});
+		}
 
 		await prisma.doctor.update({
 			where: {id: doctor.id},
@@ -268,54 +421,129 @@ export const updateDoctor = async (req, res) => {
 				workingStatus,
 				qualification,
 				isActive,
+				experience: experience ? Number(experience) : null,
+				professionalSummary,
 				globalSortOrder:
 					globalSortOrder !== undefined ? Number(globalSortOrder) : undefined,
 			},
 		});
 
-		const hasTimingData = departments?.some(
+		if (doctor.seoId) {
-			(dep) => dep.timing && Object.keys(dep.timing).length > 0,
+			await prisma.seo.update({
-		);
+				where: {
-
+					id: doctor.seoId,
-		if (departments && Array.isArray(departments) && hasTimingData) {
+				},
-			const oldRelations = await prisma.doctorDepartment.findMany({
+				data: {
-				where: {doctorId: doctor.id},
+					seoTitle,
+					metaDescription,
+					focusKeyphrase,
+					slug: slug ? slug : null,
+					tags: tags || [],
+				},
+			});
+		} else {
+			const seo = await prisma.seo.create({
+				data: {
+					seoTitle,
+					metaDescription,
+					focusKeyphrase,
+					slug: slug ? slug : null,
+					tags: tags || [],
+				},
 			});
 
-			for (const rel of oldRelations) {
+			await prisma.doctor.update({
-				await prisma.doctorTiming.deleteMany({
+				where: {
-					where: {doctorDepartmentId: rel.id},
+					id: doctor.id,
+				},
+				data: {
+					seoId: seo.id,
+				},
 			});
 		}
 
+		// Update Departments & Timings
+		if (Array.isArray(departments)) {
+			const oldRelations = await prisma.doctorDepartment.findMany({
+				where: {
+					doctorId: doctor.id,
+				},
+				include: {
+					timing: true,
+				},
+			});
+
+			// Delete old timings
+			for (const rel of oldRelations) {
+				if (rel.timing) {
+					await prisma.doctorTiming.deleteMany({
+						where: {
+							doctorDepartmentId: rel.id,
+						},
+					});
+				}
+			}
+
+			// Delete old departments
 			await prisma.doctorDepartment.deleteMany({
-				where: {doctorId: doctor.id},
+				where: {
+					doctorId: doctor.id,
+				},
 			});
 
+			// Recreate departments + timings
 			for (const dep of departments) {
-				const targetDept = await prisma.department.findUnique({
+				const department = await prisma.department.findUnique({
-					where: {departmentId: dep.departmentId},
+					where: {
+						departmentId: dep.departmentId,
+					},
 				});
-				if (!targetDept) continue;
 
-				const newDD = await prisma.doctorDepartment.create({
+				if (!department) continue;
+
+				const doctorDepartment = await prisma.doctorDepartment.create({
 					data: {
 						doctorId: doctor.id,
-						departmentId: targetDept.id,
+						departmentId: department.id,
 						sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
 					},
 				});
 
-				if (dep.timing) {
+				if (dep.timing && Object.keys(dep.timing).length > 0) {
 					const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
 						dep.timing;
+
 					await prisma.doctorTiming.create({
-						data: {doctorDepartmentId: newDD.id, ...cleanTiming},
+						data: {
+							doctorDepartmentId: doctorDepartment.id,
+							...cleanTiming,
+						},
 					});
 				}
 			}
 		}
 
+		// Update Specializations
+		if (Array.isArray(specializations)) {
+			await prisma.doctorSpecialization.deleteMany({
+				where: {
+					doctorId: doctor.id,
+				},
+			});
+
+			if (specializations.length) {
+				await prisma.doctorSpecialization.createMany({
+					data: specializations
+						.filter((item) => item.name?.trim())
+						.map((item) => ({
+							name: item.name.trim(),
+							description: item.description?.trim() || null,
+							doctorId: doctor.id,
+						})),
+				});
+			}
+		}
+
 		res
 			.status(200)
 			.json({success: true, message: "Doctor updated successfully"});

backend/src/routes/doctor.routes.js

@@ -21,7 +21,7 @@ router.get("/getTimings/:doctorId", getDoctorTimingById);
 router.get("/:doctorId", getDoctorByDoctorId);
 
 router.post("/", jwtAuthMiddleware, createDoctor);
-router.patch("/:doctorId", jwtAuthMiddleware, updateDoctor);
+router.patch("/:doctorId/:action", jwtAuthMiddleware, updateDoctor);
 router.delete("/:doctorId", jwtAuthMiddleware, deleteDoctor);
 
 export default router;

docker/entrypoint.sh

@@ -4,10 +4,8 @@ set -e  # Exit immediately if a command exits with a non-zero status
 echo "Generating Prisma Client..."
 npx prisma generate
 
-# echo "Running migrate..."
+echo "Running migrate..."
-# npx prisma migrate deploy
+npx prisma migrate deploy
-echo "Running PUSH..."
-npx prisma db push
 
 echo "Executing command: $@"
 exec "$@"

frontend/src/api/doctor.ts

@@ -53,9 +53,10 @@ export const createDoctorApi = async (data: Doctor) => {
 export const updateDoctorApi = async (
 	doctorId: string,
 	data: Partial<Doctor>,
+	action: "toggleStatus" | "updateDetails" = "updateDetails",
 ) => {
 	try {
-		const res = await apiClient.patch(`/doctors/${doctorId}`, data);
+		const res = await apiClient.patch(`/doctors/${doctorId}/${action}`, data);
 
 		toast.success("Doctor updated successfully");
 

frontend/src/api/healthCheck.ts

@@ -6,7 +6,7 @@ export interface HealthPackage {
 	name: string;
 	slug: string;
 	description?: string;
-	price: number;
+	price?: number;
 	image?: string;
 	discountedPrice?: number;
 	inclusions: Record<string, string[]>;

frontend/src/components/BytescaleUploader/BytescaleUploader.tsx

@@ -11,7 +11,8 @@ interface BytescaleUploaderProps {
 		| "/departments"
 		| "/news"
 		| "/blog"
-		| "/health-packages";
+		| "/health-packages"
+		| "/doctor-og";
 }
 
 export function BytescaleUploader({

frontend/src/pages/Doctor.tsx

@@ -41,6 +41,7 @@ import {
 	ChevronLeft,
 	ChevronRight,
 } from "lucide-react";
+import { Textarea } from "@/components/ui/textarea";
 
 interface Department {
 	departmentId: string;
@@ -83,6 +84,21 @@ export default function DoctorPage() {
 		isActive: true,
 		globalSortOrder: 0,
 		departments: [],
+		professionalSummary: "",
+		seoTitle: "",
+		metaDescription: "",
+		ogTitle: "",
+		ogDescription: "",
+		ogImage: "",
+		specializations: [
+			{
+				name: "",
+				description: "",
+			},
+		],
+		focusKeyphrase: "",
+		slug: "",
+		tags: [],
 	});
 
 	const fetchAll = useCallback(async () => {
@@ -151,8 +167,16 @@ export default function DoctorPage() {
 	const currentItems = filteredDoctors.slice(indexOfFirstItem, indexOfLastItem);
 
 	function handleChange(e: any) {
-		const value =
+		let value =
 			e.target.type === "number" ? Number(e.target.value) : e.target.value;
+		if (e.target.name === "slug") {
+			value = value
+				.toLowerCase()
+				.replace(/\s+/g, "-") // replace spaces with -
+				.replace(/[^\w-]+/g, "") // remove special chars
+				.replace(/--+/g, "-"); // remove duplicate -
+		}
+
 		setForm({ ...form, [e.target.name]: value });
 	}
 
@@ -164,7 +188,7 @@ export default function DoctorPage() {
 				isActive: newStatus,
 			};
 
-			await updateDoctorApi(doc.doctorId, payload);
+			await updateDoctorApi(doc.doctorId, payload, "toggleStatus");
 
 			fetchAll();
 		} catch (err) {
@@ -221,9 +245,25 @@ export default function DoctorPage() {
 			designation: "",
 			workingStatus: "",
 			qualification: "",
+			experience: "",
+			professionalSummary: "",
 			isActive: true,
 			globalSortOrder: 0,
+			specializations: [
+				{
+					name: "",
+					description: "",
+				},
+			],
 			departments: [],
+			seoTitle: "",
+			metaDescription: "",
+			focusKeyphrase: "",
+			slug: "",
+			tags: [],
+			ogTitle: "",
+			ogDescription: "",
+			ogImage: "",
 		});
 		setOpenModal(true);
 	}
@@ -243,6 +283,27 @@ export default function DoctorPage() {
 				qualification: doc.qualification,
 				isActive: doc.isActive ?? true,
 				globalSortOrder: doc.globalSortOrder ?? 0,
+				experience: doc.experience || "",
+				professionalSummary: doc.professionalSummary || "",
+				seoTitle: doc.seo?.seoTitle || "",
+				metaDescription: doc.seo?.metaDescription || "",
+				focusKeyphrase: doc.seo?.focusKeyphrase || "",
+				slug: doc.seo?.slug || "",
+				tags: doc.seo?.tags || [],
+				ogTitle: doc.seo?.ogTitle || "",
+				ogDescription: doc.seo?.ogDescription || "",
+				ogImage: doc.seo?.ogImage || "",
+				specializations: doc.specializations?.length
+					? doc.specializations.map((item: any) => ({
+							name: item.name || "",
+							description: item.description || "",
+						}))
+					: [
+							{
+								name: "",
+								description: "",
+							},
+						],
 				departments: timingData.map((d: any) => ({
 					departmentId: d.departmentId,
 					sortOrder: d.deptSortOrder ?? 0,
@@ -255,6 +316,8 @@ export default function DoctorPage() {
 		}
 	}
 
+	console.log("Current form state:", form); // Debug log to check form state
+
 	async function handleSubmit() {
 		try {
 			if (editing) {
@@ -594,6 +657,24 @@ export default function DoctorPage() {
 											className="text-base"
 										/>
 									</div>
+									<div className="space-y-1">
+										<label className="text-sm font-semibold">
+											Brief Professional Summary
+										</label>
+
+										<Textarea
+											name="professionalSummary"
+											placeholder="Write a brief professional summary about the doctor..."
+											value={form.professionalSummary || ""}
+											onChange={(e) =>
+												setForm({
+													...form,
+													professionalSummary: e.target.value,
+												})
+											}
+											className="min-h-[120px] text-base"
+										/>
+									</div>
 									<div className="space-y-1">
 										<label className="text-sm font-semibold">
 											Qualification
@@ -606,6 +687,25 @@ export default function DoctorPage() {
 											className="text-base"
 										/>
 									</div>
+									<div className="space-y-1">
+										<label className="text-sm font-semibold">
+											Years of Experience
+										</label>
+
+										<Input
+											name="experience"
+											type="number"
+											min={0}
+											placeholder="e.g. 15"
+											value={form.experience || ""}
+											onChange={handleChange}
+											className="text-base"
+										/>
+
+										<p className="text-xs text-muted-foreground">
+											Enter total years of professional experience
+										</p>
+									</div>
 								</div>
 
 								<div className="p-5 border rounded-md bg-muted/20">
@@ -632,6 +732,314 @@ export default function DoctorPage() {
 										})}
 									</div>
 								</div>
+								<div className="space-y-4 p-5 border rounded-md bg-muted/20">
+									<div className="flex items-center justify-between">
+										<p className="text-base font-bold">Specializations</p>
+
+										<Button
+											type="button"
+											variant="outline"
+											size="sm"
+											onClick={() =>
+												setForm({
+													...form,
+													specializations: [
+														...(form.specializations || []),
+														{
+															name: "",
+															description: "",
+														},
+													],
+												})
+											}
+										>
+											+ Add
+										</Button>
+									</div>
+
+									{form.specializations?.length === 0 ? (
+										<p className="text-sm text-muted-foreground italic">
+											No specializations added
+										</p>
+									) : (
+										<div className="space-y-4">
+											{form.specializations?.map(
+												(specialization: any, index: number) => (
+													<div
+														key={index}
+														className="border rounded-lg p-4 space-y-3 bg-background"
+													>
+														<div className="flex items-center justify-between">
+															<p className="font-medium text-sm">
+																Specialization {index + 1}
+															</p>
+
+															<Button
+																type="button"
+																variant="ghost"
+																size="sm"
+																onClick={() => {
+																	const updated = form.specializations.filter(
+																		(_: any, i: number) => i !== index,
+																	);
+
+																	setForm({
+																		...form,
+																		specializations: updated,
+																	});
+																}}
+															>
+																Remove
+															</Button>
+														</div>
+
+														<div className="space-y-2">
+															<Label>Name</Label>
+															<Input
+																placeholder="e.g. Cardiology"
+																value={specialization.name}
+																onChange={(e) => {
+																	const updated = [...form.specializations];
+
+																	updated[index].name = e.target.value;
+
+																	setForm({
+																		...form,
+																		specializations: updated,
+																	});
+																}}
+															/>
+														</div>
+
+														<div className="space-y-2">
+															<Label>Doctor-specific Description</Label>
+
+															<Textarea
+																placeholder="Describe how this doctor specializes in this area..."
+																value={specialization.description}
+																onChange={(e) => {
+																	const updated = [...form.specializations];
+
+																	updated[index].description = e.target.value;
+
+																	setForm({
+																		...form,
+																		specializations: updated,
+																	});
+																}}
+															/>
+														</div>
+													</div>
+												),
+											)}
+										</div>
+									)}
+								</div>
+
+								<div className="space-y-4 p-5 border rounded-md bg-muted/20">
+									<div className="flex items-center justify-between">
+										<p className="text-base font-bold">SEO Settings</p>
+
+										<Badge variant="secondary">Optional</Badge>
+									</div>
+
+									<div className="space-y-2">
+										<Label className="text-sm font-semibold">SEO Title</Label>
+
+										<Input
+											name="seoTitle"
+											placeholder="Best Cardiologist in Kochi | Dr John Doe"
+											value={form.seoTitle || ""}
+											onChange={handleChange}
+											className="text-base"
+										/>
+
+										<p className="text-xs text-muted-foreground">
+											Title shown in Google search results
+										</p>
+									</div>
+
+									<div className="space-y-2">
+										<Label className="text-sm font-semibold">
+											Meta Description
+										</Label>
+
+										<Textarea
+											name="metaDescription"
+											placeholder="Short description shown in Google search..."
+											value={form.metaDescription || ""}
+											onChange={(e) =>
+												setForm({
+													...form,
+													metaDescription: e.target.value,
+												})
+											}
+											className="min-h-[100px] text-base"
+										/>
+
+										<p className="text-xs text-muted-foreground">
+											Recommended: 150–160 characters
+										</p>
+									</div>
+									<div className="border-t pt-5 space-y-4">
+										<div className="flex items-center justify-between">
+											<p className="text-base font-bold">
+												Open Graph (Social Preview)
+											</p>
+
+											<Badge variant="secondary">Optional</Badge>
+										</div>
+
+										<div className="space-y-2">
+											<Label className="text-sm font-semibold">OG Title</Label>
+
+											<Input
+												name="ogTitle"
+												placeholder="Title for WhatsApp / Facebook sharing"
+												value={form.ogTitle || ""}
+												onChange={handleChange}
+												className="text-base"
+											/>
+
+											<p className="text-xs text-muted-foreground">
+												If empty, SEO title will be used
+											</p>
+										</div>
+
+										<div className="space-y-2">
+											<Label className="text-sm font-semibold">
+												OG Description
+											</Label>
+
+											<Textarea
+												name="ogDescription"
+												placeholder="Description for social sharing..."
+												value={form.ogDescription || ""}
+												onChange={(e) =>
+													setForm({
+														...form,
+														ogDescription: e.target.value,
+													})
+												}
+												className="min-h-[100px] text-base"
+											/>
+
+											<p className="text-xs text-muted-foreground">
+												If empty, meta description will be used
+											</p>
+										</div>
+
+										<div className="space-y-2">
+											<Label className="text-sm font-semibold">OG Image</Label>
+
+											<BytescaleUploader
+												value={form.ogImage}
+												folderPath="/doctor-og"
+												onChange={(url) =>
+													setForm({
+														...form,
+														ogImage: url,
+													})
+												}
+											/>
+										</div>
+									</div>
+
+									<div className="space-y-2">
+										<Label className="text-sm font-semibold">
+											Focus Keyphrase
+										</Label>
+
+										<Input
+											name="focusKeyphrase"
+											placeholder="best cardiologist in kochi"
+											value={form.focusKeyphrase || ""}
+											onChange={handleChange}
+											className="text-base"
+										/>
+
+										<p className="text-xs text-muted-foreground">
+											Main keyword people may search in Google
+										</p>
+									</div>
+
+									<div className="space-y-2">
+										<Label className="text-sm font-semibold">URL Slug</Label>
+
+										<Input
+											name="slug"
+											placeholder="dr-john-doe"
+											value={form.slug || ""}
+											onChange={handleChange}
+											className="text-base"
+										/>
+
+										<p className="text-xs text-muted-foreground">
+											URL:
+											<span className="font-medium">
+												{" "}
+												/doctors/
+												{form.slug || "doctor-slug"}
+											</span>
+										</p>
+									</div>
+
+									<div className="space-y-2">
+										<Label className="text-sm font-semibold">
+											Tags / Keywords
+										</Label>
+
+										<div className="flex flex-wrap gap-2 border rounded-md p-3 min-h-[48px] bg-background">
+											{form.tags?.map((tag: string, index: number) => (
+												<div
+													key={index}
+													className="bg-primary/10 text-primary px-3 py-1 rounded-full text-sm flex items-center gap-2"
+												>
+													{tag}
+
+													<button
+														type="button"
+														onClick={() => {
+															const updated = form.tags.filter(
+																(_: string, i: number) => i !== index,
+															);
+
+															setForm({
+																...form,
+																tags: updated,
+															});
+														}}
+													>
+														×
+													</button>
+												</div>
+											))}
+
+											<Input
+												placeholder="Type keyword and press Enter"
+												className="border-0 shadow-none focus-visible:ring-0 min-w-[220px]"
+												onKeyDown={(e) => {
+													if (
+														e.key === "Enter" &&
+														e.currentTarget.value.trim()
+													) {
+														e.preventDefault();
+
+														setForm({
+															...form,
+															tags: [
+																...(form.tags || []),
+																e.currentTarget.value.trim(),
+															],
+														});
+
+														e.currentTarget.value = "";
+													}
+												}}
+											/>
+										</div>
+									</div>
+								</div>
 							</div>
 
 							<div className="space-y-6">

frontend/src/pages/HealthPackagePage.tsx

@@ -1,4 +1,5 @@
 import { useState, useEffect, useCallback, useMemo } from "react";
+import toast from "react-hot-toast";
 import { AxiosError } from "axios";
 import { BytescaleUploader } from "@/components/BytescaleUploader/BytescaleUploader";
 
@@ -93,8 +94,8 @@ export default function HealthPackagePage() {
 		slug: "",
 		description: "",
 		image: "",
-		price: 0,
+		price: undefined,
-		discountedPrice: 0,
+		discountedPrice: undefined,
 		categoryId: 0,
 		isActive: true,
 		sortOrder: 1000,
@@ -164,9 +165,11 @@ export default function HealthPackagePage() {
 		if (!pkg.id) return;
 		try {
 			await updateHealthPackageApi(pkg.id, { isActive: !pkg.isActive });
+			toast.success(`Package ${pkg.isActive ? "hidden" : "activated"}`);
 			fetchData();
 		} catch (err) {
 			console.error("Failed to update status", err);
+			toast.error("Failed to update status");
 		}
 	};
 	const handleToggleCategoryStatus = async (cat: HealthCategory) => {
@@ -180,21 +183,29 @@ export default function HealthPackagePage() {
 			}
 
 			await updateCategoryApi(cat.id, { isActive: !cat.isActive });
+			toast.success(`Category ${cat.isActive ? "hidden" : "activated"}`);
 			fetchData();
 		} catch (err) {
 			console.error("Failed to update category status", err);
+			toast.error("Failed to update category status");
 		}
 	};
 
 	const openAddPackage = () => {
+		if (categories.length === 0) {
+			toast.error(
+				"Please create at least one category before attempting to add a health package.",
+			);
+			return;
+		}
 		setEditingPackage(null);
 		setPkgForm({
 			name: "",
 			slug: "",
 			description: "",
 			image: "",
-			price: 0,
+			price: undefined,
-			discountedPrice: 0,
+			discountedPrice: undefined,
 			categoryId: categories[0]?.id || 0,
 			isActive: true,
 			sortOrder: 1000,
@@ -254,6 +265,23 @@ export default function HealthPackagePage() {
 	};
 
 	const savePackage = async () => {
+		if (!pkgForm.image) return toast.error("Package image is required.");
+		if (!pkgForm.name?.trim()) return toast.error("Package Name is required.");
+		if (!pkgForm.slug?.trim()) return toast.error("URL Slug is required.");
+		if (!pkgForm.categoryId)
+			return toast.error("Please select a valid category.");
+		if (!pkgForm.description?.trim())
+			return toast.error("Description is required.");
+
+		const structureFilled = inclusionsList.some(
+			(item) => item.category.trim() !== "" && item.items.trim() !== "",
+		);
+		if (!structureFilled) {
+			return toast.error(
+				"Please provide at least one valid Category Group with tests inside it.",
+			);
+		}
+
 		try {
 			// Convert the dynamic array back into the required JSON object format
 			const parsedInclusions: Record<string, string[]> = {};
@@ -267,8 +295,21 @@ export default function HealthPackagePage() {
 				}
 			});
 
-			const finalData = { ...pkgForm, inclusions: parsedInclusions };
+			const finalData: Partial<HealthPackage> = {
+				...pkgForm,
+				inclusions: parsedInclusions,
+			};
 
+			finalData.price =
+				finalData.price !== undefined && finalData.price !== null
+					? Number(finalData.price)
+					: null;
+
+			finalData.discountedPrice =
+				finalData.discountedPrice !== undefined &&
+				finalData.discountedPrice !== null
+					? Number(finalData.discountedPrice)
+					: null;
 			if (editingPackage?.id) {
 				const changedFields: Record<string, any> = {};
 				Object.keys(finalData).forEach((key) => {
@@ -297,10 +338,15 @@ export default function HealthPackagePage() {
 			fetchData();
 		} catch (err) {
 			console.error(err);
+			toast.error(
+				"An unexpected system error occurred while trying to save the package.",
+			);
 		}
 	};
 
 	const saveCategory = async () => {
+		if (!catForm.name?.trim()) return toast.error("Category Name is required.");
+
 		try {
 			if (editingCategory?.id) {
 				const changedFields: Record<string, any> = {};
@@ -332,13 +378,20 @@ export default function HealthPackagePage() {
 			fetchData();
 		} catch (err) {
 			console.error(err);
+			toast.error("An error occurred while saving the category.");
 		}
 	};
 
 	const deleteCategory = async (id: number) => {
 		if (confirm("Delete this category? Ensure no packages are linked to it.")) {
+			try {
 				await deleteCategoryApi(id);
+				toast.success("Category deleted successfully!");
 				fetchData();
+			} catch (err) {
+				console.error(err);
+				toast.error("Failed to delete category.");
+			}
 		}
 	};
 
@@ -469,9 +522,15 @@ export default function HealthPackagePage() {
 													</TableCell>
 													<TableCell>
 														<div className="font-semibold">
-															₹{pkg.discountedPrice || pkg.price}
+															{pkg.discountedPrice != null
+																? `₹${pkg.discountedPrice}`
+																: pkg.price != null
+																	? `₹${pkg.price}`
+																	: "Not Entered"}
 														</div>
-														{pkg.discountedPrice &&
+
+														{pkg.discountedPrice != null &&
+															pkg.price != null &&
 															pkg.discountedPrice < pkg.price && (
 																<div className="text-xs text-muted-foreground line-through">
 																	₹{pkg.price}
@@ -785,12 +844,19 @@ export default function HealthPackagePage() {
 											<Input
 												type="number"
 												value={pkgForm.price || ""}
-												onChange={(e) =>
+												onChange={(e) => {
+													const value = e.target.value
+														? Number(e.target.value)
+														: undefined;
+
 													setPkgForm({
 														...pkgForm,
-														price: Number(e.target.value),
+														price: value,
-													})
+														discountedPrice: value
-												}
+															? pkgForm.discountedPrice
+															: undefined,
+													});
+												}}
 												className="text-base"
 											/>
 										</div>
@@ -800,11 +866,14 @@ export default function HealthPackagePage() {
 											</Label>
 											<Input
 												type="number"
+												disabled={!pkgForm.price}
 												value={pkgForm.discountedPrice || ""}
 												onChange={(e) =>
 													setPkgForm({
 														...pkgForm,
-														discountedPrice: Number(e.target.value),
+														discountedPrice: e.target.value
+															? Number(e.target.value)
+															: undefined,
 													})
 												}
 												className="text-base"
@@ -949,16 +1018,6 @@ export default function HealthPackagePage() {
 								className="text-base"
 							/>
 						</div>
-						{/* <div className="space-y-1">
-							<Label className="text-sm font-semibold">URL Slug</Label>
-							<Input
-								value={catForm.slug}
-								onChange={(e) =>
-									setCatForm({ ...catForm, slug: e.target.value })
-								}
-								className="text-base"
-							/>
-						</div> */}
 
 						<div className="space-y-1">
 							<Label className="text-sm font-semibold">Sort Order</Label>
@@ -1017,7 +1076,11 @@ export default function HealthPackagePage() {
 									Pricing
 								</p>
 								<p className="text-xl font-bold">
-									₹{selectedPackage?.discountedPrice || selectedPackage?.price}
+									{selectedPackage?.discountedPrice != null
+										? `₹${selectedPackage.discountedPrice}`
+										: selectedPackage?.price != null
+											? `₹${selectedPackage.price}`
+											: "Not Entered"}
 								</p>
 							</div>
 						</div>