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

Reviewed-on: #42

backend/prisma/migrations/20260518070619_add_doctor_specialization/migration.sql

@@ -1,37 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the `HealthCheckCategory` table. If the table is not empty, all the data it contains will be lost.
-  - You are about to drop the `HealthPackage` table. If the table is not empty, all the data it contains will be lost.
-  - You are about to drop the `HealthPackageInquiry` table. If the table is not empty, all the data it contains will be lost.
-
-*/
--- DropForeignKey
-ALTER TABLE "HealthPackage" DROP CONSTRAINT "HealthPackage_categoryId_fkey";
-
--- DropForeignKey
-ALTER TABLE "HealthPackageInquiry" DROP CONSTRAINT "HealthPackageInquiry_packageId_fkey";
-
--- DropTable
-DROP TABLE "HealthCheckCategory";
-
--- DropTable
-DROP TABLE "HealthPackage";
-
--- DropTable
-DROP TABLE "HealthPackageInquiry";
-
--- 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")
-);
-
--- AddForeignKey
-ALTER TABLE "DoctorSpecialization" ADD CONSTRAINT "DoctorSpecialization_doctorId_fkey" FOREIGN KEY ("doctorId") REFERENCES "Doctor"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/migrations/20260518093623_add_professional_bio/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Doctor" ADD COLUMN     "professionalSummary" TEXT;

backend/prisma/migrations/20260518100644_add_doctor_experience/migration.sql

@@ -1,7 +0,0 @@
--- AlterTable
-ALTER TABLE "Doctor" ADD COLUMN     "experience" INTEGER,
-ADD COLUMN     "focusKeyphrase" TEXT,
-ADD COLUMN     "metaDescription" TEXT,
-ADD COLUMN     "seoTitle" TEXT,
-ADD COLUMN     "slug" TEXT,
-ADD COLUMN     "tags" TEXT[];

backend/prisma/migrations/20260519042007_add_open_graph_fields_to_doctor/migration.sql

@@ -1,4 +0,0 @@
--- AlterTable
-ALTER TABLE "Doctor" ADD COLUMN     "ogDescription" TEXT,
-ADD COLUMN     "ogImage" TEXT,
-ADD COLUMN     "ogTitle" TEXT;

backend/prisma/migrations/20260519062600_add_seo_table_relation/migration.sql

@@ -1,19 +0,0 @@
--- 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");

backend/prisma/migrations/20260519064224_add_seo_relation_to_doctor/migration.sql

@@ -1,30 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `focusKeyphrase` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `metaDescription` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `ogDescription` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `ogImage` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `ogTitle` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `seoTitle` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `slug` on the `Doctor` table. All the data in the column will be lost.
-  - You are about to drop the column `tags` on the `Doctor` table. All the data in the column will be lost.
-  - 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" DROP COLUMN "focusKeyphrase",
-DROP COLUMN "metaDescription",
-DROP COLUMN "ogDescription",
-DROP COLUMN "ogImage",
-DROP COLUMN "ogTitle",
-DROP COLUMN "seoTitle",
-DROP COLUMN "slug",
-DROP COLUMN "tags",
-ADD COLUMN     "seoId" INTEGER;
-
--- 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;

backend/prisma/migrations/20260519115003_health_check/migration.sql

@@ -1,66 +0,0 @@
--- CreateTable
-CREATE TABLE "HealthCheckCategory" (
-    "id" SERIAL NOT NULL,
-    "name" TEXT NOT NULL,
-    "slug" TEXT,
-    "description" TEXT,
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
-    "sortOrder" INTEGER NOT NULL DEFAULT 1000,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "HealthCheckCategory_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "HealthPackage" (
-    "id" SERIAL NOT NULL,
-    "name" TEXT NOT NULL,
-    "slug" TEXT NOT NULL,
-    "description" TEXT,
-    "price" DECIMAL(10,2),
-    "image" TEXT,
-    "discountedPrice" DECIMAL(10,2),
-    "inclusions" JSONB NOT NULL DEFAULT '{}',
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
-    "isFeatured" BOOLEAN NOT NULL DEFAULT false,
-    "sortOrder" INTEGER NOT NULL DEFAULT 1000,
-    "categoryId" INTEGER NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "HealthPackage_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "HealthPackageInquiry" (
-    "id" SERIAL NOT NULL,
-    "fullName" TEXT NOT NULL,
-    "mobileNumber" TEXT NOT NULL,
-    "email" TEXT,
-    "age" INTEGER,
-    "gender" TEXT,
-    "preferredDate" TIMESTAMP(3),
-    "message" TEXT,
-    "packageId" INTEGER NOT NULL,
-    "status" TEXT NOT NULL DEFAULT 'pending',
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "HealthPackageInquiry_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "HealthCheckCategory_name_key" ON "HealthCheckCategory"("name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "HealthCheckCategory_slug_key" ON "HealthCheckCategory"("slug");
-
--- CreateIndex
-CREATE UNIQUE INDEX "HealthPackage_slug_key" ON "HealthPackage"("slug");
-
--- AddForeignKey
-ALTER TABLE "HealthPackage" ADD CONSTRAINT "HealthPackage_categoryId_fkey" FOREIGN KEY ("categoryId") REFERENCES "HealthCheckCategory"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "HealthPackageInquiry" ADD CONSTRAINT "HealthPackageInquiry_packageId_fkey" FOREIGN KEY ("packageId") REFERENCES "HealthPackage"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

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

@@ -28,12 +28,13 @@ model Doctor {
   qualification String?
   isActive      Boolean  @default(true)
   globalSortOrder Int    @default(1000)
-  departments  DoctorDepartment[]
-  appointments Appointment[]
   specializations DoctorSpecialization[]
   professionalSummary String? @db.Text
   seoId Int? @unique
   seo   Seo? @relation(fields: [seoId], references: [id])
+  departments  DoctorDepartment[]
+  appointments Appointment[]
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 }
@@ -223,6 +224,7 @@ model NewsImage {
 
   createdAt   DateTime  @default(now())
 }
+
 model HealthCheckCategory {
   id          Int             @id @default(autoincrement())
   name        String          @unique 
@@ -278,6 +280,8 @@ model HealthPackageInquiry {
   createdAt       DateTime      @default(now())
   updatedAt       DateTime      @updatedAt
 }
+
+
 model DoctorSpecialization {
   id          Int     @id @default(autoincrement())
   name        String

backend/src/controllers/doctor.controller.js

@@ -189,7 +189,15 @@ export const getDoctorsByDepartmentId = async (req, res) => {
 				doctor: {isActive: true},
 			},
 			include: {
-				doctor: true,
+				doctor: {
+					include: {
+						seo: {
+							select: {
+								slug: true,
+							},
+						},
+					},
+				},
 			},
 			orderBy: {sortOrder: "asc"},
 		});
@@ -200,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({
@@ -240,6 +249,22 @@ export const createDoctor = async (req, res) => {
 			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,
@@ -324,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,
@@ -343,12 +368,49 @@ export const updateDoctor = async (req, res) => {
 			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},
@@ -365,6 +427,7 @@ export const updateDoctor = async (req, res) => {
 					globalSortOrder !== undefined ? Number(globalSortOrder) : undefined,
 			},
 		});
+
 		if (doctor.seoId) {
 			await prisma.seo.update({
 				where: {
@@ -399,9 +462,66 @@ export const updateDoctor = async (req, res) => {
 			});
 		}
 
-		const hasTimingData = departments?.some(
-			(dep) => dep.timing && Object.keys(dep.timing).length > 0,
-		);
+		// 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,
+				},
+			});
+
+			// Recreate departments + timings
+			for (const dep of departments) {
+				const department = await prisma.department.findUnique({
+					where: {
+						departmentId: dep.departmentId,
+					},
+				});
+
+				if (!department) continue;
+
+				const doctorDepartment = await prisma.doctorDepartment.create({
+					data: {
+						doctorId: doctor.id,
+						departmentId: department.id,
+						sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
+					},
+				});
+
+				if (dep.timing && Object.keys(dep.timing).length > 0) {
+					const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
+						dep.timing;
+
+					await prisma.doctorTiming.create({
+						data: {
+							doctorDepartmentId: doctorDepartment.id,
+							...cleanTiming,
+						},
+					});
+				}
+			}
+		}
 
 		// Update Specializations
 		if (Array.isArray(specializations)) {
@@ -424,45 +544,6 @@ export const updateDoctor = async (req, res) => {
 			}
 		}
 
-		if (departments && Array.isArray(departments) && hasTimingData) {
-			const oldRelations = await prisma.doctorDepartment.findMany({
-				where: {doctorId: doctor.id},
-			});
-
-			for (const rel of oldRelations) {
-				await prisma.doctorTiming.deleteMany({
-					where: {doctorDepartmentId: rel.id},
-				});
-			}
-
-			await prisma.doctorDepartment.deleteMany({
-				where: {doctorId: doctor.id},
-			});
-
-			for (const dep of departments) {
-				const targetDept = await prisma.department.findUnique({
-					where: {departmentId: dep.departmentId},
-				});
-				if (!targetDept) continue;
-
-				const newDD = await prisma.doctorDepartment.create({
-					data: {
-						doctorId: doctor.id,
-						departmentId: targetDept.id,
-						sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
-					},
-				});
-
-				if (dep.timing) {
-					const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
-						dep.timing;
-					await prisma.doctorTiming.create({
-						data: {doctorDepartmentId: newDD.id, ...cleanTiming},
-					});
-				}
-			}
-		}
-
 		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..."
-# npx prisma migrate deploy
-echo "Running PUSH..."
-npx prisma db push
+echo "Running migrate..."
+npx prisma migrate deploy
 
 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/pages/Doctor.tsx

@@ -167,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 });
 	}
 
@@ -180,7 +188,7 @@ export default function DoctorPage() {
 				isActive: newStatus,
 			};
 
-			await updateDoctorApi(doc.doctorId, payload);
+			await updateDoctorApi(doc.doctorId, payload, "toggleStatus");
 
 			fetchAll();
 		} catch (err) {

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,
-		discountedPrice: 0,
+		price: undefined,
+		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,
-			discountedPrice: 0,
+			price: undefined,
+			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.")) {
-			await deleteCategoryApi(id);
-			fetchData();
+			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}
@@ -689,7 +748,7 @@ export default function HealthPackagePage() {
 								<div className="space-y-4">
 									<div className="space-y-2">
 										<Label className="text-sm font-semibold">
-											Package Image
+											Package Image(Dimensions: 650w x 250h)
 										</Label>
 
 										<BytescaleUploader
@@ -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>