Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d5e243e06 | |||
| 9210621d67 | |||
| cefaf3a850 | |||
| 120ff12fef | |||
| 12d9f2a4cb | |||
| 5eecc5092d | |||
| f11c8ae8dc | |||
| 558ab12e1f | |||
| 0f839c7f84 | |||
| 9271ea9b38 | |||
| eb68d0acc4 |
@@ -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({
|
||||
@@ -340,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,
|
||||
@@ -359,6 +368,33 @@ 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");
|
||||
@@ -375,11 +411,6 @@ export const updateDoctor = async (req, res) => {
|
||||
message: messages.join(", "),
|
||||
});
|
||||
}
|
||||
const doctor = await prisma.doctor.findUnique({where: {doctorId}});
|
||||
if (!doctor)
|
||||
return res
|
||||
.status(404)
|
||||
.json({success: false, message: "Doctor not found"});
|
||||
|
||||
await prisma.doctor.update({
|
||||
where: {id: doctor.id},
|
||||
@@ -396,74 +427,7 @@ export const updateDoctor = async (req, res) => {
|
||||
globalSortOrder !== undefined ? Number(globalSortOrder) : undefined,
|
||||
},
|
||||
});
|
||||
const existingDepartments = await prisma.doctorDepartment.findMany({
|
||||
where: {
|
||||
doctorId: doctor.id,
|
||||
},
|
||||
include: {
|
||||
timing: true,
|
||||
},
|
||||
});
|
||||
|
||||
for (const dep of departments) {
|
||||
const department = await prisma.department.findUnique({
|
||||
where: {departmentId: dep.departmentId},
|
||||
});
|
||||
|
||||
if (!department) continue;
|
||||
|
||||
const existing = existingDepartments.find(
|
||||
(d) => d.departmentId === department.id,
|
||||
);
|
||||
|
||||
const newSortOrder =
|
||||
dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0;
|
||||
|
||||
const isSameDepartment = existing && existing.sortOrder === newSortOrder;
|
||||
|
||||
const isSameTiming =
|
||||
JSON.stringify(existing?.timing || {}) ===
|
||||
JSON.stringify(dep.timing || {});
|
||||
|
||||
if (isSameDepartment && isSameTiming) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let doctorDepartment = existing;
|
||||
|
||||
if (!existing) {
|
||||
doctorDepartment = await prisma.doctorDepartment.create({
|
||||
data: {
|
||||
doctorId: doctor.id,
|
||||
departmentId: department.id,
|
||||
sortOrder: newSortOrder,
|
||||
},
|
||||
});
|
||||
} else if (existing.sortOrder !== newSortOrder) {
|
||||
doctorDepartment = await prisma.doctorDepartment.update({
|
||||
where: {id: existing.id},
|
||||
data: {
|
||||
sortOrder: newSortOrder,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (dep.timing) {
|
||||
if (existing?.timing) {
|
||||
await prisma.doctorTiming.update({
|
||||
where: {id: existing.timing.id},
|
||||
data: dep.timing,
|
||||
});
|
||||
} else {
|
||||
await prisma.doctorTiming.create({
|
||||
data: {
|
||||
doctorDepartmentId: doctorDepartment.id,
|
||||
...dep.timing,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
if (doctor.seoId) {
|
||||
await prisma.seo.update({
|
||||
where: {
|
||||
@@ -498,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)) {
|
||||
@@ -523,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"});
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 "$@"
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
@@ -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[]>;
|
||||
|
||||
@@ -11,7 +11,8 @@ interface BytescaleUploaderProps {
|
||||
| "/departments"
|
||||
| "/news"
|
||||
| "/blog"
|
||||
| "/health-packages";
|
||||
| "/health-packages"
|
||||
| "/doctor-og";
|
||||
}
|
||||
|
||||
export function BytescaleUploader({
|
||||
|
||||
@@ -188,7 +188,7 @@ export default function DoctorPage() {
|
||||
isActive: newStatus,
|
||||
};
|
||||
|
||||
await updateDoctorApi(doc.doctorId, payload);
|
||||
await updateDoctorApi(doc.doctorId, payload, "toggleStatus");
|
||||
|
||||
fetchAll();
|
||||
} catch (err) {
|
||||
|
||||
@@ -270,10 +270,6 @@ export default function HealthPackagePage() {
|
||||
if (!pkgForm.slug?.trim()) return toast.error("URL Slug is required.");
|
||||
if (!pkgForm.categoryId)
|
||||
return toast.error("Please select a valid category.");
|
||||
if (pkgForm.price === undefined || pkgForm.price <= 0)
|
||||
return toast.error(
|
||||
"Regular Price must be a valid amount greater than 0.",
|
||||
);
|
||||
if (!pkgForm.description?.trim())
|
||||
return toast.error("Description is required.");
|
||||
|
||||
@@ -299,8 +295,18 @@ export default function HealthPackagePage() {
|
||||
}
|
||||
});
|
||||
|
||||
const finalData = { ...pkgForm, inclusions: parsedInclusions };
|
||||
const finalData: Partial<HealthPackage> = {
|
||||
...pkgForm,
|
||||
inclusions: parsedInclusions,
|
||||
};
|
||||
|
||||
if (!finalData.price) {
|
||||
delete finalData.price;
|
||||
}
|
||||
|
||||
if (!finalData.discountedPrice) {
|
||||
delete finalData.discountedPrice;
|
||||
}
|
||||
if (editingPackage?.id) {
|
||||
const changedFields: Record<string, any> = {};
|
||||
Object.keys(finalData).forEach((key) => {
|
||||
@@ -836,7 +842,9 @@ export default function HealthPackagePage() {
|
||||
onChange={(e) =>
|
||||
setPkgForm({
|
||||
...pkgForm,
|
||||
price: Number(e.target.value),
|
||||
price: e.target.value
|
||||
? Number(e.target.value)
|
||||
: undefined,
|
||||
})
|
||||
}
|
||||
className="text-base"
|
||||
@@ -852,7 +860,9 @@ export default function HealthPackagePage() {
|
||||
onChange={(e) =>
|
||||
setPkgForm({
|
||||
...pkgForm,
|
||||
discountedPrice: Number(e.target.value),
|
||||
discountedPrice: e.target.value
|
||||
? Number(e.target.value)
|
||||
: undefined,
|
||||
})
|
||||
}
|
||||
className="text-base"
|
||||
|
||||
Reference in New Issue
Block a user